From abe153208fd41418c2788710d565cfe6cc776af8 Mon Sep 17 00:00:00 2001 From: bunnie Date: Wed, 13 Jul 2022 04:43:35 +0800 Subject: [PATCH] update shellchat to use the new semver returns --- services/shellchat/src/cmds.rs | 4 ++-- services/shellchat/src/cmds/test.rs | 4 ++-- services/shellchat/src/cmds/ver.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/services/shellchat/src/cmds.rs b/services/shellchat/src/cmds.rs index f66be2a0b..911f60983 100644 --- a/services/shellchat/src/cmds.rs +++ b/services/shellchat/src/cmds.rs @@ -190,8 +190,8 @@ impl CmdEnv { log::info!("EC gateware git commit: {:x}, {}", rev, dirtystr); let ec_ver = common.com.get_ec_sw_tag().unwrap(); log::info!("EC sw tag: {}", ec_ver.to_string()); - let (maj, min, rev) = common.com.get_wf200_fw_rev().unwrap(); - log::info!("WF200 fw rev {}.{}.{}", maj, min, rev); + let wf_ver = common.com.get_wf200_fw_rev().unwrap(); + log::info!("WF200 fw rev {}.{}.{}", wf_ver.maj, wf_ver.min, wf_ver.rev); CmdEnv { diff --git a/services/shellchat/src/cmds/test.rs b/services/shellchat/src/cmds/test.rs index 8d1606442..f809fa427 100644 --- a/services/shellchat/src/cmds/test.rs +++ b/services/shellchat/src/cmds/test.rs @@ -181,8 +181,8 @@ impl<'a> ShellCmdApi<'a> for Test { let (x, y, z, id) = env.com.gyro_read_blocking().unwrap(); log::info!("{}|GYRO|{}|{}|{}|{}|", SENTINEL, x, y, z, id); - let (wf_maj, wf_min, wf_rev) = env.com.get_wf200_fw_rev().unwrap(); - log::info!("{}|WF200REV|{}|{}|{}|", SENTINEL, wf_maj, wf_min, wf_rev); + let wf_rev = env.com.get_wf200_fw_rev().unwrap(); + log::info!("{}|WF200REV|{}|{}|{}|", SENTINEL, wf_rev.maj, wf_rev.min, wf_rev.rev); let (ec_rev, ec_dirty) = env.com.get_ec_git_rev().unwrap(); log::info!("{}|ECREV|{:x}|{:?}|", SENTINEL, ec_rev, ec_dirty); let morestats = env.com.get_more_stats().unwrap(); diff --git a/services/shellchat/src/cmds/ver.rs b/services/shellchat/src/cmds/ver.rs index 1f4e55c20..f70f8b8c2 100644 --- a/services/shellchat/src/cmds/ver.rs +++ b/services/shellchat/src/cmds/ver.rs @@ -27,8 +27,8 @@ impl<'a> ShellCmdApi<'a> for Ver { write!(ret, "EC sw tag: {}", ec_ver.to_string()).unwrap(); } "wf200" => { - let (maj, min, rev) = env.com.get_wf200_fw_rev().unwrap(); - write!(ret, "Wf200 fw rev {}.{}.{}", maj, min, rev).unwrap(); + let wf_ver = env.com.get_wf200_fw_rev().unwrap(); + write!(ret, "Wf200 fw rev {}.{}.{}", wf_ver.maj, wf_ver.min, wf_ver.rev).unwrap(); } "soc" => { let soc_rev = env.llio.soc_gitrev().unwrap();