laptop13: Support input deck related commands

- Mostly update documentation
- `--inputdeck-mode` already works as long as the host command is present
- `--inputdeck` now attempts to use the host command to print the status

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

Author: JohnAZoidberg

EXAMPLES.md

@@ -80,9 +80,9 @@ Options:
       --intrusion
           Show status of intrusion switch
       --inputdeck
-          Show status of the input modules (Framework 16 only)
+          Show status of the input modules
       --inputdeck-mode <INPUTDECK_MODE>
-          Set input deck power mode [possible values: auto, off, on] (Framework 16 only) [possible values: auto, off, on]
+          Set input deck power mode [possible values: auto, off, on] (Framework 13 and 16) [possible values: auto, off, on]
       --expansion-bay
           Show status of the expansion bay (Framework 16 only)
       --charge-limit [<CHARGE_LIMIT>]

framework_lib/src/chromium_ec/command.rs

@@ -90,7 +90,7 @@ pub enum EcCommands {
     PriavcySwitchesCheckMode = 0x3E14,
     /// Not used by this library
     ChassisCounter = 0x3E15,
-    /// On Framework 16, check the status of the input module deck
+    /// Check the status of the input module deck (Framework 13 and 16)
     CheckDeckState = 0x3E16,
     /// Not used by this library
     GetSimpleVersion = 0x3E17,

framework_lib/src/chromium_ec/mod.rs

@@ -674,6 +674,12 @@ impl CrosEc {
 
         println!("Input Deck");
         println!("  Chassis Closed:      {}", !intrusion.currently_open);
+
+        if let Ok(status) = self.get_input_deck_status() {
+            println!("  Deck State:          {:?}", status.state);
+            println!("  Touchpad present:    {}", status.touchpad_present);
+        }
+
         println!(
             "  Audio Daughterboard: {}",
             if let Some(audio) = audio {

framework_lib/src/commandline/clap_std.rs

@@ -163,11 +163,11 @@ struct ClapCli {
     #[arg(long)]
     intrusion: bool,
 
-    /// Show status of the input modules (Framework 16 only)
+    /// Show status of the input modules
     #[arg(long)]
     inputdeck: bool,
 
-    /// Set input deck power mode [possible values: auto, off, on] (Framework 16 only)
+    /// Set input deck power mode [possible values: auto, off, on] (Framework 13 and 16)
     #[arg(long)]
     inputdeck_mode: Option<InputDeckModeArg>,
 

framework_lib/src/commandline/mod.rs

@@ -1855,7 +1855,7 @@ Options:
       --s0ix-counter         Show S0ix counter
       --intrusion            Show status of intrusion switch
       --inputdeck            Show status of the input deck
-      --inputdeck-mode       Set input deck power mode [possible values: auto, off, on] (Framework 16 only)
+      --inputdeck-mode       Set input deck power mode [possible values: auto, off, on] (Framework 13 and 16)
       --expansion-bay        Show status of the expansion bay (Framework 16 only)
       --nvidia               Show NVIDIA GPU information (Framework 16 only)
       --charge-limit [<VAL>] Get or set battery charge limit (Percentage number as arg, e.g. '100')

framework_tool/completions/fish/framework_tool.fish

@@ -26,7 +26,7 @@ complete -c framework_tool -l flash-full-ec -d 'Flash full EC flash with new fir
 complete -c framework_tool -l flash-ec -d 'Flash EC (RO+RW) with new firmware from file - may render your hardware unbootable!' -r -F
 complete -c framework_tool -l flash-ro-ec -d 'Flash EC with new RO firmware from file - may render your hardware unbootable!' -r -F
 complete -c framework_tool -l flash-rw-ec -d 'Flash EC with new RW firmware from file' -r -F
-complete -c framework_tool -l inputdeck-mode -d 'Set input deck power mode [possible values: auto, off, on] (Framework 16 only)' -r -f -a "auto\t''
+complete -c framework_tool -l inputdeck-mode -d 'Set input deck power mode [possible values: auto, off, on] (Framework 13 and 16)' -r -f -a "auto\t''
 off\t''
 on\t''"
 complete -c framework_tool -l charge-limit -d 'Get or set max charge limit' -r
@@ -87,7 +87,7 @@ complete -c framework_tool -l dp-hdmi-info -d 'Show details about connected DP o
 complete -c framework_tool -l audio-card-info -d 'Show details about connected Audio Expansion Cards (Needs root privileges)'
 complete -c framework_tool -l privacy -d 'Show privacy switch statuses (camera and microphone)'
 complete -c framework_tool -l intrusion -d 'Show status of intrusion switch'
-complete -c framework_tool -l inputdeck -d 'Show status of the input modules (Framework 16 only)'
+complete -c framework_tool -l inputdeck -d 'Show status of the input modules'
 complete -c framework_tool -l expansion-bay -d 'Show status of the expansion bay (Framework 16 only)'
 complete -c framework_tool -l stylus-battery -d 'Check stylus battery level (USI 2.0 stylus only)'
 complete -c framework_tool -l uptimeinfo

framework_tool/completions/zsh/_framework_tool

@@ -36,7 +36,7 @@ _framework_tool() {
 '--flash-ec=[Flash EC (RO+RW) with new firmware from file - may render your hardware unbootable!]:FLASH_EC:_files' \
 '--flash-ro-ec=[Flash EC with new RO firmware from file - may render your hardware unbootable!]:FLASH_RO_EC:_files' \
 '--flash-rw-ec=[Flash EC with new RW firmware from file]:FLASH_RW_EC:_files' \
-'--inputdeck-mode=[Set input deck power mode \[possible values\: auto, off, on\] (Framework 16 only)]:INPUTDECK_MODE:(auto off on)' \
+'--inputdeck-mode=[Set input deck power mode \[possible values\: auto, off, on\] (Framework 13 and 16)]:INPUTDECK_MODE:(auto off on)' \
 '--charge-limit=[Get or set max charge limit]::CHARGE_LIMIT:_default' \
 '*--charge-current-limit=[Set max charge current limit]:CHARGE_CURRENT_LIMIT:_default' \
 '*--charge-rate-limit=[Set max charge current limit]:CHARGE_RATE_LIMIT:_default' \
@@ -78,7 +78,7 @@ _framework_tool() {
 '--audio-card-info[Show details about connected Audio Expansion Cards (Needs root privileges)]' \
 '--privacy[Show privacy switch statuses (camera and microphone)]' \
 '--intrusion[Show status of intrusion switch]' \
-'--inputdeck[Show status of the input modules (Framework 16 only)]' \
+'--inputdeck[Show status of the input modules]' \
 '--expansion-bay[Show status of the expansion bay (Framework 16 only)]' \
 '--stylus-battery[Check stylus battery level (USI 2.0 stylus only)]' \
 '--uptimeinfo[]' \

support-matrices.md

@@ -42,7 +42,7 @@
 | `--privacy`              | EC Communication | All Laptops       |
 | `--intrusion`            | EC Communication | All Laptops       |
 | `--inputdeck`            | EC Communication | All Laptops       |
-| `--inputdeck-mode`       | EC Communication | Framework 16      |
+| `--inputdeck-mode`       | EC Communication | Framework 13, 16  |
 | `--console`              | EC Communication | All               |
 | `--get-gpio`             | EC Communication | All               |
 | `--kblight`              | EC Communication | Framework 13      |