more debugging

Signed-off-by: Daniel Schaefer <[email protected]>

Author: JohnAZoidberg

framework_lib/src/touchscreen.rs

@@ -5,12 +5,21 @@ pub const ILI_PID: u16 = 0x5539;
 pub const USI_BITMAP: u8 = 1 << 1;
 pub const MPP_BITMAP: u8 = 1 << 2;
 
-fn send_message(device: &HidDevice, message_id: u8, read_len: usize) -> Result<Vec<u8>, HidError> {
+fn send_message(device: &HidDevice, message_id: u8, read_len: usize, data: Vec<u8>) -> Result<Vec<u8>, HidError> {
     let report_id = 0x03;
-    let write_len = 0x01;
-    let mut msg = vec![report_id, 0xA3, write_len, read_len as u8, message_id];
+    let data_len = data.len();
+    let mut msg = [0u8; 0x40];
+    msg[0] = report_id;
+    msg[1] = 0xA3;
+    msg[2] = data_len as u8;
+    msg[3] = read_len as u8;
+    msg[4] = message_id;
+    for (i, b) in data.into_iter().enumerate() {
+        msg[5 + i] = b;
+    }
 
     // Not sure why, but on Windows we just have to write an output report
+    // HidApiError { message: "HidD_SetFeature: (0x00000057) The parameter is incorrect." }
     #[cfg(target_os = "windows")]
     let send_feature_report = false;
     #[cfg(not(target_os = "windows"))]
@@ -24,16 +33,46 @@ fn send_message(device: &HidDevice, message_id: u8, read_len: usize) -> Result<V
         device.write(&msg)?;
     }
 
-    msg.pop();
-    let mut buf: [u8; 255] = [0; 255];
+    use std::{thread, time};
+    thread::sleep(time::Duration::from_millis(1000));
+
+    if read_len == 0 {
+        return Ok(vec![]);
+    }
+
+    let msg_len = 3 + data_len;
+    let mut buf: [u8; 0x40] = [0; 0x40];
     debug!("  Reading");
-    device.read(&mut buf[..read_len + msg.len()])?;
+    let mut res = device.read(&mut buf);
+    debug!("  res: {:?}", res);
     debug!("  Read buf: {:X?}", buf);
-    Ok(buf[msg.len()..msg.len() + read_len].to_vec())
+    if let Err(_) = res {
+        res = device.read_timeout(&mut buf[..read_len + msg_len], 100);
+        debug!("  res: {:?}", res);
+        debug!("  Read buf: {:X?}", buf);
+    }
+    if let Err(_) = res {
+        res = device.read_timeout(&mut buf[..read_len + msg_len], 100);
+        debug!("  res: {:?}", res);
+        debug!("  Read buf: {:X?}", buf);
+    }
+    if let Err(_) = res {
+        res = device.read_timeout(&mut buf[..read_len + msg_len], 100);
+        debug!("  res: {:?}", res);
+        debug!("  Read buf: {:X?}", buf);
+    }
+    if let Err(_) = res {
+        device.read_timeout(&mut buf[..read_len + msg_len], 100)?;
+        debug!("  Read buf: {:X?}", buf);
+    }
+    Ok(buf[msg_len..msg_len + read_len].to_vec())
 }
 
 fn check_fw_version(device: &HidDevice) -> Result<(), HidError> {
-    let res = send_message(device, 0x42, 3)?;
+    device.set_blocking_mode(true).unwrap();
+    send_message(device, 0xF0, 0, vec![3, 0, 0]).unwrap();
+
+    let res = send_message(device, 0x42, 3, vec![0])?;
     let ver = res
         .iter()
         .skip(1)
@@ -42,15 +81,16 @@ fn check_fw_version(device: &HidDevice) -> Result<(), HidError> {
         });
     // Expecting 06.00.0A
     debug!("  Protocol Version: v{}", ver);
+    return Ok(());
 
-    let res = send_message(device, 0x40, 8)?;
+    let res = send_message(device, 0x40, 8, vec![0])?;
     let ver = res
         .iter()
         .skip(1)
         .fold(res[0].to_string(), |acc, &x| acc + "." + &x.to_string());
     println!("  Firmware Version: v{}", ver);
 
-    let res = send_message(device, 0x20, 16)?;
+    let res = send_message(device, 0x20, 16, vec![0])?;
     println!("  USI Protocol:     {:?}", (res[15] & USI_BITMAP) > 0);
     println!("  MPP Protocol:     {:?}", (res[15] & MPP_BITMAP) > 0);
 
@@ -65,17 +105,16 @@ pub fn print_touchscreen_fw_ver() -> Result<(), HidError> {
                 let vid = dev_info.vendor_id();
                 let pid = dev_info.product_id();
                 let usage_page = dev_info.usage_page();
-
+                if vid != ILI_VID {
+                    trace!("    Skipping VID:PID. Expected {:04X}:*", ILI_VID);
+                    continue;
+                }
                 debug!(
                     "  Found {:04X}:{:04X} (Usage Page {:04X})",
                     vid, pid, usage_page
                 );
-                if vid != ILI_VID {
-                    debug!("  Skipping VID:PID. Expected {:04X}:*", ILI_VID);
-                    continue;
-                }
                 if usage_page != 0xFF00 {
-                    debug!("  Skipping usage page. Expected {:04X}", 0xFF00);
+                    debug!("    Skipping usage page. Expected {:04X}", 0xFF00);
                     continue;
                 }
                 if pid != ILI_PID {
@@ -84,6 +123,7 @@ pub fn print_touchscreen_fw_ver() -> Result<(), HidError> {
 
                 debug!("  Found matching touchscreen HID device");
                 println!("Touchscreen");
+                println!("  Path:   {:?}", dev_info.path());
                 println!("  IC Type:          {:04X}", pid);
 
                 // Unwrapping because if we can enumerate it, we should be able to open it