From 19b9b817a42c8b647f18c2955860644dbf3f47b2 Mon Sep 17 00:00:00 2001 From: bunnie Date: Thu, 17 Mar 2022 03:37:34 +0800 Subject: [PATCH] add a battery disconnect option to the main menu this will disconnect the battery and put the device in a very low power state, and you can only power it back on again by plugging it into a power source briefly. --- services/status/locales/i18n.json | 6 ++++++ services/status/src/main.rs | 14 ++++++++++++++ services/status/src/mainmenu.rs | 7 +++++++ 3 files changed, 27 insertions(+) diff --git a/services/status/locales/i18n.json b/services/status/locales/i18n.json index f773642ce..9e685fbb3 100644 --- a/services/status/locales/i18n.json +++ b/services/status/locales/i18n.json @@ -114,6 +114,12 @@ "zh": "键盘布局...", "en-tts": "Keyboard layout submenu" }, + "mainmenu.battery_disconnect": { + "en": "Disconnect battery", + "ja": "バッテリーを外します", + "zh": "断开电池", + "en-tts": "Disconnect battery" + }, "mainmenu.reboot": { "en": "Reboot", "ja": "リブート", diff --git a/services/status/src/main.rs b/services/status/src/main.rs index 7fe79d71c..2a65a8837 100644 --- a/services/status/src/main.rs +++ b/services/status/src/main.rs @@ -63,6 +63,8 @@ pub(crate) enum StatusOpcode { /// Suspend handler from the main menu TrySuspend, + /// Ship mode handler for the main menu + BatteryDisconnect, /// for returning wifi stats WifiStats, Quit, @@ -756,6 +758,18 @@ fn xmain() -> ! { susres.initiate_suspend().expect("couldn't initiate suspend op"); } }, + Some(StatusOpcode::BatteryDisconnect) => { + if ((llio.adc_vbus().unwrap() as f64) * 0.005033) > 1.5 { + modals.show_notification(t!("mainmenu.cant_sleep", xous::LANG)).expect("couldn't notify that power is plugged in"); + } else { + gam.shipmode_blank_request().ok(); + ticktimer.sleep_ms(500).unwrap(); + llio.allow_ec_snoop(true).unwrap(); + llio.allow_power_off(true).unwrap(); + com.ship_mode().unwrap(); + com.power_off_soc().unwrap(); + } + }, Some(StatusOpcode::Quit) => { break; } diff --git a/services/status/src/mainmenu.rs b/services/status/src/mainmenu.rs index e17bf1cca..7f8809814 100644 --- a/services/status/src/mainmenu.rs +++ b/services/status/src/mainmenu.rs @@ -106,6 +106,13 @@ pub fn create_main_menu(keys: Arc>, status_conn: xous::CID, com: action_payload: MenuPayload::Scalar([0, 0, 0, 0]), close_on_select: true, }); + menuitems.push(MenuItem { + name: String::from_str(t!("mainmenu.battery_disconnect", xous::LANG)), + action_conn: Some(status_conn), + action_opcode: StatusOpcode::BatteryDisconnect.to_u32().unwrap(), + action_payload: MenuPayload::Scalar([0, 0, 0, 0]), + close_on_select: true, + }); menuitems.push(MenuItem { name: String::from_str(t!("mainmenu.closemenu", xous::LANG)), action_conn: None,