diff --git a/services/gam/src/api.rs b/services/gam/src/api.rs index 6fc6496a8..2f514184a 100644 --- a/services/gam/src/api.rs +++ b/services/gam/src/api.rs @@ -180,6 +180,9 @@ pub(crate) enum Opcode { /// Show a test pattern. Can only call this once (to prevent abuse) TestPattern, + /// Toggle debug on serial console + SetDebugLevel, + Quit, } diff --git a/services/gam/src/lib.rs b/services/gam/src/lib.rs index f1fa066b7..3f4d75045 100644 --- a/services/gam/src/lib.rs +++ b/services/gam/src/lib.rs @@ -385,6 +385,18 @@ impl Gam { ) .expect("couldn't self test"); } + pub fn set_debug_level(&self, level: log::LevelFilter) { + let l: usize = match level { + log::LevelFilter::Debug => 1, + log::LevelFilter::Trace => 2, + _ => 0, + }; + send_message( + self.conn, + Message::new_blocking_scalar(Opcode::SetDebugLevel.to_usize().unwrap(), l, 0, 0, 0), + ) + .expect("couldn't set debug level"); + } } use core::sync::atomic::{AtomicU32, Ordering}; diff --git a/services/gam/src/main.rs b/services/gam/src/main.rs index cbe3406d1..16c03bac6 100644 --- a/services/gam/src/main.rs +++ b/services/gam/src/main.rs @@ -178,6 +178,15 @@ fn main() -> ! { } }) } + Some(Opcode::SetDebugLevel) => msg_blocking_scalar_unpack!(msg, level, _, _, _, { + match level { + 0 => log::set_max_level(log::LevelFilter::Info), + 1 => log::set_max_level(log::LevelFilter::Debug), + 2 => log::set_max_level(log::LevelFilter::Trace), + _ => log::set_max_level(log::LevelFilter::Info), + } + xous::return_scalar(msg.sender, level).unwrap(); + }), Some(Opcode::RenderTextView) => { let mut buffer = unsafe { Buffer::from_memory_message_mut(msg.body.memory_message_mut().unwrap()) }; let mut tv = buffer.to_original::().unwrap(); @@ -302,6 +311,7 @@ fn main() -> ! { log::trace!("renderobject {:?}", obj); if let Some(canvas) = canvases.get_mut(&obj.canvas) { // first, figure out if we should even be drawing to this canvas. + log::debug!("drawable {} onscreen {} state{:?} for canvas {:?}", canvas.is_drawable(), canvas.is_onscreen(), canvas.state(), canvas.gid()); if canvas.is_drawable() && canvas.is_onscreen() { match obj.obj { GamObjectType::Line(mut line) => {