mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
modify wifi on boot to wifi kill switch
This commit is contained in:
parent
22ccc5836e
commit
4fdbec310c
4 changed files with 21 additions and 9 deletions
|
|
@ -44,7 +44,7 @@ impl From<DecodeError> for Error {
|
||||||
#[derive(prefsgenerator::GetterSetter)]
|
#[derive(prefsgenerator::GetterSetter)]
|
||||||
#[allow(dead_code)] // Allowing dead code here because UserPrefs is used to generate getter/setters.
|
#[allow(dead_code)] // Allowing dead code here because UserPrefs is used to generate getter/setters.
|
||||||
pub struct UserPrefs {
|
pub struct UserPrefs {
|
||||||
pub radio_on_on_boot: bool,
|
pub wifi_kill: bool,
|
||||||
pub connect_known_networks_on_boot: bool,
|
pub connect_known_networks_on_boot: bool,
|
||||||
pub autobacklight_on_boot: bool,
|
pub autobacklight_on_boot: bool,
|
||||||
pub autobacklight_timeout: u64,
|
pub autobacklight_timeout: u64,
|
||||||
|
|
|
||||||
|
|
@ -529,6 +529,13 @@
|
||||||
"ja": "現在の設定",
|
"ja": "現在の設定",
|
||||||
"zh": "当前设置"
|
"zh": "当前设置"
|
||||||
},
|
},
|
||||||
|
"prefs.wifi_kill": {
|
||||||
|
"en": "WiFi kill switch",
|
||||||
|
"en-tts": "WiFi kill switch",
|
||||||
|
"fr": "Coupe-circuit WiFi *MT*",
|
||||||
|
"ja": "WiFiキルスイッチ",
|
||||||
|
"zh": "WiFi终止开关"
|
||||||
|
},
|
||||||
"prefs.yes": {
|
"prefs.yes": {
|
||||||
"en": "Yes",
|
"en": "Yes",
|
||||||
"en-tts": "Yes",
|
"en-tts": "Yes",
|
||||||
|
|
|
||||||
|
|
@ -388,7 +388,7 @@ fn wrapped_main() -> ! {
|
||||||
|
|
||||||
log::debug!("pddb ready, loading preferences now!");
|
log::debug!("pddb ready, loading preferences now!");
|
||||||
|
|
||||||
match all_prefs.radio_on_on_boot {
|
match all_prefs.wifi_kill {
|
||||||
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(),
|
||||||
}.unwrap_or_else(|error| {
|
}.unwrap_or_else(|error| {
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ pub trait PrefHandler {
|
||||||
|
|
||||||
#[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive, PartialEq, PartialOrd)]
|
#[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive, PartialEq, PartialOrd)]
|
||||||
enum DevicePrefsOp {
|
enum DevicePrefsOp {
|
||||||
RadioOnOnBoot,
|
WifiKill,
|
||||||
ConnectKnownNetworksOnBoot,
|
ConnectKnownNetworksOnBoot,
|
||||||
AutobacklightOnBoot,
|
AutobacklightOnBoot,
|
||||||
AutobacklightTimeout,
|
AutobacklightTimeout,
|
||||||
|
|
@ -44,7 +44,7 @@ impl Display for DevicePrefsOp {
|
||||||
Self::AutobacklightOnBoot => write!(f, "{}", t!("prefs.autobacklight_enable", xous::LANG)),
|
Self::AutobacklightOnBoot => write!(f, "{}", t!("prefs.autobacklight_enable", xous::LANG)),
|
||||||
Self::AutobacklightTimeout => write!(f, "{}", t!("prefs.autobacklight_duration", xous::LANG)),
|
Self::AutobacklightTimeout => write!(f, "{}", t!("prefs.autobacklight_duration", xous::LANG)),
|
||||||
Self::ConnectKnownNetworksOnBoot => write!(f, "{}", t!("prefs.wifi_connect_auto", xous::LANG)),
|
Self::ConnectKnownNetworksOnBoot => write!(f, "{}", t!("prefs.wifi_connect_auto", xous::LANG)),
|
||||||
Self::RadioOnOnBoot => write!(f, "{}", t!("prefs.wifi_kill", xous::LANG)),
|
Self::WifiKill => write!(f, "{}", t!("prefs.wifi_kill", xous::LANG)),
|
||||||
Self::KeyboardLayout => write!(f, "Keyboard layout"),
|
Self::KeyboardLayout => write!(f, "Keyboard layout"),
|
||||||
Self::WLANMenu => write!(f, "WiFi settings"),
|
Self::WLANMenu => write!(f, "WiFi settings"),
|
||||||
Self::SetTime => write!(f, "{}", t!("mainmenu.set_rtc", xous::LANG)),
|
Self::SetTime => write!(f, "{}", t!("mainmenu.set_rtc", xous::LANG)),
|
||||||
|
|
@ -181,7 +181,7 @@ impl DevicePrefs {
|
||||||
use DevicePrefsOp::*;
|
use DevicePrefsOp::*;
|
||||||
|
|
||||||
let mut ret = vec![
|
let mut ret = vec![
|
||||||
RadioOnOnBoot,
|
WifiKill,
|
||||||
ConnectKnownNetworksOnBoot,
|
ConnectKnownNetworksOnBoot,
|
||||||
AutobacklightOnBoot,
|
AutobacklightOnBoot,
|
||||||
AutobacklightTimeout,
|
AutobacklightTimeout,
|
||||||
|
|
@ -211,7 +211,7 @@ impl DevicePrefs {
|
||||||
|
|
||||||
let resp = match action {
|
let resp = match action {
|
||||||
AutobacklightOnBoot => self.autobacklight_on_boot(),
|
AutobacklightOnBoot => self.autobacklight_on_boot(),
|
||||||
RadioOnOnBoot => self.radio_on_on_boot(),
|
WifiKill => self.wifi_kill(),
|
||||||
ConnectKnownNetworksOnBoot => self.connect_known_networks_on_boot(),
|
ConnectKnownNetworksOnBoot => self.connect_known_networks_on_boot(),
|
||||||
AutobacklightTimeout => self.autobacklight_timeout(),
|
AutobacklightTimeout => self.autobacklight_timeout(),
|
||||||
KeyboardLayout => self.keyboard_layout(),
|
KeyboardLayout => self.keyboard_layout(),
|
||||||
|
|
@ -303,8 +303,8 @@ impl DevicePrefs {
|
||||||
Ok(self.up.set_autobacklight_timeout(new_timeout)?)
|
Ok(self.up.set_autobacklight_timeout(new_timeout)?)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn radio_on_on_boot(&mut self) -> Result<(), DevicePrefsError> {
|
fn wifi_kill(&mut self) -> Result<(), DevicePrefsError> {
|
||||||
let cv = self.up.radio_on_on_boot_or_default()?;
|
let cv = self.up.wifi_kill_or_default()?;
|
||||||
|
|
||||||
self.modals.add_list(vec![t!("prefs.yes", xous::LANG), t!("prefs.no", xous::LANG)]).unwrap();
|
self.modals.add_list(vec![t!("prefs.yes", xous::LANG), t!("prefs.no", xous::LANG)]).unwrap();
|
||||||
|
|
||||||
|
|
@ -315,8 +315,13 @@ impl DevicePrefs {
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.as_str(),
|
.as_str(),
|
||||||
);
|
);
|
||||||
|
if cv {
|
||||||
|
self.netmgr.connection_manager_wifi_off_and_stop().ok();
|
||||||
|
} else {
|
||||||
|
self.netmgr.connection_manager_wifi_on().ok();
|
||||||
|
}
|
||||||
|
|
||||||
Ok(self.up.set_radio_on_on_boot(new_result)?)
|
Ok(self.up.set_wifi_kill(new_result)?)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn connect_known_networks_on_boot(&mut self) -> Result<(), DevicePrefsError> {
|
fn connect_known_networks_on_boot(&mut self) -> Result<(), DevicePrefsError> {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue