diff --git a/services/status/locales/i18n.json b/services/status/locales/i18n.json index 3c5ba7f81..51099332e 100644 --- a/services/status/locales/i18n.json +++ b/services/status/locales/i18n.json @@ -73,5 +73,10 @@ "en": "Close menu", "zh": "关闭功能表", "en-audio": "Close menu" + }, + "mainmenu.cant_sleep": { + "en": "Can't sleep while charging", + "zh": "充电时睡不着", + "en-audio": "Can't sleep while charging" } } \ No newline at end of file diff --git a/services/status/src/main.rs b/services/status/src/main.rs index 48d111eb9..c3a83be7b 100644 --- a/services/status/src/main.rs +++ b/services/status/src/main.rs @@ -43,6 +43,8 @@ enum StatusOpcode { UxSetTime, /// Initiates a reboot Reboot, + /// Suspend handler from the main menu + TrySuspend, Quit, } @@ -623,6 +625,13 @@ fn xmain() -> ! { panic!("system did not reboot"); } } + Some(StatusOpcode::TrySuspend) => { + 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 { + susres.initiate_suspend().expect("couldn't initiate suspend op"); + } + }, Some(StatusOpcode::Quit) => { break; } diff --git a/services/status/src/mainmenu.rs b/services/status/src/mainmenu.rs index 7931fb504..074ab1348 100644 --- a/services/status/src/mainmenu.rs +++ b/services/status/src/mainmenu.rs @@ -15,7 +15,6 @@ pub fn main_menu_thread(keys: Arc>, status_sid: xous::SID) { let mut menu = Menu::new(gam::api::MAIN_MENU_NAME); let xns = xous_names::XousNames::new().unwrap(); - let susres = susres::Susres::new_without_hook(&xns).unwrap(); let com = com::Com::new(&xns).unwrap(); let blon_item = MenuItem { @@ -38,8 +37,8 @@ pub fn main_menu_thread(keys: Arc>, status_sid: xous::SID) { let sleep_item = MenuItem { name: String::<64>::from_str(t!("mainmenu.sleep", xous::LANG)), - action_conn: susres.conn(), - action_opcode: susres.getop_suspend(), + action_conn: status_conn, + action_opcode: StatusOpcode::TrySuspend.to_u32().unwrap(), action_payload: MenuPayload::Scalar([0, 0, 0, 0]), close_on_select: true, };