From 8c66e04bc3f83d8c97935172e4b88c6dbc3ff0f9 Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 17 Dec 2021 02:49:38 +0800 Subject: [PATCH] refactor RTC module to use modals server --- Cargo.lock | 3 +- services/modals/Cargo.toml | 3 +- services/modals/locales/i18n.json | 7 - services/modals/src/main.rs | 5 +- services/modals/src/tests.rs | 1 - services/rtc/Cargo.toml | 2 +- services/rtc/src/api.rs | 11 -- services/rtc/src/main.rs | 220 ++++++++++-------------------- 8 files changed, 79 insertions(+), 173 deletions(-) delete mode 100644 services/modals/locales/i18n.json diff --git a/Cargo.lock b/Cargo.lock index 8fe5debd8..e718edee6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1265,7 +1265,6 @@ name = "modals" version = "0.1.0" dependencies = [ "gam", - "locales", "log", "log-server", "num-derive", @@ -1826,11 +1825,11 @@ dependencies = [ "bitflags", "chrono", "gam", - "graphics-server", "llio", "locales", "log", "log-server", + "modals", "num-derive", "num-traits", "rkyv", diff --git a/services/modals/Cargo.toml b/services/modals/Cargo.toml index 69a6f4c36..c2e7403bb 100644 --- a/services/modals/Cargo.toml +++ b/services/modals/Cargo.toml @@ -16,7 +16,6 @@ num-traits = {version = "0.2", default-features = false} xous-ipc = { path = "../../xous-ipc" } rkyv = {version = "0.4.3", features = ["const_generics"], default-features = false} gam = {path="../gam"} -locales = {path = "../../locales"} trng = {path="../trng"} [target.'cfg(not(any(windows,unix)))'.dependencies] @@ -24,4 +23,4 @@ utralib = { path = "../../utralib"} [features] ux_tests = [] -default = ["ux_tests"] +default = [] diff --git a/services/modals/locales/i18n.json b/services/modals/locales/i18n.json deleted file mode 100644 index 794d0bb0d..000000000 --- a/services/modals/locales/i18n.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "modals.invalid_text": { - "en": "Invalid input", - "zh": "输入无效", - "en-audio": "Invalid input" - } -} \ No newline at end of file diff --git a/services/modals/src/main.rs b/services/modals/src/main.rs index c37cf8f32..10515d2e7 100644 --- a/services/modals/src/main.rs +++ b/services/modals/src/main.rs @@ -14,7 +14,6 @@ use std::sync::{Arc, Mutex}; use std::thread; use gam::modal::*; -use locales::t; use num_traits::*; @@ -55,7 +54,7 @@ pub(crate) enum RendererOp { #[xous::xous_main] fn xmain() -> ! { log_server::init_wait().unwrap(); - log::set_max_level(log::LevelFilter::Trace); + log::set_max_level(log::LevelFilter::Info); log::info!("my PID is {}", xous::process::id()); let xns = xous_names::XousNames::new().unwrap(); @@ -212,7 +211,7 @@ fn xmain() -> ! { let mut mutex_op = op.lock().unwrap(); match *mutex_op { RendererState::RunText(config) => { - log::info!("validating text entry modale"); + log::trace!("validating text entry modal"); let buf = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; let text = buf.to_original::().unwrap(); if let Some(validator_sid) = config.validator { diff --git a/services/modals/src/tests.rs b/services/modals/src/tests.rs index f0c918784..8882de86c 100644 --- a/services/modals/src/tests.rs +++ b/services/modals/src/tests.rs @@ -60,7 +60,6 @@ pub(crate) fn spawn_test() { move || { let xns = XousNames::new().unwrap(); let modals = modals::Modals::new(&xns).unwrap(); - let tt = ticktimer_server::Ticktimer::new().unwrap(); // test radio box for item in RADIO_TEST { diff --git a/services/rtc/Cargo.toml b/services/rtc/Cargo.toml index 2212ee128..6b068a983 100644 --- a/services/rtc/Cargo.toml +++ b/services/rtc/Cargo.toml @@ -15,7 +15,7 @@ bitflags = "1.2.1" llio = {path = "../llio"} gam = {path = "../gam"} locales = {path = "../../locales"} -graphics-server = {path = "../graphics-server"} +modals = {path = "../modals"} xous-ipc = {path = "../../xous-ipc"} num-derive = {version = "0.3", default-features = false} diff --git a/services/rtc/src/api.rs b/services/rtc/src/api.rs index 01ab581da..a2f52af9f 100644 --- a/services/rtc/src/api.rs +++ b/services/rtc/src/api.rs @@ -64,17 +64,6 @@ pub(crate) enum Opcode { /// Ux callbacks UxSetTime, - UxMonth, - UxDay, - UxYear, - UxDayOfWeek, - UxHour, - UxMinute, - UxSeconds, - - UxRedraw, - UxRawkeys, - UxQuit, /// Quit Quit diff --git a/services/rtc/src/main.rs b/services/rtc/src/main.rs index ef782077c..aba0fe8ba 100644 --- a/services/rtc/src/main.rs +++ b/services/rtc/src/main.rs @@ -9,9 +9,7 @@ use xous_ipc::Buffer; use xous::{msg_scalar_unpack, msg_blocking_scalar_unpack}; use locales::t; -use graphics_server::GlyphStyle; use gam::modal::*; -use gam::ActionType::*; use core::sync::atomic::{AtomicU32, Ordering}; static CB_TO_MAIN_CONN: AtomicU32 = AtomicU32::new(0); @@ -522,6 +520,16 @@ mod implementation { } } +#[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive)] +pub(crate) enum ValidatorOp { + UxMonth, + UxDay, + UxYear, + UxHour, + UxMinute, + UxSeconds, +} + fn rtc_ux_validator(input: TextEntryPayload, opcode: u32) -> Option { let text_str = input.as_str(); let input_int = match text_str.parse::() { @@ -530,32 +538,32 @@ fn rtc_ux_validator(input: TextEntryPayload, opcode: u32) -> Option { + Some(ValidatorOp::UxMonth) => { if input_int < 1 || input_int > 12 { return Some(ValidatorErr::from_str(t!("rtc.range_err", xous::LANG))) } } - Some(Opcode::UxDay) => { + Some(ValidatorOp::UxDay) => { if input_int < 1 || input_int > 31 { return Some(ValidatorErr::from_str(t!("rtc.range_err", xous::LANG))) } } - Some(Opcode::UxYear) => { + Some(ValidatorOp::UxYear) => { if input_int > 99 { return Some(ValidatorErr::from_str(t!("rtc.range_err", xous::LANG))) } } - Some(Opcode::UxHour) => { + Some(ValidatorOp::UxHour) => { if input_int > 23 { return Some(ValidatorErr::from_str(t!("rtc.range_err", xous::LANG))) } } - Some(Opcode::UxMinute) => { + Some(ValidatorOp::UxMinute) => { if input_int > 59 { return Some(ValidatorErr::from_str(t!("rtc.range_err", xous::LANG))) } } - Some(Opcode::UxSeconds) => { + Some(ValidatorOp::UxSeconds) => { if input_int > 59 { return Some(ValidatorErr::from_str(t!("rtc.range_err", xous::LANG))) } @@ -594,38 +602,19 @@ fn xmain() -> ! { #[cfg(not(any(target_os = "none", target_os = "xous")))] let mut rtc = Rtc::new(&xns); - let mut rtc_textentry = gam::modal::TextEntry { - is_password: false, - visibility: gam::modal::TextEntryVisibility::Visible, - action_conn: CB_TO_MAIN_CONN.load(Ordering::Relaxed), - action_opcode: Opcode::UxMonth.to_u32().unwrap(), - action_payload: TextEntryPayload::new(), - validator: Some(rtc_ux_validator), - }; - log::trace!("building rtc ux modal"); - let mut modal = gam::Modal::new( - crate::api::RTC_MODAL_NAME, - gam::ActionType::TextEntry(rtc_textentry), - Some(t!("rtc.month", xous::LANG)), - None, - GlyphStyle::Small, - 8 - ); - modal.spawn_helper(rtc_sid, modal.sid, - Opcode::UxRedraw.to_u32().unwrap(), - Opcode::UxRawkeys.to_u32().unwrap(), - Opcode::UxQuit.to_u32().unwrap() - ); - let mut secs: u8; - let mut mins: u8 = 0; - let mut hours: u8 = 0; - let mut months: u8 = 0; - let mut days: u8 = 0; - let mut years: u8 = 0; - let mut weekday: Weekday = Weekday::Monday; + let day_of_week_list = [ + t!("rtc.monday", xous::LANG), + t!("rtc.tuesday", xous::LANG), + t!("rtc.wednesday", xous::LANG), + t!("rtc.thursday", xous::LANG), + t!("rtc.friday", xous::LANG), + t!("rtc.saturday", xous::LANG), + t!("rtc.sunday", xous::LANG), + ]; let ticktimer = ticktimer_server::Ticktimer::new().expect("can't connect to ticktimer"); let mut dt_cb_conns: [bool; xous::MAX_CID] = [false; xous::MAX_CID]; + let modals = modals::Modals::new(&xns).unwrap(); log::trace!("ready to accept requests"); loop { let msg = xous::receive_message(rtc_sid).unwrap(); @@ -738,59 +727,39 @@ fn xmain() -> ! { xous::return_scalar(msg.sender, 0).expect("couldn't return to caller"); }), Some(Opcode::UxSetTime) => msg_scalar_unpack!(msg, _, _, _, _, { - rtc_textentry.action_opcode = Opcode::UxMonth.to_u32().unwrap(); - modal.modify(Some(TextEntry(rtc_textentry)), Some(t!("rtc.month", xous::LANG)), false, None, true, None); - modal.activate(); - }), - Some(Opcode::UxMonth) => { - let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; - let payload = buffer.to_original::().unwrap(); - let input = payload.as_str().parse::().expect("pre-validated input failed to re-parse!"); - months = input as u8; + let secs: u8; + let mins: u8; + let hours: u8; + let months: u8; + let days: u8; + let years: u8; + let weekday: Weekday; + + months = modals.get_text( + t!("rtc.month", xous::LANG), + Some(rtc_ux_validator), Some(ValidatorOp::UxMonth.to_u32().unwrap()) + ).expect("couldn't get month").as_str() + .parse::().expect("pre-validated input failed to re-parse!"); log::debug!("got months {}", months); - rtc_textentry.action_opcode = Opcode::UxDay.to_u32().unwrap(); - modal.modify(Some(TextEntry(rtc_textentry)), - Some(t!("rtc.day", xous::LANG)), false, None, true, None); - modal.activate(); - } - Some(Opcode::UxDay) => { - let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; - let payload = buffer.to_original::().unwrap(); - let input = payload.as_str().parse::().expect("pre-validated input failed to re-parse!"); - days = input as u8; + days = modals.get_text( + t!("rtc.day", xous::LANG), + Some(rtc_ux_validator), Some(ValidatorOp::UxDay.to_u32().unwrap()) + ).expect("couldn't get month").as_str() + .parse::().expect("pre-validated input failed to re-parse!"); log::debug!("got days {}", days); - rtc_textentry.action_opcode = Opcode::UxYear.to_u32().unwrap(); - modal.modify(Some(TextEntry(rtc_textentry)), - Some(t!("rtc.year", xous::LANG)), false, None, true, None); - modal.activate(); - } - Some(Opcode::UxYear) => { - let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; - let payload = buffer.to_original::().unwrap(); - let input = payload.as_str().parse::().expect("pre-validated input failed to re-parse!"); - years = input as u8; + years = modals.get_text( + t!("rtc.year", xous::LANG), + Some(rtc_ux_validator), Some(ValidatorOp::UxYear.to_u32().unwrap()) + ).expect("couldn't get month").as_str() + .parse::().expect("pre-validated input failed to re-parse!"); + log::debug!("got years {}", years); - rtc_textentry.action_opcode = Opcode::UxDayOfWeek.to_u32().unwrap(); - let mut rtc_radiobox = gam::modal::RadioButtons::new( - CB_TO_MAIN_CONN.load(Ordering::Relaxed).to_u32().unwrap(), - Opcode::UxDayOfWeek.to_u32().unwrap() - ); - rtc_radiobox.add_item(ItemName::new(t!("rtc.monday", xous::LANG))); - rtc_radiobox.add_item(ItemName::new(t!("rtc.tuesday", xous::LANG))); - rtc_radiobox.add_item(ItemName::new(t!("rtc.wednesday", xous::LANG))); - rtc_radiobox.add_item(ItemName::new(t!("rtc.thursday", xous::LANG))); - rtc_radiobox.add_item(ItemName::new(t!("rtc.friday", xous::LANG))); - rtc_radiobox.add_item(ItemName::new(t!("rtc.saturday", xous::LANG))); - rtc_radiobox.add_item(ItemName::new(t!("rtc.sunday", xous::LANG))); - modal.modify(Some(RadioButtons(rtc_radiobox)), - Some(t!("rtc.day_of_week", xous::LANG)), false, None, true, None); - modal.activate(); - } - Some(Opcode::UxDayOfWeek) => { - let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; - let payload = buffer.to_original::().unwrap(); + for dow in day_of_week_list.iter() { + modals.add_list_item(dow).expect("couldn't build day of week list"); + } + let payload = modals.get_radiobutton(t!("rtc.day_of_week", xous::LANG)).expect("couldn't get day of week"); weekday = if payload.as_str() == t!("rtc.monday", xous::LANG) { Weekday::Monday @@ -807,73 +776,32 @@ fn xmain() -> ! { } else { Weekday::Sunday }; + log::debug!("got weekday {:?}", weekday); - rtc_textentry.action_opcode = Opcode::UxHour.to_u32().unwrap(); - modal.modify(Some(TextEntry(rtc_textentry)), - Some(t!("rtc.hour", xous::LANG)), false, None, true, None); - modal.activate(); - } - Some(Opcode::UxHour) => { - let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; - let payload = buffer.to_original::().unwrap(); - let input = payload.as_str().parse::().expect("pre-validated input failed to re-parse!"); - hours = input as u8; + hours = modals.get_text( + t!("rtc.hour", xous::LANG), + Some(rtc_ux_validator), Some(ValidatorOp::UxHour.to_u32().unwrap()) + ).expect("couldn't get hour").as_str() + .parse::().expect("pre-validated input failed to re-parse!"); + log::debug!("got hours {}", hours); - rtc_textentry.action_opcode = Opcode::UxMinute.to_u32().unwrap(); - modal.modify(Some(TextEntry(rtc_textentry)), - Some(t!("rtc.minute", xous::LANG)), false, None, true, None); - modal.activate(); - } - Some(Opcode::UxMinute) => { - let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; - let payload = buffer.to_original::().unwrap(); - let input = payload.as_str().parse::().expect("pre-validated input failed to re-parse!"); - mins = input as u8; + mins = modals.get_text( + t!("rtc.minute", xous::LANG), + Some(rtc_ux_validator), Some(ValidatorOp::UxMinute.to_u32().unwrap()) + ).expect("couldn't get minutes").as_str() + .parse::().expect("pre-validated input failed to re-parse!"); + log::debug!("got minutes {}", mins); - rtc_textentry.action_opcode = Opcode::UxSeconds.to_u32().unwrap(); - modal.modify(Some(TextEntry(rtc_textentry)), - Some(t!("rtc.seconds", xous::LANG)), false, None, true, None); - modal.activate(); - } - Some(Opcode::UxSeconds) => { - let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; - let payload = buffer.to_original::().unwrap(); - let input = payload.as_str().parse::().expect("pre-validated input failed to re-parse!"); - secs = input as u8; + secs = modals.get_text( + t!("rtc.seconds", xous::LANG), + Some(rtc_ux_validator), Some(ValidatorOp::UxSeconds.to_u32().unwrap()) + ).expect("couldn't get seconds").as_str() + .parse::().expect("pre-validated input failed to re-parse!"); + log::debug!("got seconds {}", secs); + log::info!("Setting time: {}/{}/{} {}:{}:{} {:?}", months, days, years, hours, mins, secs, weekday); rtc.rtc_set(secs, mins, hours, days, months, years, weekday).expect("couldn't set the current time"); - } - Some(Opcode::UxRedraw) => { - modal.redraw(); - } - Some(Opcode::UxRawkeys) => msg_scalar_unpack!(msg, k1, k2, k3, k4, { - let keys = [ - if let Some(a) = core::char::from_u32(k1 as u32) { - a - } else { - '\u{0000}' - }, - if let Some(a) = core::char::from_u32(k2 as u32) { - a - } else { - '\u{0000}' - }, - if let Some(a) = core::char::from_u32(k3 as u32) { - a - } else { - '\u{0000}' - }, - if let Some(a) = core::char::from_u32(k4 as u32) { - a - } else { - '\u{0000}' - }, - ]; - modal.key_event(keys); }), - Some(Opcode::UxQuit) => { - panic!("Modal handler quit unexpectedly"); - } Some(Opcode::Quit) => { log::error!("Quitting RTC server"); break;