feat: 添加了对串口协议的继电器的支持

This commit is contained in:
Fridayssheep
2026-02-11 13:06:05 +08:00
parent 7baf6fcf44
commit 21bea797e4
5 changed files with 150 additions and 3 deletions

View File

@@ -4,6 +4,7 @@
//! Each executor handles one button (power or reset) with its own hardware binding. //! Each executor handles one button (power or reset) with its own hardware binding.
use gpio_cdev::{Chip, LineHandle, LineRequestFlags}; use gpio_cdev::{Chip, LineHandle, LineRequestFlags};
use serialport::SerialPort;
use std::fs::{File, OpenOptions}; use std::fs::{File, OpenOptions};
use std::io::Write; use std::io::Write;
use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::atomic::{AtomicBool, Ordering};
@@ -38,6 +39,8 @@ pub struct AtxKeyExecutor {
gpio_handle: Mutex<Option<LineHandle>>, gpio_handle: Mutex<Option<LineHandle>>,
/// Cached USB relay file handle to avoid repeated open/close syscalls /// Cached USB relay file handle to avoid repeated open/close syscalls
usb_relay_handle: Mutex<Option<File>>, usb_relay_handle: Mutex<Option<File>>,
/// Cached Serial port handle
serial_handle: Mutex<Option<Box<dyn SerialPort>>>,
initialized: AtomicBool, initialized: AtomicBool,
} }
@@ -48,6 +51,7 @@ impl AtxKeyExecutor {
config, config,
gpio_handle: Mutex::new(None), gpio_handle: Mutex::new(None),
usb_relay_handle: Mutex::new(None), usb_relay_handle: Mutex::new(None),
serial_handle: Mutex::new(None),
initialized: AtomicBool::new(false), initialized: AtomicBool::new(false),
} }
} }
@@ -72,6 +76,7 @@ impl AtxKeyExecutor {
match self.config.driver { match self.config.driver {
AtxDriverType::Gpio => self.init_gpio().await?, AtxDriverType::Gpio => self.init_gpio().await?,
AtxDriverType::UsbRelay => self.init_usb_relay().await?, AtxDriverType::UsbRelay => self.init_usb_relay().await?,
AtxDriverType::Serial => self.init_serial().await?,
AtxDriverType::None => {} AtxDriverType::None => {}
} }
@@ -134,6 +139,36 @@ impl AtxKeyExecutor {
Ok(()) Ok(())
} }
/// Initialize Serial relay backend
async fn init_serial(&self) -> Result<()> {
info!(
"Initializing Serial relay ATX executor on {} channel {}",
self.config.device, self.config.pin
);
let baud_rate = if self.config.baud_rate > 0 {
self.config.baud_rate
} else {
9600
};
let port = serialport::new(&self.config.device, baud_rate)
.timeout(Duration::from_millis(100))
.open()
.map_err(|e| AppError::Internal(format!("Serial port open failed: {}", e)))?;
*self.serial_handle.lock().unwrap() = Some(port);
// Ensure relay is off initially
self.send_serial_relay_command(false)?;
debug!(
"Serial relay channel {} configured successfully",
self.config.pin
);
Ok(())
}
/// Pulse the button for the specified duration /// Pulse the button for the specified duration
pub async fn pulse(&self, duration: Duration) -> Result<()> { pub async fn pulse(&self, duration: Duration) -> Result<()> {
if !self.is_configured() { if !self.is_configured() {
@@ -147,6 +182,7 @@ impl AtxKeyExecutor {
match self.config.driver { match self.config.driver {
AtxDriverType::Gpio => self.pulse_gpio(duration).await, AtxDriverType::Gpio => self.pulse_gpio(duration).await,
AtxDriverType::UsbRelay => self.pulse_usb_relay(duration).await, AtxDriverType::UsbRelay => self.pulse_usb_relay(duration).await,
AtxDriverType::Serial => self.pulse_serial(duration).await,
AtxDriverType::None => Ok(()), AtxDriverType::None => Ok(()),
} }
} }
@@ -220,6 +256,42 @@ impl AtxKeyExecutor {
Ok(()) Ok(())
} }
/// Pulse Serial relay
async fn pulse_serial(&self, duration: Duration) -> Result<()> {
// Turn relay on
self.send_serial_relay_command(true)?;
// Wait for duration
sleep(duration).await;
// Turn relay off
self.send_serial_relay_command(false)?;
Ok(())
}
/// Send Serial relay command using cached handle
fn send_serial_relay_command(&self, on: bool) -> Result<()> {
let channel = self.config.pin as u8;
// LCUS-Type Protocol
// Checksum = A0 + channel + state
let state = if on { 1 } else { 0 };
let checksum = 0xA0u8.wrapping_add(channel).wrapping_add(state);
let cmd = [0xA0, channel, state, checksum];
let mut guard = self.serial_handle.lock().unwrap();
let port = guard
.as_mut()
.ok_or_else(|| AppError::Internal("Serial relay not initialized".to_string()))?;
port.write_all(&cmd)
.map_err(|e| AppError::Internal(format!("Serial relay write failed: {}", e)))?;
Ok(())
}
/// Shutdown the executor /// Shutdown the executor
pub async fn shutdown(&mut self) -> Result<()> { pub async fn shutdown(&mut self) -> Result<()> {
if !self.is_initialized() { if !self.is_initialized() {
@@ -237,6 +309,12 @@ impl AtxKeyExecutor {
// Release USB relay handle // Release USB relay handle
*self.usb_relay_handle.lock().unwrap() = None; *self.usb_relay_handle.lock().unwrap() = None;
} }
AtxDriverType::Serial => {
// Ensure relay is off before closing handle
let _ = self.send_serial_relay_command(false);
// Release Serial relay handle
*self.serial_handle.lock().unwrap() = None;
}
AtxDriverType::None => {} AtxDriverType::None => {}
} }
@@ -256,6 +334,12 @@ impl Drop for AtxKeyExecutor {
let _ = self.send_usb_relay_command(false); let _ = self.send_usb_relay_command(false);
} }
*self.usb_relay_handle.lock().unwrap() = None; *self.usb_relay_handle.lock().unwrap() = None;
// Ensure Serial relay is off and handle released
if self.config.driver == AtxDriverType::Serial && self.is_initialized() {
let _ = self.send_serial_relay_command(false);
}
*self.serial_handle.lock().unwrap() = None;
} }
} }
@@ -278,6 +362,7 @@ mod tests {
device: "/dev/gpiochip0".to_string(), device: "/dev/gpiochip0".to_string(),
pin: 5, pin: 5,
active_level: ActiveLevel::High, active_level: ActiveLevel::High,
baud_rate: 9600,
}; };
let executor = AtxKeyExecutor::new(config); let executor = AtxKeyExecutor::new(config);
assert!(executor.is_configured()); assert!(executor.is_configured());
@@ -291,6 +376,20 @@ mod tests {
device: "/dev/hidraw0".to_string(), device: "/dev/hidraw0".to_string(),
pin: 0, pin: 0,
active_level: ActiveLevel::High, // Ignored for USB relay active_level: ActiveLevel::High, // Ignored for USB relay
baud_rate: 9600,
};
let executor = AtxKeyExecutor::new(config);
assert!(executor.is_configured());
}
#[test]
fn test_executor_with_serial_config() {
let config = AtxKeyConfig {
driver: AtxDriverType::Serial,
device: "/dev/ttyUSB0".to_string(),
pin: 1,
active_level: ActiveLevel::High, // Ignored
baud_rate: 9600,
}; };
let executor = AtxKeyExecutor::new(config); let executor = AtxKeyExecutor::new(config);
assert!(executor.is_configured()); assert!(executor.is_configured());

