turn off more debugging for demo

This commit is contained in:
bunnie 2021-03-11 04:43:58 +08:00
parent 16d8438a0d
commit 54cf95aec1
3 changed files with 7 additions and 6 deletions

View file

@ -203,10 +203,6 @@ fn xmain() -> ! {
// this is broken into two steps because of https://github.com/rust-lang/rust/issues/71126
canvases = recompute_canvases(canvases, Rectangle::new(Point::new(0, 0), screensize));
// make a thread to manage the status bar
// the status bar is a trusted element managed by the OS, and we are chosing to domicile this in the GAM process for now
xous::create_thread_simple(status_thread, chatlayout.status.gid()).expect("GAM: couldn't create status thread");
// connect to the IME front end, and set its canvas
info!("GAM: acquiring connection to IMEF...");
let imef_conn = xous_names::request_connection_blocking(xous::names::SERVER_NAME_IME_FRONT).expect("GAM: can't connect to the IME front end");
@ -221,6 +217,10 @@ fn xmain() -> ! {
// no content canvas initially, but keep a placeholder for one
let mut ccc: ContentCanvasConnection = ContentCanvasConnection{connection: None};
// make a thread to manage the status bar -- this needs to start after the IMEF is initialized
// the status bar is a trusted element managed by the OS, and we are chosing to domicile this in the GAM process for now
xous::create_thread_simple(status_thread, chatlayout.status.gid()).expect("GAM: couldn't create status thread");
let mut powerdown_requested = false;
let mut last_time: u64 = ticktimer_server::elapsed_ms(ticktimer_conn).unwrap();
info!("GAM: entering main loop");
@ -253,7 +253,7 @@ fn xmain() -> ! {
rect.br.into(),
).expect("GAM: couldn't return canvas bounds");
},
None => info!("GAM: attempt to get bounds on bogus canvas, ignored."),
None => info!("GAM: attempt to get bounds on bogus canvas gid {:?}, {:?} ignored.", gid, envelope),
}
},
Opcode::PowerDownRequest => {

View file

@ -10,6 +10,7 @@ use blitstr_ref as blitstr;
pub fn status_thread(canvas_gid: [u32; 4]) {
let debug1 = false;
let status_gid: Gid = Gid::new(canvas_gid);
if debug1{info!("GAM|status: my canvas {:?}", status_gid)};
if debug1{info!("GAM|status: registering GAM|status thread");}
let status_sid = xous_names::register_name(xous::names::SERVER_NAME_STATUS).expect("GAM|status: can't register server");

View file

@ -416,7 +416,7 @@ fn xmain() -> ! {
if debug1{info!("LLIO: registered with NS -- {:?}", llio_sid);}
// Create a new com object
let llio = Llio::new();
let mut llio = Llio::new();
if debug1{info!("LLIO: starting main loop");}
let mut reboot_requested: bool = false;