--inputdeck: Use boardid if platform cannot be determined

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

Author: JohnAZoidberg

framework_lib/src/chromium_ec/command.rs

@@ -12,7 +12,7 @@ use crate::util;
 use super::{CrosEc, CrosEcDriver, EcError, EcResult};
 
 #[non_exhaustive]
-#[derive(Debug, FromPrimitive)]
+#[derive(Debug, Clone, Copy, FromPrimitive)]
 #[repr(u16)]
 pub enum EcCommands {
     GetVersion = 0x02,

framework_lib/src/chromium_ec/mod.rs

@@ -298,8 +298,8 @@ impl CrosEc {
         }
     }
 
-    pub fn cmd_version_supported(&self, cmd: u16, version: u8) -> EcResult<bool> {
-        let res = EcRequestGetCmdVersionsV1 { cmd: cmd.into() }.send_command(self);
+    pub fn cmd_version_supported(&self, cmd: EcCommands, version: u8) -> EcResult<bool> {
+        let res = EcRequestGetCmdVersionsV1 { cmd: cmd as u32 }.send_command(self);
         let mask = if let Ok(res) = res {
             res.version_mask
         } else {

framework_lib/src/commandline/mod.rs

@@ -35,6 +35,7 @@ use crate::ccgx::device::{FwMode, PdController, PdPort};
 use crate::ccgx::hid::{check_ccg_fw_version, find_devices, DP_CARD_PID, HDMI_CARD_PID};
 use crate::ccgx::{self, MainPdVersions, PdVersions, SiliconId::*};
 use crate::chromium_ec;
+use crate::chromium_ec::command;
 use crate::chromium_ec::commands::BoardIdType;
 use crate::chromium_ec::commands::DeckStateMode;
 use crate::chromium_ec::commands::FpLedBrightnessLevel;
@@ -1035,6 +1036,21 @@ pub fn run_with_args(args: &Cli, _allupdate: bool) -> i32 {
                 // Only Framework 16 has this GPIO
                 if ec.get_gpio("sleep_l").is_ok() {
                     ec.print_fw16_inputdeck_status()
+                } else if ec.cmd_version_supported(command::EcCommands::ReadBoardId, 0) == Ok(true) {
+                    println!("Input Deck (Board ID - Unable to determine platform)");
+                    let boardid = ec.read_board_id_hc(BoardIdType::Mainboard);
+                    println!("  Mainboard:   {:?}", boardid);
+                    let boardid = ec.read_board_id_hc(BoardIdType::PowerButtonBoard);
+                    println!("  PowerButton: {:?}", boardid);
+                    let boardid = ec.read_board_id_hc(BoardIdType::Touchpad);
+                    println!("  Touchpad:    {:?}", boardid);
+                    let boardid = ec.read_board_id_hc(BoardIdType::AudioBoard);
+                    println!("  AudioBoard:  {:?}", boardid);
+                    let boardid = ec.read_board_id_hc(BoardIdType::DGpu0);
+                    println!("  dGPU0:       {:?}", boardid);
+                    let boardid = ec.read_board_id_hc(BoardIdType::DGpu1);
+                    println!("  dGPU1:       {:?}", boardid);
+                    Ok(())
                 } else {
                     println!("  Unable to tell");
                     Ok(())