sjg/trx-rs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix](trx-backend-ft817): bound lock/unlock reads to prevent set_mode timeout

Browse Source
This commit is contained in:
Stan Grams
2026-03-05 20:44:32 +01:00
parent ccef359034
commit a041dd4505
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trx-server/trx-backend/trx-backend-ft817/src/lib.rs
+20 -8
View File
@@ -360,10 +360,16 @@ impl Ft817 {
let frame = [0x00, 0x00, 0x00, 0x00, CMD_LOCK]; let frame = [0x00, 0x00, 0x00, 0x00, CMD_LOCK];
self.write_frame(&frame).await?; self.write_frame(&frame).await?;
let mut buf = [0u8; 1]; let mut buf = [0u8; 1];
if let Err(e) = self.port.read_exact(&mut buf).await { match timeout(Self::READ_TIMEOUT, self.port.read_exact(&mut buf)).await {
tracing::warn!("LOCK read failed: {:?}", e); Ok(Ok(_)) => {
} else { tracing::debug!("LOCK response: 0x{:02X}", buf[0]);
tracing::debug!("LOCK response: 0x{:02X}", buf[0]); }
Ok(Err(e)) => {
tracing::warn!("LOCK read failed: {:?}", e);
}
Err(_) => {
tracing::warn!("LOCK read timed out");
}
} }
Ok(()) Ok(())
} }
@@ -373,10 +379,16 @@ impl Ft817 {
let frame = [0x00, 0x00, 0x00, 0x00, CMD_UNLOCK]; let frame = [0x00, 0x00, 0x00, 0x00, CMD_UNLOCK];
self.write_frame(&frame).await?; self.write_frame(&frame).await?;
let mut buf = [0u8; 1]; let mut buf = [0u8; 1];
if let Err(e) = self.port.read_exact(&mut buf).await { match timeout(Self::READ_TIMEOUT, self.port.read_exact(&mut buf)).await {
tracing::warn!("UNLOCK read failed: {:?}", e); Ok(Ok(_)) => {
} else { tracing::debug!("UNLOCK response: 0x{:02X}", buf[0]);
tracing::debug!("UNLOCK response: 0x{:02X}", buf[0]); }
Ok(Err(e)) => {
tracing::warn!("UNLOCK read failed: {:?}", e);
}
Err(_) => {
tracing::warn!("UNLOCK read timed out");
}
} }
Ok(()) Ok(())
} }