diff --git a/libs/userprefs/prefsgenerator/src/lib.rs b/libs/userprefs/prefsgenerator/src/lib.rs index 94acac785..40c49f224 100644 --- a/libs/userprefs/prefsgenerator/src/lib.rs +++ b/libs/userprefs/prefsgenerator/src/lib.rs @@ -43,7 +43,7 @@ pub fn getter_setter(input: TokenStream) -> TokenStream { Ok(ret) } - + pub fn #fn_name_or_default(&self) -> Result<#typ, Error> { let bytes = self.pddb_get_key(#ident_str)?; let ret: #typ = match bincode::decode_from_slice(&bytes, bincode::config::standard()) { @@ -71,7 +71,7 @@ pub fn getter_setter(input: TokenStream) -> TokenStream { let all = quote! { impl Manager { pub fn all(&self) -> Result { - + Ok(UserPrefs { #( #ident_map:self.#ident_fn_calls()? ),* }) diff --git a/services/status/src/main.rs b/services/status/src/main.rs index b14989fda..ca3a7cae9 100644 --- a/services/status/src/main.rs +++ b/services/status/src/main.rs @@ -85,7 +85,7 @@ pub(crate) enum StatusOpcode { BatteryDisconnect, /// for returning wifi stats WifiStats, - + /// Raise the preferences menu Preferences, Quit, @@ -315,7 +315,7 @@ fn wrapped_main() -> ! { t!("secnote.usb_unlock", xous::LANG).to_string(), ); } - + // this is used by the main loop to get the localtime to show on the status bar let mut localtime = llio::LocalTime::new(); @@ -356,11 +356,11 @@ fn wrapped_main() -> ! { let prefs_sid = xous::create_server().unwrap(); let prefs_cid = xous::connect(prefs_sid).unwrap(); preferences::start_background_thread(prefs_sid); - + // load system preferences let prefs = Arc::new(Mutex::new(userprefs::Manager::new())); let prefs_thread_clone = prefs.clone(); - + /* This thread handles preference loading. It'll wait until PDDB is ready to load stuff off the preference @@ -385,9 +385,9 @@ fn wrapped_main() -> ! { return; } }; - + log::debug!("pddb ready, loading preferences now!"); - + match all_prefs.radio_on_on_boot { true => netmgr.connection_manager_wifi_off_and_stop(), false => netmgr.connection_manager_wifi_on(), @@ -441,7 +441,7 @@ fn wrapped_main() -> ! { codec.set_speaker_volume(codec::VolumeOps::Set, Some(percentage_to_db(all_prefs.earpiece_volume) as f32)).unwrap_or_else(|error| { log::error!("cannot set speaker volume: {:?}", error); }); - + break } }); @@ -474,7 +474,7 @@ fn wrapped_main() -> ! { // restore interrupts and connection manager llio.com_event_enable(true).ok(); netmgr.reset(); - + // TODO(gsora): I'm commenting this out because user preferences might say otherwise. //netmgr.connection_manager_run().ok(); } @@ -754,7 +754,7 @@ fn wrapped_main() -> ! { } } }); - + pump_run.store(true, Ordering::Relaxed); // start status thread updating loop { let msg = xous::receive_message(status_sid).unwrap(); diff --git a/services/status/src/preferences.rs b/services/status/src/preferences.rs index 928bc15ba..2f5241efb 100644 --- a/services/status/src/preferences.rs +++ b/services/status/src/preferences.rs @@ -189,7 +189,7 @@ impl DevicePrefs { if self.codec.is_running().unwrap_or_default() { ret.push(AudioOff); - + // TODO(gsora): detect what volume to show match self.headphone_connected().unwrap() { true => ret.push(HeadsetVolume), @@ -205,7 +205,7 @@ impl DevicePrefs { fn consume_menu_action(&mut self, action: DevicePrefsOp) { use DevicePrefsOp::*; - let resp = match action { + let resp = match action { AutobacklightOnBoot => self.autobacklight_on_boot(), RadioOnOnBoot => self.radio_on_on_boot(), ConnectKnownNetworksOnBoot => self.connect_known_networks_on_boot(),