Rename --inputmodules to --inputdeck

Prepare for compatibility with Framework 12 and Framework 13

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

Author: JohnAZoidberg

README.md

@@ -178,7 +178,7 @@ Options:
       --dump <DUMP>                 Dump extracted UX capsule bitmap image to a file
       --h2o-capsule <H2O_CAPSULE>   Parse UEFI Capsule information from binary file
       --intrusion                   Show status of intrusion switch
-      --inputmodules                Show status of the input modules (Framework 16 only)
+      --inputdeck                   Show status of the input deck
       --input-deck-mode <INPUT_DECK_MODE>
           Set input deck power mode [possible values: auto, off, on] (Framework 16 only) [possible values: auto, off, on]
       --expansion-bay               Show status of the expansion bay (Framework 16 only)

completions/bash/framework_tool

@@ -34,7 +34,7 @@ _framework_tool() {
         "--flash-ro-ec"
         "--flash-rw-ec"
         "--intrusion"
-        "--inputmodules"
+        "--inputdeck"
         "--input-deck-mode"
         "--charge-limit"
         "--get-gpio"

completions/zsh/_framework_tool

@@ -32,7 +32,7 @@ options=(
   '--flash-ro-ec[Flash EC with new RO firmware from file]:flash_ro_ec'
   '--flash-rw-ec[Flash EC with new RW firmware from file]:flash_rw_ec'
   '--intrusion[Show status of intrusion switch]'
-  '--inputmodules[Show status of the input modules (Framework 16 only)]'
+  '--inputdeck[Show status of the input deck]'
   '--input-deck-mode[Set input deck power mode]:input_deck_mode:(auto off on)'
   '--charge-limit[Get or set max charge limit]:charge_limit'
   '--get-gpio[Get GPIO value by name]:get_gpio'

framework_lib/src/commandline/clap_std.rs

@@ -141,7 +141,7 @@ struct ClapCli {
 
     /// Show status of the input modules (Framework 16 only)
     #[arg(long)]
-    inputmodules: bool,
+    inputdeck: bool,
 
     /// Set input deck power mode [possible values: auto, off, on] (Framework 16 only)
     #[arg(long)]
@@ -354,7 +354,7 @@ pub fn parse(args: &[String]) -> Cli {
             .flash_rw_ec
             .map(|x| x.into_os_string().into_string().unwrap()),
         intrusion: args.intrusion,
-        inputmodules: args.inputmodules,
+        inputdeck: args.inputdeck,
         input_deck_mode: args.input_deck_mode,
         expansion_bay: args.expansion_bay,
         charge_limit: args.charge_limit,

framework_lib/src/commandline/mod.rs

@@ -171,7 +171,7 @@ pub struct Cli {
     pub driver: Option<CrosEcDriverType>,
     pub test: bool,
     pub intrusion: bool,
-    pub inputmodules: bool,
+    pub inputdeck: bool,
     pub input_deck_mode: Option<InputDeckModeArg>,
     pub expansion_bay: bool,
     pub charge_limit: Option<Option<u8>>,
@@ -745,7 +745,7 @@ pub fn run_with_args(args: &Cli, _allupdate: bool) -> i32 {
         } else {
             println!("  Unable to tell");
         }
-    } else if args.inputmodules {
+    } else if args.inputdeck {
         println!("Input Module Status:");
         if let Some(status) = print_err(ec.get_input_deck_status()) {
             println!("Input Deck State: {:?}", status.state);
@@ -1083,7 +1083,7 @@ Options:
       --flash-rw-ec <FLASH_EC>         Flash EC with new firmware from file
       --reboot-ec            Control EC RO/RW jump [possible values: reboot, jump-ro, jump-rw, cancel-jump, disable-jump]
       --intrusion            Show status of intrusion switch
-      --inputmodules         Show status of the input modules (Framework 16 only)
+      --inputdeck            Show status of the input deck
       --input-deck-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')

framework_lib/src/commandline/uefi.rs

@@ -84,7 +84,7 @@ pub fn parse(args: &[String]) -> Cli {
         dump: None,
         h2o_capsule: None,
         intrusion: false,
-        inputmodules: false,
+        inputdeck: false,
         input_deck_mode: None,
         expansion_bay: false,
         charge_limit: None,
@@ -225,8 +225,8 @@ pub fn parse(args: &[String]) -> Cli {
         } else if arg == "--intrusion" {
             cli.intrusion = true;
             found_an_option = true;
-        } else if arg == "--inputmodules" {
-            cli.inputmodules = true;
+        } else if arg == "--inputdeck" {
+            cli.inputdeck = true;
             found_an_option = true;
         } else if arg == "--input-deck-mode" {
             cli.input_deck_mode = if args.len() > i + 1 {

support-matrices.md

@@ -37,6 +37,6 @@
 | `--pd-info`      | PD Communication | All              |
 | `--privacy`      | EC Communication | All              |
 | `--intrusion`    | EC Communication | All              |
-| `--inputmodules` | EC Communication | Framework 16     |
+| `--inputdeck`    | EC Communication | Framework 16     |
 | `--console`      | EC Communication | All              |
-| `--kblight`      | EC Communication | All, except FL16 |
+| `--kblight`      | EC Communication | All, except FL16 |