From 65ee48f100883fef64293fc5956c344449318641 Mon Sep 17 00:00:00 2001 From: bunnie Date: Wed, 13 Jul 2022 04:36:54 +0800 Subject: [PATCH] retrofit com to output semver structures --- services/com/src/lib.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/services/com/src/lib.rs b/services/com/src/lib.rs index e5451328f..83e14c375 100644 --- a/services/com/src/lib.rs +++ b/services/com/src/lib.rs @@ -110,11 +110,19 @@ impl Com { } } - pub fn get_wf200_fw_rev(&self) -> Result<(u8, u8, u8), xous::Error> { + pub fn get_wf200_fw_rev(&self) -> Result { let response = send_message(self.conn, Message::new_blocking_scalar(Opcode::Wf200Rev.to_usize().unwrap(), 0, 0, 0, 0))?; if let xous::Result::Scalar1(rev) = response { - Ok(((rev >> 16) as u8, (rev >> 8) as u8, rev as u8)) + Ok( + SemVer { + maj: ((rev >> 16) & 0xFF) as u16, + min: ((rev >> 8) & 0xFF) as u16, + rev: (rev & 0xFF) as u16, + extra: 0, + commit: None + } + ) } else { panic!("unexpected return value: {:#?}", response); }