From 0c849c148c909ead8844d87eeac6d6dca7b7dc26 Mon Sep 17 00:00:00 2001 From: bunnie Date: Wed, 23 Nov 2022 06:02:38 +0800 Subject: [PATCH] remove wifi on/off from wlan setting because the wifi kill switch is this setting. trying to stick to the rule of "one place to set something only" --- services/status/src/wifi.rs | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/services/status/src/wifi.rs b/services/status/src/wifi.rs index 61668e618..1d2b91725 100644 --- a/services/status/src/wifi.rs +++ b/services/status/src/wifi.rs @@ -11,15 +11,11 @@ pub enum WlanManOp { AddNetworkManually, KnownNetworks, DeleteNetwork, - TurnWlanOn, - TurnWlanOff, } impl Display for WlanManOp { fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { match self { - Self::TurnWlanOn => write!(f, "{}", t!("wlan.turnon", xous::LANG)), - Self::TurnWlanOff => write!(f, "{}", t!("wlan.turnoff", xous::LANG)), Self::AddNetworkManually => write!(f, "{}", t!("wlan.manual_add", xous::LANG)), Self::ScanForNetworks => write!(f, "{}", t!("wlan.scan", xous::LANG)), Self::Status => write!(f, "{}", t!("wlan.status", xous::LANG)), @@ -134,11 +130,9 @@ impl WLANMan { AddNetworkManually, KnownNetworks, DeleteNetwork, - TurnWlanOn, - TurnWlanOff, ] } - + #[allow(dead_code)] // just in case we need this later fn set_wlan_state(&mut self, state: bool) -> Result<(), WLANError> { match state { true => { @@ -374,8 +368,6 @@ impl WLANMan { fn consume_menu_action(&mut self, action: WlanManOp) { let resp = match action { - WlanManOp::TurnWlanOff => self.set_wlan_state(false), - WlanManOp::TurnWlanOn => self.set_wlan_state(true), WlanManOp::AddNetworkManually => self.add_new_ssid(), WlanManOp::ScanForNetworks => self.show_available_networks(), WlanManOp::Status => self.network_status(),