mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-20 09:03:28 +00:00
CHORE: clean whitespace
This commit is contained in:
parent
689276d631
commit
26adda2fa7
3 changed files with 13 additions and 13 deletions
|
|
@ -43,7 +43,7 @@ pub fn getter_setter(input: TokenStream) -> TokenStream {
|
||||||
|
|
||||||
Ok(ret)
|
Ok(ret)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn #fn_name_or_default(&self) -> Result<#typ, Error> {
|
pub fn #fn_name_or_default(&self) -> Result<#typ, Error> {
|
||||||
let bytes = self.pddb_get_key(#ident_str)?;
|
let bytes = self.pddb_get_key(#ident_str)?;
|
||||||
let ret: #typ = match bincode::decode_from_slice(&bytes, bincode::config::standard()) {
|
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! {
|
let all = quote! {
|
||||||
impl Manager {
|
impl Manager {
|
||||||
pub fn all(&self) -> Result<UserPrefs, Error> {
|
pub fn all(&self) -> Result<UserPrefs, Error> {
|
||||||
|
|
||||||
Ok(UserPrefs {
|
Ok(UserPrefs {
|
||||||
#( #ident_map:self.#ident_fn_calls()? ),*
|
#( #ident_map:self.#ident_fn_calls()? ),*
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -85,7 +85,7 @@ pub(crate) enum StatusOpcode {
|
||||||
BatteryDisconnect,
|
BatteryDisconnect,
|
||||||
/// for returning wifi stats
|
/// for returning wifi stats
|
||||||
WifiStats,
|
WifiStats,
|
||||||
|
|
||||||
/// Raise the preferences menu
|
/// Raise the preferences menu
|
||||||
Preferences,
|
Preferences,
|
||||||
Quit,
|
Quit,
|
||||||
|
|
@ -315,7 +315,7 @@ fn wrapped_main() -> ! {
|
||||||
t!("secnote.usb_unlock", xous::LANG).to_string(),
|
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
|
// this is used by the main loop to get the localtime to show on the status bar
|
||||||
let mut localtime = llio::LocalTime::new();
|
let mut localtime = llio::LocalTime::new();
|
||||||
|
|
||||||
|
|
@ -356,11 +356,11 @@ fn wrapped_main() -> ! {
|
||||||
let prefs_sid = xous::create_server().unwrap();
|
let prefs_sid = xous::create_server().unwrap();
|
||||||
let prefs_cid = xous::connect(prefs_sid).unwrap();
|
let prefs_cid = xous::connect(prefs_sid).unwrap();
|
||||||
preferences::start_background_thread(prefs_sid);
|
preferences::start_background_thread(prefs_sid);
|
||||||
|
|
||||||
// load system preferences
|
// load system preferences
|
||||||
let prefs = Arc::new(Mutex::new(userprefs::Manager::new()));
|
let prefs = Arc::new(Mutex::new(userprefs::Manager::new()));
|
||||||
let prefs_thread_clone = prefs.clone();
|
let prefs_thread_clone = prefs.clone();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
This thread handles preference loading.
|
This thread handles preference loading.
|
||||||
It'll wait until PDDB is ready to load stuff off the preference
|
It'll wait until PDDB is ready to load stuff off the preference
|
||||||
|
|
@ -385,9 +385,9 @@ fn wrapped_main() -> ! {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
log::debug!("pddb ready, loading preferences now!");
|
log::debug!("pddb ready, loading preferences now!");
|
||||||
|
|
||||||
match all_prefs.radio_on_on_boot {
|
match all_prefs.radio_on_on_boot {
|
||||||
true => netmgr.connection_manager_wifi_off_and_stop(),
|
true => netmgr.connection_manager_wifi_off_and_stop(),
|
||||||
false => netmgr.connection_manager_wifi_on(),
|
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| {
|
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);
|
log::error!("cannot set speaker volume: {:?}", error);
|
||||||
});
|
});
|
||||||
|
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -474,7 +474,7 @@ fn wrapped_main() -> ! {
|
||||||
// restore interrupts and connection manager
|
// restore interrupts and connection manager
|
||||||
llio.com_event_enable(true).ok();
|
llio.com_event_enable(true).ok();
|
||||||
netmgr.reset();
|
netmgr.reset();
|
||||||
|
|
||||||
// TODO(gsora): I'm commenting this out because user preferences might say otherwise.
|
// TODO(gsora): I'm commenting this out because user preferences might say otherwise.
|
||||||
//netmgr.connection_manager_run().ok();
|
//netmgr.connection_manager_run().ok();
|
||||||
}
|
}
|
||||||
|
|
@ -754,7 +754,7 @@ fn wrapped_main() -> ! {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
pump_run.store(true, Ordering::Relaxed); // start status thread updating
|
pump_run.store(true, Ordering::Relaxed); // start status thread updating
|
||||||
loop {
|
loop {
|
||||||
let msg = xous::receive_message(status_sid).unwrap();
|
let msg = xous::receive_message(status_sid).unwrap();
|
||||||
|
|
|
||||||
|
|
@ -189,7 +189,7 @@ impl DevicePrefs {
|
||||||
|
|
||||||
if self.codec.is_running().unwrap_or_default() {
|
if self.codec.is_running().unwrap_or_default() {
|
||||||
ret.push(AudioOff);
|
ret.push(AudioOff);
|
||||||
|
|
||||||
// TODO(gsora): detect what volume to show
|
// TODO(gsora): detect what volume to show
|
||||||
match self.headphone_connected().unwrap() {
|
match self.headphone_connected().unwrap() {
|
||||||
true => ret.push(HeadsetVolume),
|
true => ret.push(HeadsetVolume),
|
||||||
|
|
@ -205,7 +205,7 @@ impl DevicePrefs {
|
||||||
fn consume_menu_action(&mut self, action: DevicePrefsOp) {
|
fn consume_menu_action(&mut self, action: DevicePrefsOp) {
|
||||||
use DevicePrefsOp::*;
|
use DevicePrefsOp::*;
|
||||||
|
|
||||||
let resp = match action {
|
let resp = match action {
|
||||||
AutobacklightOnBoot => self.autobacklight_on_boot(),
|
AutobacklightOnBoot => self.autobacklight_on_boot(),
|
||||||
RadioOnOnBoot => self.radio_on_on_boot(),
|
RadioOnOnBoot => self.radio_on_on_boot(),
|
||||||
ConnectKnownNetworksOnBoot => self.connect_known_networks_on_boot(),
|
ConnectKnownNetworksOnBoot => self.connect_known_networks_on_boot(),
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue