Add commandline option to set charger current limit

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

Author: JohnAZoidberg

EXAMPLES.md

@@ -170,3 +170,46 @@ Battery Status
   Charge level:     92%
   Battery discharging
 ```
+
+### Setting a custom charger current limit
+
+```
+# Set limit to 2A
+> sudo framework_tool --charge-current-limit 2000
+
+# And then plug in a power adapter
+> sudo framework_tool --power
+Charger Status
+  AC is:            connected
+  Charger Voltage:  17800mV
+  Charger Current:  2000mA
+  Chg Input Current:3084mA
+  Battery SoC:      87%
+Battery Status
+  AC is:            connected
+  Battery is:       connected
+  Battery LFCC:     3713 mAh (Last Full Charge Capacity)
+  Battery Capacity: 3215 mAh
+                    56.953 Wh
+  Charge level:     86%
+  Battery charging
+
+# Remove limit (highest USB-PD current is 5A)
+> sudo framework_tool --charge-current-limit 5000
+
+> sudo framework_tool --power
+Charger Status
+  AC is:            connected
+  Charger Voltage:  17800mV
+  Charger Current:  2740mA
+  Chg Input Current:3084mA
+  Battery SoC:      92%
+Battery Status
+  AC is:            connected
+  Battery is:       connected
+  Battery LFCC:     3713 mAh (Last Full Charge Capacity)
+  Battery Capacity: 3387 mAh
+                    60.146 Wh
+  Charge level:     91%
+  Battery charging
+```

framework_lib/src/chromium_ec/command.rs

@@ -41,6 +41,7 @@ pub enum EcCommands {
     ConsoleSnapshot = 0x0097,
     ConsoleRead = 0x0098,
     ChargeState = 0x00A0,
+    ChargeCurrentLimit = 0x00A1,
     /// List the features supported by the firmware
     GetFeatures = 0x000D,
     /// Force reboot, causes host reboot as well

framework_lib/src/chromium_ec/commands.rs

@@ -409,6 +409,35 @@ impl EcRequest<EcResponseChargeStateGetV0> for EcRequestChargeStateGetV0 {
     }
 }
 
+pub struct EcRequestCurrentLimitV0 {
+    /// Current limit in mA
+    pub current: u32,
+}
+
+impl EcRequest<()> for EcRequestCurrentLimitV0 {
+    fn command_id() -> EcCommands {
+        EcCommands::ChargeCurrentLimit
+    }
+}
+
+pub struct EcRequestCurrentLimitV1 {
+    /// Current limit in mA
+    pub current: u32,
+    /// Battery state of charge is the minimum charge percentage at which
+    /// the battery charge current limit will apply.
+    /// When not set, the limit will apply regardless of state of charge.
+    pub battery_soc: u8,
+}
+
+impl EcRequest<()> for EcRequestCurrentLimitV1 {
+    fn command_id() -> EcCommands {
+        EcCommands::ChargeCurrentLimit
+    }
+    fn command_version() -> u8 {
+        1
+    }
+}
+
 /// Supported features
 #[derive(Debug, FromPrimitive)]
 pub enum EcFeatureCode {

framework_lib/src/chromium_ec/mod.rs

@@ -394,6 +394,19 @@ impl CrosEc {
         Ok((limits.min_percentage, limits.max_percentage))
     }
 
+    pub fn set_charge_current_limit(&self, current: u32, battery_soc: Option<u32>) -> EcResult<()> {
+        if let Some(battery_soc) = battery_soc {
+            let battery_soc = battery_soc as u8;
+            EcRequestCurrentLimitV1 {
+                current,
+                battery_soc,
+            }
+            .send_command(self)
+        } else {
+            EcRequestCurrentLimitV0 { current }.send_command(self)
+        }
+    }
+
     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

framework_lib/src/commandline/clap_std.rs

@@ -155,6 +155,11 @@ struct ClapCli {
     #[arg(long)]
     charge_limit: Option<Option<u8>>,
 
+    /// Get or set max charge current limit
+    #[arg(long)]
+    #[clap(num_args = ..2)]
+    charge_current_limit: Vec<u32>,
+
     /// Get GPIO value by name
     #[arg(long)]
     get_gpio: Option<String>,
@@ -305,6 +310,14 @@ pub fn parse(args: &[String]) -> Cli {
         1 => Some((None, args.fansetrpm[0])),
         _ => None,
     };
+    let charge_current_limit = match args.charge_current_limit.len() {
+        2 => Some((
+            args.charge_current_limit[0],
+            Some(args.charge_current_limit[1]),
+        )),
+        1 => Some((args.charge_current_limit[0], None)),
+        _ => None,
+    };
 
     Cli {
         verbosity: args.verbosity.log_level_filter(),
@@ -358,6 +371,7 @@ pub fn parse(args: &[String]) -> Cli {
         inputdeck_mode: args.inputdeck_mode,
         expansion_bay: args.expansion_bay,
         charge_limit: args.charge_limit,
+        charge_current_limit,
         get_gpio: args.get_gpio,
         fp_led_level: args.fp_led_level,
         fp_brightness: args.fp_brightness,

framework_lib/src/commandline/mod.rs

@@ -175,6 +175,7 @@ pub struct Cli {
     pub inputdeck_mode: Option<InputDeckModeArg>,
     pub expansion_bay: bool,
     pub charge_limit: Option<Option<u8>>,
+    pub charge_current_limit: Option<(u32, Option<u32>)>,
     pub get_gpio: Option<String>,
     pub fp_led_level: Option<Option<FpBrightnessArg>>,
     pub fp_brightness: Option<Option<u8>>,
@@ -762,6 +763,8 @@ pub fn run_with_args(args: &Cli, _allupdate: bool) -> i32 {
         }
     } else if let Some(maybe_limit) = args.charge_limit {
         print_err(handle_charge_limit(&ec, maybe_limit));
+    } else if let Some((limit, soc)) = args.charge_current_limit {
+        print_err(ec.set_charge_current_limit(limit, soc));
     } else if let Some(gpio_name) = &args.get_gpio {
         print!("Getting GPIO value {}: ", gpio_name);
         if let Ok(value) = ec.get_gpio(gpio_name) {
@@ -1081,6 +1084,7 @@ Options:
       --inputdeck-mode       Set input deck power mode [possible values: auto, off, on] (Framework 16 only)
       --expansion-bay        Show status of the expansion bay (Framework 16 only)
       --charge-limit [<VAL>] Get or set battery charge limit (Percentage number as arg, e.g. '100')
+      --charge-current-limit [<VAL>] Get or set battery current charge limit (Percentage number as arg, e.g. '100')
       --get-gpio <GET_GPIO>  Get GPIO value by name
       --fp-led-level [<VAL>] Get or set fingerprint LED brightness level [possible values: high, medium, low]
       --fp-brightness [<VAL>]Get or set fingerprint LED brightness percentage

framework_lib/src/commandline/uefi.rs

@@ -88,6 +88,7 @@ pub fn parse(args: &[String]) -> Cli {
         inputdeck_mode: None,
         expansion_bay: false,
         charge_limit: None,
+        charge_current_limit: None,
         get_gpio: None,
         fp_led_level: None,
         fp_brightness: None,
@@ -266,6 +267,35 @@ pub fn parse(args: &[String]) -> Cli {
                 Some(None)
             };
             found_an_option = true;
+        } else if arg == "--charge-current-limit" {
+            cli.charge_current_limit = if args.len() > i + 2 {
+                let limit = args[i + 1].parse::<u32>();
+                let soc = args[i + 2].parse::<u32>();
+                if let (Ok(limit), Ok(soc)) = (limit, soc) {
+                    Some((limit, Some(soc)))
+                } else {
+                    println!(
+                        "Invalid values for --charge-current-limit: '{} {}'. Must be u32 integers.",
+                        args[i + 1],
+                        args[i + 2]
+                    );
+                    None
+                }
+            } else if args.len() > i + 1 {
+                if let Ok(limit) = args[i + 1].parse::<u32>() {
+                    Some((limit, None))
+                } else {
+                    println!(
+                        "Invalid values for --charge-current-limit: '{}'. Must be an integer.",
+                        args[i + 1],
+                    );
+                    None
+                }
+            } else {
+                println!("--charge-current-limit requires one or two. [limit] [soc] or [limit]");
+                None
+            };
+            found_an_option = true;
         } else if arg == "--get-gpio" {
             cli.get_gpio = if args.len() > i + 1 {
                 Some(args[i + 1].clone())