fix missing update to display in panic handler

This commit is contained in:
bunnie 2022-04-10 16:57:04 +08:00
parent 46624addd0
commit 5d2c65cb6c
2 changed files with 4 additions and 10 deletions

View file

@ -34,7 +34,6 @@ const TOP_OFFSET: usize = 48;
/// Width and height of the panic box in characters
const WIDTH_CHARS: usize = 40;
const HEIGHT_CHARS: usize = 24;
const TOTAL_CHARS: usize = WIDTH_CHARS * HEIGHT_CHARS;
/// these are fixed by the monospace font
const GLYPH_HEIGHT: usize = 15;
const GLYPH_WIDTH: usize = 7;
@ -57,7 +56,6 @@ pub(crate) fn panic_handler_thread(
.expect("Couldn't create panic server");
let mut display = unsafe { PanicDisplay::new(hwfb, control) };
let mut panic_text = xous_ipc::String::<TOTAL_CHARS>::new();
loop {
let msg = xous::receive_message(panic_server).unwrap();
@ -67,7 +65,6 @@ pub(crate) fn panic_handler_thread(
is_panic.store(true, Ordering::Relaxed);
display.panic_rectangle();
display.append_string(" ~~Guru Meditation~~\n\n");
display.update_dirty();
}
let body = match msg.body.memory_message() {
Some(body) => body,
@ -84,13 +81,7 @@ pub(crate) fn panic_handler_thread(
&body.buf.as_slice()[..len]
)};
display.append_string(s);
panic_text.append(
unsafe{
core::str::from_utf8_unchecked(
&body.buf.as_slice()[..len]
)
}
).ok();
display.update_dirty();
}
}

View file

@ -106,6 +106,9 @@ impl<'a> ShellCmdApi<'a> for Test {
if let Some(sub_cmd) = tokens.next() {
match sub_cmd {
"panic" => {
assert!(1 == 0, "Panic test: 1 == 0 failure!");
}
"instant" => {
write!(ret, "start elapsed_ms {}\n", env.ticktimer.elapsed_ms()).unwrap();
let now = Instant::now();