Show firmware version of Framework 16 Inputmodules

framework_lib/src/commandline/mod.rs

@@ -46,6 +46,8 @@ use crate::chromium_ec::{EcError, EcResult};
 use crate::csme;
 use crate::ec_binary;
 use crate::esrt;
+#[cfg(feature = "rusb")]
+use crate::inputmodule::check_inputmodule_version;
 use crate::power;
 use crate::smbios;
 use crate::smbios::ConfigDigit0;
@@ -477,6 +479,9 @@ fn print_versions(ec: &CrosEc) {
     #[cfg(feature = "rusb")]
     let _ignore_err = check_camera_version();
 
+    #[cfg(feature = "rusb")]
+    let _ignore_err = check_inputmodule_version();
+
     #[cfg(feature = "hidapi")]
     let _ignore_err = print_touchpad_fw_ver();
 

framework_lib/src/inputmodule.rs

@@ -0,0 +1,62 @@
+pub const FRAMEWORK_VID: u16 = 0x32AC;
+pub const LEDMATRIX_PID: u16 = 0x0020;
+pub const FRAMEWORK16_INPUTMODULE_PIDS: [u16; 6] = [
+    0x0012, // Keyboard White Backlight ANSI
+    0x0013, // Keyboard RGB Backlight Numpad
+    0x0014, // Keyboard White Backlight Numpad
+    0x0018, // Keyboard White Backlight ISO
+    0x0019, // Keyboard White Backlight JIS
+    LEDMATRIX_PID,
+];
+
+/// Get and print the firmware version of the camera
+pub fn check_inputmodule_version() -> Result<(), rusb::Error> {
+    for dev in rusb::devices().unwrap().iter() {
+        let dev_descriptor = dev.device_descriptor().unwrap();
+        let vid = dev_descriptor.vendor_id();
+        let pid = dev_descriptor.product_id();
+        if vid != FRAMEWORK_VID || !FRAMEWORK16_INPUTMODULE_PIDS.contains(&pid) {
+            trace!("Skipping {:04X}:{:04X}", vid, pid);
+            continue;
+        }
+
+        // I'm not sure why, but the LED Matrix can't be opened with this code
+        if pid == LEDMATRIX_PID {
+            println!("LED Matrix");
+        } else {
+            debug!("Opening {:04X}:{:04X}", vid, pid);
+            let handle = dev.open().unwrap();
+
+            let dev_descriptor = dev.device_descriptor()?;
+            let i_product = dev_descriptor
+                .product_string_index()
+                .and_then(|x| handle.read_string_descriptor_ascii(x).ok());
+            println!("{}", i_product.unwrap_or_default());
+        }
+        println!("  Firmware Version: {}", dev_descriptor.device_version());
+
+        debug!("Address:      {:?}", dev.address());
+        debug!("Bus  Number:  {:?}", dev.bus_number());
+        debug!("Port Number:  {:?}", dev.port_number());
+        debug!("Port Numbers: {:?}", dev.port_numbers());
+        let port_numbers = dev.port_numbers();
+        let location = if let Ok(port_numbers) = port_numbers {
+            if port_numbers.len() == 2 {
+                match (port_numbers[0], port_numbers[1]) {
+                    (4, 2) => "[X] [ ] [ ]       [ ] [ ]",
+                    (4, 3) => "[ ] [X] [ ]       [ ] [ ]",
+                    (3, 1) => "[ ] [ ] [X]       [ ] [ ]",
+                    (3, 2) => "[ ] [ ] [ ]       [X] [ ]",
+                    (3, 3) => "[ ] [ ] [ ]       [ ] [X]",
+                    _ => "Unknown",
+                }
+            } else {
+                "Unknown"
+            }
+        } else {
+            "Unknown"
+        };
+        println!("  Location: {}", location);
+    }
+    Ok(())
+}

framework_lib/src/lib.rs

@@ -16,6 +16,8 @@ extern crate log;
 pub mod audio_card;
 #[cfg(feature = "rusb")]
 pub mod camera;
+#[cfg(feature = "rusb")]
+pub mod inputmodule;
 #[cfg(feature = "hidapi")]
 pub mod touchpad;
 #[cfg(any(feature = "hidapi", feature = "windows"))]