fp-brightness: Add fp-led-level for V1 command

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

Author: JohnAZoidberg

framework_lib/src/commandline/clap_std.rs

@@ -137,9 +137,13 @@ struct ClapCli {
     #[arg(long)]
     get_gpio: Option<String>,
 
-    /// Get or set fingerprint LED brightness
+    /// Get or set fingerprint LED brightness level
     #[arg(long)]
-    fp_brightness: Option<Option<FpBrightnessArg>>,
+    fp_led_level: Option<Option<FpBrightnessArg>>,
+
+    /// Get or set fingerprint LED brightness percentage
+    #[arg(long)]
+    fp_brightness: Option<Option<u8>>,
 
     /// Set keyboard backlight percentage or get, if no value provided
     #[arg(long)]
@@ -267,6 +271,7 @@ pub fn parse(args: &[String]) -> Cli {
         input_deck_mode: args.input_deck_mode,
         charge_limit: args.charge_limit,
         get_gpio: args.get_gpio,
+        fp_led_level: args.fp_led_level,
         fp_brightness: args.fp_brightness,
         kblight: args.kblight,
         tablet_mode: args.tablet_mode,

framework_lib/src/commandline/mod.rs

@@ -163,7 +163,8 @@ pub struct Cli {
     pub input_deck_mode: Option<InputDeckModeArg>,
     pub charge_limit: Option<Option<u8>>,
     pub get_gpio: Option<String>,
-    pub fp_brightness: Option<Option<FpBrightnessArg>>,
+    pub fp_led_level: Option<Option<FpBrightnessArg>>,
+    pub fp_brightness: Option<Option<u8>>,
     pub kblight: Option<Option<u8>>,
     pub tablet_mode: Option<TabletModeArg>,
     pub console: Option<ConsoleArg>,
@@ -745,6 +746,8 @@ pub fn run_with_args(args: &Cli, _allupdate: bool) -> i32 {
         } else {
             println!("Not found");
         }
+    } else if let Some(maybe_led_level) = &args.fp_led_level {
+        print_err(handle_fp_led_level(&ec, *maybe_led_level));
     } else if let Some(maybe_brightness) = &args.fp_brightness {
         print_err(handle_fp_brightness(&ec, *maybe_brightness));
     } else if let Some(Some(kblight)) = args.kblight {
@@ -1359,9 +1362,25 @@ fn handle_charge_limit(ec: &CrosEc, maybe_limit: Option<u8>) -> EcResult<()> {
     Ok(())
 }
 
-fn handle_fp_brightness(ec: &CrosEc, maybe_brightness: Option<FpBrightnessArg>) -> EcResult<()> {
+fn handle_fp_led_level(ec: &CrosEc, maybe_led_level: Option<FpBrightnessArg>) -> EcResult<()> {
+    if let Some(led_level) = maybe_led_level {
+        ec.set_fp_led_level(led_level.into())?;
+    }
+
+    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(())
+}
+
+fn handle_fp_brightness(ec: &CrosEc, maybe_brightness: Option<u8>) -> EcResult<()> {
     if let Some(brightness) = maybe_brightness {
-        ec.set_fp_led_level(brightness.into())?;
+        ec.set_fp_led_percentage(brightness)?;
     }
 
     let (brightness, level) = ec.get_fp_led_level()?;

framework_lib/src/commandline/uefi.rs

@@ -84,6 +84,7 @@ pub fn parse(args: &[String]) -> Cli {
         input_deck_mode: None,
         charge_limit: None,
         get_gpio: None,
+        fp_led_level: None,
         fp_brightness: None,
         kblight: None,
         tablet_mode: None,
@@ -237,21 +238,41 @@ pub fn parse(args: &[String]) -> Cli {
                 None
             };
             found_an_option = true;
-        } else if arg == "--fp-brightness" {
-            cli.fp_brightness = if args.len() > i + 1 {
-                let fp_brightness_arg = &args[i + 1];
-                if fp_brightness_arg == "high" {
+        } else if arg == "--fp-led-level" {
+            cli.fp_led_level = if args.len() > i + 1 {
+                let fp_led_level_arg = &args[i + 1];
+                if fp_led_level_arg == "high" {
                     Some(Some(FpBrightnessArg::High))
-                } else if fp_brightness_arg == "medium" {
+                } else if fp_led_level_arg == "medium" {
                     Some(Some(FpBrightnessArg::Medium))
-                } else if fp_brightness_arg == "low" {
+                } else if fp_led_level_arg == "low" {
                     Some(Some(FpBrightnessArg::Low))
-                } else if fp_brightness_arg == "ultra-low" {
+                } else if fp_led_level_arg == "ultra-low" {
                     Some(Some(FpBrightnessArg::UltraLow))
-                } else if fp_brightness_arg == "auto" {
+                } else if fp_led_level_arg == "auto" {
                     Some(Some(FpBrightnessArg::Auto))
                 } else {
-                    println!("Invalid value for --fp-brightness: {}", fp_brightness_arg);
+                    println!("Invalid value for --fp-led-level: {}", fp_led_level_arg);
+                    None
+                }
+            } else {
+                Some(None)
+            };
+            found_an_option = true;
+        } else if arg == "--fp-brightness" {
+            cli.fp_brightness = if args.len() > i + 1 {
+                if let Ok(fp_brightness_arg) = args[i + 1].parse::<u8>() {
+                    if fp_brightness_arg == 0 || fp_brightness_arg > 100 {
+                        println!(
+                            "Invalid value for --fp-brightness: {}. Must be in the range of 1-100",
+                            fp_brightness_arg
+                        );
+                        None
+                    } else {
+                        Some(Some(fp_brightness_arg))
+                    }
+                } else {
+                    println!("Invalid value for --fp-brightness. Must be in the range of 1-100");
                     None
                 }
             } else {