From a9a5e5c9a952a29c184c9c49ba8cfd45fc06bd02 Mon Sep 17 00:00:00 2001 From: bunnie Date: Thu, 24 Feb 2022 19:44:24 +0800 Subject: [PATCH] integrate app name in sec notes patch, make app name update retriggered on change --- Cargo.lock | 15 +++++++++++++++ Cargo.toml | 2 ++ services/status/src/main.rs | 15 ++++++++++++++- xtask/src/main.rs | 2 +- 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ab7528927..e720642dc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -821,6 +821,21 @@ dependencies = [ "termcolor", ] +[[package]] +name = "espeak" +version = "0.1.0" +dependencies = [ + "codec", + "log", + "log-server", + "num-derive", + "num-traits", + "ticktimer-server", + "utralib", + "xous", + "xous-names", +] + [[package]] name = "eyre" version = "0.6.5" diff --git a/Cargo.toml b/Cargo.toml index 282daa80e..9031d73f1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,6 +37,7 @@ default-members = [ "services/modals", "apps/ball", "apps/repl", + "services/espeak", ] members = [ "xous-ipc", @@ -89,6 +90,7 @@ members = [ "apps/ball", "apps/repl", "kernel", + "services/espeak", ] resolver = "2" diff --git a/services/status/src/main.rs b/services/status/src/main.rs index aebadaf8c..c4de445ab 100644 --- a/services/status/src/main.rs +++ b/services/status/src/main.rs @@ -309,6 +309,7 @@ fn xmain() -> ! { } }); }; + sec_notes.lock().unwrap().insert("current_app".to_string(), format!("Running: Shellchat").to_string()); // this is the default app on boot let mut stats_phase: usize = 0; @@ -728,13 +729,25 @@ fn xmain() -> ! { Some(StatusOpcode::SwitchToShellchat) => { ticktimer.sleep_ms(100).ok(); sec_notes.lock().unwrap().remove(&"current_app".to_string()); + sec_notes.lock().unwrap().insert("current_app".to_string(), format!("Running: Shellchat").to_string()); gam.switch_to_app(gam::APP_NAME_SHELLCHAT, security_tv.token.unwrap()).expect("couldn't raise shellchat"); + secnotes_force_redraw = true; + send_message( + cb_cid, + Message::new_scalar(StatusOpcode::Pump.to_usize().unwrap(), 0, 0, 0, 0), + ).expect("couldn't trigger status update"); }, Some(StatusOpcode::SwitchToApp) => msg_scalar_unpack!(msg, index, _, _, _, { ticktimer.sleep_ms(100).ok(); let app_name = app_autogen::app_index_to_name(index).expect("app index not found"); app_autogen::app_dispatch(&gam, security_tv.token.unwrap(), index).expect("cannot switch to app"); - sec_notes.lock().unwrap().insert("current_app".to_string(), format!("Current app: {}", app_name).to_string()); + sec_notes.lock().unwrap().remove(&"current_app".to_string()); + sec_notes.lock().unwrap().insert("current_app".to_string(), format!("Running: {}", app_name).to_string()); + secnotes_force_redraw = true; + send_message( + cb_cid, + Message::new_scalar(StatusOpcode::Pump.to_usize().unwrap(), 0, 0, 0, 0), + ).expect("couldn't trigger status update"); }), Some(StatusOpcode::TrySuspend) => { if ((llio.adc_vbus().unwrap() as f64) * 0.005033) > 1.5 { diff --git a/xtask/src/main.rs b/xtask/src/main.rs index b4dfbd9e7..25022994d 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -1319,7 +1319,7 @@ pub(crate) fn app_index_to_name(index: usize) -> Result<&'static str, AppDispatc index, name, ).unwrap(); - } + } } writeln!(menu, r####" _ => Err(AppDispatchError::IndexNotFound(index)), }}