From c86df3d095743c82835314abebab102741f43e5a Mon Sep 17 00:00:00 2001 From: bunnie Date: Sun, 6 Feb 2022 01:31:08 +0800 Subject: [PATCH] fix logic bug in usb lock status update --- services/llio/src/main.rs | 7 +++++-- services/status/src/main.rs | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/services/llio/src/main.rs b/services/llio/src/main.rs index f5173f360..617b6d8f4 100644 --- a/services/llio/src/main.rs +++ b/services/llio/src/main.rs @@ -506,12 +506,14 @@ mod implementation { #[derive(Copy, Clone, Debug)] pub struct Llio { + usb_disable: bool, } pub fn log_init() -> *mut u32 { 0 as *mut u32 } impl Llio { pub fn new(_handler_conn: xous::CID, _gpio_base: *mut u32) -> Llio { Llio { + usb_disable: false, } } pub fn suspend(&self) {} @@ -590,9 +592,10 @@ mod implementation { } pub fn get_usb_disable(&self) -> bool { - false + self.usb_disable } - pub fn set_usb_disable(&mut self, _state: bool) { + pub fn set_usb_disable(&mut self, state: bool) { + self.usb_disable = state; } } diff --git a/services/status/src/main.rs b/services/status/src/main.rs index 69ae6af25..d39cf397f 100644 --- a/services/status/src/main.rs +++ b/services/status/src/main.rs @@ -452,12 +452,13 @@ fn xmain() -> ! { || (sec_notes.lock().unwrap().len() > 1) && ((stats_phase % secnotes_interval) == 0) { + log::info!("updating lock state text"); if debug_locked != is_locked { - if debug_locked { + if is_locked { sec_notes .lock() .unwrap() - .remove(&"secnotes.usb_unlock".to_string()); + .remove(&"secnote.usb_unlock".to_string()); // this is the key, not the value to remove } else { sec_notes.lock().unwrap().insert( "secnotes.usb_unlock".to_string(),