fp-brightness: Add support for V1 host command

V0:
- Set level (ultra-low, low, medium, high, auto)
- Get percentage

V1:
- Set percentage
- Get level (ultra-low, low, medium, high, auto)

Signed-off-by: Daniel Schaefer <dhs@frame.work>

Author: JohnAZoidberg

framework_lib/src/chromium_ec/commands.rs

@@ -849,7 +849,7 @@ pub enum FpLedBrightnessLevel {
 }
 
 #[repr(C, packed)]
-pub struct EcRequestFpLedLevelControl {
+pub struct EcRequestFpLedLevelControlV0 {
     /// See enum FpLedBrightnessLevel
     pub set_level: u8,
     /// Boolean. >1 to get the level
@@ -858,12 +858,42 @@ pub struct EcRequestFpLedLevelControl {
 
 #[repr(C, packed)]
 #[derive(Clone, Copy, PartialEq, Eq, Debug)]
-pub struct EcResponseFpLedLevelControl {
+pub struct EcResponseFpLedLevelControlV0 {
+    /// Current brightness, 1-100%
+    pub percentage: u8,
+}
+
+impl EcRequest<EcResponseFpLedLevelControlV0> for EcRequestFpLedLevelControlV0 {
+    fn command_id() -> EcCommands {
+        EcCommands::FpLedLevelControl
+    }
+    fn command_version() -> u8 {
+        0
+    }
+}
+
+#[repr(C, packed)]
+pub struct EcRequestFpLedLevelControlV1 {
+    /// Percentage 1-100
+    pub set_percentage: u8,
+    /// Boolean. >1 to get the level
+    pub get_level: u8,
+}
+
+#[repr(C, packed)]
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub struct EcResponseFpLedLevelControlV1 {
+    /// Current brightness, 1-100%
+    pub percentage: u8,
+    /// Requested level. See enum FpLedBrightnessLevel
     pub level: u8,
 }
 
-impl EcRequest<EcResponseFpLedLevelControl> for EcRequestFpLedLevelControl {
+impl EcRequest<EcResponseFpLedLevelControlV1> for EcRequestFpLedLevelControlV1 {
     fn command_id() -> EcCommands {
         EcCommands::FpLedLevelControl
     }
+    fn command_version() -> u8 {
+        1
+    }
 }

framework_lib/src/chromium_ec/mod.rs

@@ -313,6 +313,17 @@ impl CrosEc {
         Ok((limits.min_percentage, limits.max_percentage))
     }
 
+    pub fn set_fp_led_percentage(&self, percentage: u8) -> EcResult<()> {
+        // Sending bytes manually because the Set command, as opposed to the Get command,
+        // does not return any data
+        let limits = &[percentage, 0x00];
+        let data = self.send_command(EcCommands::FpLedLevelControl as u16, 1, limits)?;
+
+        util::assert_win_len(data.len(), 0);
+
+        Ok(())
+    }
+
     pub fn set_fp_led_level(&self, level: FpLedBrightnessLevel) -> EcResult<()> {
         // Sending bytes manually because the Set command, as opposed to the Get command,
         // does not return any data
@@ -325,16 +336,33 @@ impl CrosEc {
     }
 
     /// Get fingerprint led brightness level
-    pub fn get_fp_led_level(&self) -> EcResult<u8> {
-        let res = EcRequestFpLedLevelControl {
-            set_level: 0xFF,
+    pub fn get_fp_led_level(&self) -> EcResult<(u8, Option<FpLedBrightnessLevel>)> {
+        let res = EcRequestFpLedLevelControlV1 {
+            set_percentage: 0xFF,
             get_level: 0xFF,
         }
-        .send_command(self)?;
+        .send_command(self);
+
+        // If V1 does not exist, fall back
+        if let Err(EcError::Response(EcResponseStatus::InvalidVersion)) = res {
+            let res = EcRequestFpLedLevelControlV0 {
+                set_level: 0xFF,
+                get_level: 0xFF,
+            }
+            .send_command(self)?;
+            debug!("Current Brightness: {}%", res.percentage);
+            return Ok((res.percentage, None));
+        }
+
+        let res = res?;
 
-        debug!("Level Raw: {}", res.level);
+        debug!("Current Brightness: {}%", res.percentage);
+        debug!("Level Raw:          {}", res.level);
 
-        Ok(res.level)
+        // TODO: can turn this into None and log
+        let level = FromPrimitive::from_u8(res.level)
+            .ok_or(EcError::DeviceError(format!("Invalid level {}", res.level)))?;
+        Ok((res.percentage, Some(level)))
     }
 
     /// Get the intrusion switch status (whether the chassis is open or not)

framework_lib/src/commandline/mod.rs

@@ -1364,8 +1364,13 @@ fn handle_fp_brightness(ec: &CrosEc, maybe_brightness: Option<FpBrightnessArg>)
         ec.set_fp_led_level(brightness.into())?;
     }
 
-    let level = ec.get_fp_led_level()?;
-    println!("Fingerprint LED Brightness: {:?}%", level);
+    let (brightness, level) = ec.get_fp_led_level()?;
+    // TODO: Rename to power button
+    println!("Fingerprint LED Brightness");
+    if let Some(level) = level {
+        println!("  Requested:  {:?}", level);
+    }
+    println!("  Brightness: {}%", brightness);
 
     Ok(())
 }