View File

@@ -72,12 +72,15 @@ pub fn discover_devices() -> AtxDevices {
devices.gpio_chips.push(format!("/dev/{}", name_str)); devices.gpio_chips.push(format!("/dev/{}", name_str));
} else if name_str.starts_with("hidraw") { } else if name_str.starts_with("hidraw") {
devices.usb_relays.push(format!("/dev/{}", name_str)); devices.usb_relays.push(format!("/dev/{}", name_str));
} else if name_str.starts_with("ttyUSB") || name_str.starts_with("ttyACM") {
devices.serial_ports.push(format!("/dev/{}", name_str));
} }
} }
} }
devices.gpio_chips.sort(); devices.gpio_chips.sort();
devices.usb_relays.sort(); devices.usb_relays.sort();
devices.serial_ports.sort();
devices devices
} }
@@ -92,6 +95,7 @@ mod tests {
// Just verify the function runs without error // Just verify the function runs without error
assert!(devices.gpio_chips.len() >= 0); assert!(devices.gpio_chips.len() >= 0);
assert!(devices.usb_relays.len() >= 0); assert!(devices.usb_relays.len() >= 0);
assert!(devices.serial_ports.len() >= 0);
} }
#[test] #[test]

View File

@@ -33,6 +33,8 @@ pub enum AtxDriverType {
Gpio, Gpio,
/// USB HID relay module /// USB HID relay module
UsbRelay, UsbRelay,
/// Serial/COM port relay (LCUS type)
Serial,
/// Disabled / Not configured /// Disabled / Not configured
None, None,
} }
@@ -78,6 +80,8 @@ pub struct AtxKeyConfig {
pub pin: u32, pub pin: u32,
/// Active level (only applicable to GPIO, ignored for USB Relay) /// Active level (only applicable to GPIO, ignored for USB Relay)
pub active_level: ActiveLevel, pub active_level: ActiveLevel,
/// Baud rate for serial relay (start with 9600)
pub baud_rate: u32,
} }
impl Default for AtxKeyConfig { impl Default for AtxKeyConfig {
@@ -87,6 +91,7 @@ impl Default for AtxKeyConfig {
device: String::new(), device: String::new(),
pin: 0, pin: 0,
active_level: ActiveLevel::High, active_level: ActiveLevel::High,
baud_rate: 9600,
} }
} }
} }
@@ -185,6 +190,8 @@ pub struct AtxDevices {
pub gpio_chips: Vec<String>, pub gpio_chips: Vec<String>,
/// Available USB HID relay devices (/dev/hidraw*) /// Available USB HID relay devices (/dev/hidraw*)
pub usb_relays: Vec<String>, pub usb_relays: Vec<String>,
/// Available Serial ports (/dev/ttyUSB*)
pub serial_ports: Vec<String>,
} }
impl Default for AtxDevices { impl Default for AtxDevices {
@@ -192,6 +199,7 @@ impl Default for AtxDevices {
Self { Self {
gpio_chips: Vec::new(), gpio_chips: Vec::new(),
usb_relays: Vec::new(), usb_relays: Vec::new(),
serial_ports: Vec::new(),
} }
} }
} }

