Add basic manufacturing test tooling

Author: haata

examples/rpc.rs

@@ -65,7 +65,10 @@ fn format_node(node: hid_io_core::common_capnp::destination::Reader<'_>) -> Stri
     )
 }
 
-struct KeyboardSubscriberImpl;
+#[derive(Default)]
+pub struct KeyboardSubscriberImpl {
+    pub hall_effect_switch_data: Vec<u16>,
+}
 
 impl keyboard_capnp::keyboard::subscriber::Server for KeyboardSubscriberImpl {
     fn update(
@@ -87,6 +90,33 @@ impl keyboard_capnp::keyboard::subscriber::Server for KeyboardSubscriberImpl {
                     let res = res.unwrap();
                     println!("{}:{} => ", res.get_cmd(), res.get_arg());
                     match res.get_cmd() {
+                        1 => match res.get_arg() {
+                            2 | 3 => {
+                                // LED short/open test
+                                let mut pos: usize = 0;
+                                let data = res.get_data().unwrap();
+                                loop {
+                                    let chipid = data.get(pos as u32);
+                                    pos += 1;
+                                    let buffer_len = data.get(pos as u32);
+                                    pos += 1;
+                                    let buffer =
+                                        &data.as_slice().unwrap()[pos..pos + buffer_len as usize];
+                                    pos += buffer_len as usize;
+                                    println!("ChipId: {} {}", chipid, buffer_len);
+                                    for byte in buffer {
+                                        print!("{:02x} ", byte);
+                                    }
+                                    println!();
+                                    if pos >= data.len().try_into().unwrap() {
+                                        break;
+                                    }
+                                }
+                            }
+                            _ => {
+                                println!("Manufacturing command {} not implemented", res.get_arg())
+                            }
+                        },
                         3 => match res.get_arg() {
                             2 => {
                                 let split = res.get_data().unwrap().len() / 2 / 6;
@@ -95,7 +125,13 @@ impl keyboard_capnp::keyboard::subscriber::Server for KeyboardSubscriberImpl {
                                 for byte in res.get_data().unwrap() {
                                     tmp.push(byte);
                                     if tmp.len() == 2 {
-                                        print!("{:>4} ", u16::from_le_bytes([tmp[0], tmp[1]]));
+                                        // Check if header (strobe) or sense data
+                                        if pos % 7 == 0 {
+                                            print!("{:>4} ", tmp[0]);
+                                        } else {
+                                            let data = u16::from_le_bytes([tmp[0], tmp[1]]);
+                                            print!("{:>4} ", data);
+                                        }
                                         tmp.clear();
                                         pos += 1;
                                         if pos % split == 0 {
@@ -290,7 +326,7 @@ async fn try_main() -> Result<(), ::capnp::Error> {
         serial = device.get_serial().unwrap().to_string();
 
         // Build subscription callback
-        let subscription = capnp_rpc::new_client(KeyboardSubscriberImpl);
+        let subscription = capnp_rpc::new_client(KeyboardSubscriberImpl::default());
 
         // Subscribe to cli messages
         let subscribe_req = {

examples/tool.rs

@@ -558,6 +558,11 @@ async fn try_main() -> Result<(), ::capnp::Error> {
                     println!("Sent (str): '{}'", String::from_utf8_lossy(data_cmd));
                     println!("Recv (str): '{}'", String::from_utf8_lossy(data_ack));
                     assert_eq!(data_cmd, data_ack, "Sent does not equal received!");
+
+                    // Wait for any Manufacturing Test Data packets
+                    // TODO - Only wait if argument is set
+                    // - Build subscription for Manufacturing Test Data packets
+                    // - Wait for Manufacturing Test Data packets
                 }
             }
             _ => {

hid-io-protocol/src/commands/mod.rs

@@ -2343,6 +2343,7 @@ pub trait Commands<
         }
 
         buf.done = true;
+        trace!("h0051_manufacturingres: {:?} - {:?}", data, buf);
 
         self.tx_packetbuffer_send(&mut buf)
     }
@@ -2384,7 +2385,7 @@ pub trait Commands<
                     raw: u16::from_le_bytes(buf.data[2..4].try_into().unwrap()),
                 };
                 let data: Vec<u8, HSUB4> = if buf.data.len() > 4 {
-                    Vec::from_slice(&buf.data[5..]).unwrap()
+                    Vec::from_slice(&buf.data[4..]).unwrap()
                 } else {
                     Vec::new()
                 };

hid-io-protocol/src/lib.rs

@@ -641,8 +641,9 @@ impl<const H: usize> HidIoPacketBuffer<H> {
                 match ptype {
                     HidIoPacketType::Continued | HidIoPacketType::NaContinued => {}
                     _ => {
-                        warn!("Dropping. Invalid packet type (non-HidIoPacketType::Continued) on a already initialized buffer: {} {}", ptype, self.data.is_empty());
-                        return Ok(packet_len);
+                        warn!("Dropping buffer. Invalid packet type (non-HidIoPacketType::Continued) on a already initialized buffer: {} {}", ptype, self.data.is_empty());
+                        self.clear();
+                        return self.decode_packet(packet_data);
                     }
                 }
             }

src/device/hidapi/mod.rs

@@ -287,6 +287,7 @@ async fn processing(mailbox: mailbox::Mailbox) {
                             // Attempt to synchronize device (sync packet)
                             if let Err(e) = device.send_sync() {
                                 // Could not open device (likely removed, or in use)
+                                uids.write().unwrap().remove(&uid);
                                 warn!("Failed to sync device - {}", e);
                             } else {
                                 // Setup device controller (handles communication and protocol conversion