View File

@@ -118,6 +118,8 @@ export enum AtxDriverType {
Gpio = "gpio", Gpio = "gpio",
/** USB HID relay module */ /** USB HID relay module */
UsbRelay = "usbrelay", UsbRelay = "usbrelay",
/** Serial/COM port relay (LCUS type) */
Serial = "serial",
/** Disabled / Not configured */ /** Disabled / Not configured */
None = "none", None = "none",
} }
@@ -151,6 +153,8 @@ export interface AtxKeyConfig {
pin: number; pin: number;
/** Active level (only applicable to GPIO, ignored for USB Relay) */ /** Active level (only applicable to GPIO, ignored for USB Relay) */
active_level: ActiveLevel; active_level: ActiveLevel;
/** Baud rate for serial relay (start with 9600) */
baud_rate: number;
} }
/** LED sensing configuration (optional) */ /** LED sensing configuration (optional) */
@@ -387,6 +391,7 @@ export interface AppConfig {
export interface AtxKeyConfigUpdate { export interface AtxKeyConfigUpdate {
driver?: AtxDriverType; driver?: AtxDriverType;
device?: string; device?: string;
baud_rate?: number;
pin?: number; pin?: number;
active_level?: ActiveLevel; active_level?: ActiveLevel;
} }
@@ -415,6 +420,8 @@ export interface AtxConfigUpdate {
/** Available ATX devices for discovery */ /** Available ATX devices for discovery */
export interface AtxDevices { export interface AtxDevices {
/** Available GPIO chips (/dev/gpiochip*) */ /** Available GPIO chips (/dev/gpiochip*) */
/** Available Serial ports (/dev/ttyUSB*) */
serial_ports: string[];
gpio_chips: string[]; gpio_chips: string[];
/** Available USB HID relay devices (/dev/hidraw*) */ /** Available USB HID relay devices (/dev/hidraw*) */
usb_relays: string[]; usb_relays: string[];

View File

@@ -350,12 +350,14 @@ const atxConfig = ref({
device: '', device: '',
pin: 0, pin: 0,
active_level: 'high' as ActiveLevel, active_level: 'high' as ActiveLevel,
baud_rate: 9600,
}, },
reset: { reset: {
driver: 'none' as AtxDriverType, driver: 'none' as AtxDriverType,
device: '', device: '',
pin: 0, pin: 0,
active_level: 'high' as ActiveLevel, active_level: 'high' as ActiveLevel,
baud_rate: 9600,
}, },
led: { led: {
enabled: false, enabled: false,
@@ -370,6 +372,7 @@ const atxConfig = ref({
const atxDevices = ref<AtxDevices>({ const atxDevices = ref<AtxDevices>({
gpio_chips: [], gpio_chips: [],
usb_relays: [], usb_relays: [],
serial_ports: [],
}) })
// Encoder backend // Encoder backend
@@ -927,13 +930,15 @@ async function saveAtxConfig() {
driver: atxConfig.value.power.driver, driver: atxConfig.value.power.driver,
device: atxConfig.value.power.device || undefined, device: atxConfig.value.power.device || undefined,
pin: atxConfig.value.power.pin, pin: atxConfig.value.power.pin,
active_level: atxConfig.value.power.active_level, baud_rate: atxConfig.value.power.baud_rate,
}, },
reset: { reset: {
driver: atxConfig.value.reset.driver, driver: atxConfig.value.reset.driver,
device: atxConfig.value.reset.device || undefined, device: atxConfig.value.reset.device || undefined,
pin: atxConfig.value.reset.pin, pin: atxConfig.value.reset.pin,
active_level: atxConfig.value.reset.active_level, active_level: atxConfig.value.reset.active_level,
baud_rate: atxConfig.value.reset.baud_rate
active_level: atxConfig.value.reset.active_level,
}, },
led: { led: {
enabled: atxConfig.value.led.enabled, enabled: atxConfig.value.led.enabled,
@@ -955,6 +960,8 @@ async function saveAtxConfig() {
function getAtxDevicesForDriver(driver: string): string[] { function getAtxDevicesForDriver(driver: string): string[] {
if (driver === 'gpio') { if (driver === 'gpio') {
return atxDevices.value.gpio_chips return atxDevices.value.gpio_chips
} else if (driver === 'serial') {
return atxDevices.value.serial_ports
} else if (driver === 'usbrelay') { } else if (driver === 'usbrelay') {
return atxDevices.value.usb_relays return atxDevices.value.usb_relays
} }
@@ -1906,6 +1913,7 @@ onMounted(async () => {
<option value="none">{{ t('settings.atxDriverNone') }}</option> <option value="none">{{ t('settings.atxDriverNone') }}</option>
<option value="gpio">{{ t('settings.atxDriverGpio') }}</option> <option value="gpio">{{ t('settings.atxDriverGpio') }}</option>
<option value="usbrelay">{{ t('settings.atxDriverUsbRelay') }}</option> <option value="usbrelay">{{ t('settings.atxDriverUsbRelay') }}</option>
<option value="serial">Serial (LCUS)</option>
</select> </select>
</div> </div>
<div class="space-y-2"> <div class="space-y-2">
@@ -1918,7 +1926,7 @@ onMounted(async () => {
</div> </div>
<div class="grid gap-4 sm:grid-cols-2"> <div class="grid gap-4 sm:grid-cols-2">
<div class="space-y-2"> <div class="space-y-2">
<Label for="power-pin">{{ atxConfig.power.driver === 'usbrelay' ? t('settings.atxChannel') : t('settings.atxPin') }}</Label> <Label for="power-pin">{{ ['usbrelay', 'serial'].includes(atxConfig.power.driver) ? t('settings.atxChannel') : t('settings.atxPin') }}</Label>
<Input id="power-pin" type="number" v-model.number="atxConfig.power.pin" min="0" :disabled="atxConfig.power.driver === 'none'" /> <Input id="power-pin" type="number" v-model.number="atxConfig.power.pin" min="0" :disabled="atxConfig.power.driver === 'none'" />
</div> </div>
<div v-if="atxConfig.power.driver === 'gpio'" class="space-y-2"> <div v-if="atxConfig.power.driver === 'gpio'" class="space-y-2">
@@ -1928,6 +1936,16 @@ onMounted(async () => {
<option value="low">{{ t('settings.atxLevelLow') }}</option> <option value="low">{{ t('settings.atxLevelLow') }}</option>
</select> </select>
</div> </div>
<div v-if="atxConfig.power.driver === 'serial'" class="space-y-2">
<Label for="power-baudrate">{{ t('settings.baudRate') }}</Label>
<select id="power-baudrate" v-model.number="atxConfig.power.baud_rate" class="w-full h-9 px-3 rounded-md border border-input bg-background text-sm">
<option :value="9600">9600</option>
<option :value="19200">19200</option>
<option :value="38400">38400</option>
<option :value="57600">57600</option>
<option :value="115200">115200</option>
</select>
</div>
</div> </div>
</CardContent> </CardContent>
</Card> </Card>
@@ -1946,6 +1964,7 @@ onMounted(async () => {
<option value="none">{{ t('settings.atxDriverNone') }}</option> <option value="none">{{ t('settings.atxDriverNone') }}</option>
<option value="gpio">{{ t('settings.atxDriverGpio') }}</option> <option value="gpio">{{ t('settings.atxDriverGpio') }}</option>
<option value="usbrelay">{{ t('settings.atxDriverUsbRelay') }}</option> <option value="usbrelay">{{ t('settings.atxDriverUsbRelay') }}</option>
<option value="serial">Serial (LCUS)</option>
</select> </select>
</div> </div>
<div class="space-y-2"> <div class="space-y-2">
@@ -1958,7 +1977,7 @@ onMounted(async () => {
</div> </div>
<div class="grid gap-4 sm:grid-cols-2"> <div class="grid gap-4 sm:grid-cols-2">
<div class="space-y-2"> <div class="space-y-2">
<Label for="reset-pin">{{ atxConfig.reset.driver === 'usbrelay' ? t('settings.atxChannel') : t('settings.atxPin') }}</Label> <Label for="reset-pin">{{ ['usbrelay', 'serial'].includes(atxConfig.reset.driver) ? t('settings.atxChannel') : t('settings.atxPin') }}</Label>
<Input id="reset-pin" type="number" v-model.number="atxConfig.reset.pin" min="0" :disabled="atxConfig.reset.driver === 'none'" /> <Input id="reset-pin" type="number" v-model.number="atxConfig.reset.pin" min="0" :disabled="atxConfig.reset.driver === 'none'" />
</div> </div>
<div v-if="atxConfig.reset.driver === 'gpio'" class="space-y-2"> <div v-if="atxConfig.reset.driver === 'gpio'" class="space-y-2">
@@ -1968,6 +1987,16 @@ onMounted(async () => {
<option value="low">{{ t('settings.atxLevelLow') }}</option> <option value="low">{{ t('settings.atxLevelLow') }}</option>
</select> </select>
</div> </div>
<div v-if="atxConfig.reset.driver === 'serial'" class="space-y-2">
<Label for="reset-baudrate">{{ t('settings.baudRate') }}</Label>
<select id="reset-baudrate" v-model.number="atxConfig.reset.baud_rate" class="w-full h-9 px-3 rounded-md border border-input bg-background text-sm">
<option :value="9600">9600</option>
<option :value="19200">19200</option>
<option :value="38400">38400</option>
<option :value="57600">57600</option>
<option :value="115200">115200</option>
</select>
</div>
</div> </div>
</CardContent> </CardContent>
</Card> </Card>