improve autoupdate work flow and error messaging

this is hopefully a work-around for #114 as well, assuming
users actually read the message...
This commit is contained in:
bunnie 2022-07-14 23:19:52 +08:00
parent a5bcc50007
commit fded17221f
2 changed files with 4 additions and 4 deletions

View file

@ -192,10 +192,10 @@
"en-tts": "Unplug the charging cable so I can reboot!" "en-tts": "Unplug the charging cable so I can reboot!"
}, },
"rootkeys.init.finished": { "rootkeys.init.finished": {
"en": "Rebooting now... ", "en": "Rebooting now...\n\nIf the system shows a 'No valid keys' error or hangs, insert a paperclip into the hole in the lower right hand edge and plug in power to reload the FPGA bitstream.",
"ja": "再起動中...", "ja": "再起動中...",
"zh": "准备重启... ", "zh": "准备重启... ",
"en-tts": "Rebooting now." "en-tts": "Rebooting now...\n\nIf the system shows a 'No valid keys' error or hangs, insert a paperclip into the hole in the lower right hand edge and plug in power to reload the FPGA bitstream."
}, },
"rootkeys.init.fail_verify": { "rootkeys.init.fail_verify": {
"en": "Verification failed, aborting!", "en": "Verification failed, aborting!",

View file

@ -1278,11 +1278,11 @@ fn main() -> ! {
}), }),
Some(Opcode::TryNoKeySocUpdate) => msg_blocking_scalar_unpack!(msg, _, _, _, _, { Some(Opcode::TryNoKeySocUpdate) => msg_blocking_scalar_unpack!(msg, _, _, _, _, {
if keys.try_nokey_soc_update(&mut rootkeys_modal, main_cid) { if keys.try_nokey_soc_update(&mut rootkeys_modal, main_cid) {
// this will unblock the status thread, but also pop up our reboot flow
send_message(main_cid, send_message(main_cid,
xous::Message::new_scalar(Opcode::UxTryReboot.to_usize().unwrap(), 0, 0, 0, 0) xous::Message::new_scalar(Opcode::UxTryReboot.to_usize().unwrap(), 0, 0, 0, 0)
).expect("couldn't initiate dialog box"); ).expect("couldn't initiate dialog box");
xous::return_scalar(msg.sender, 1).unwrap(); // the status flow remains blocked "forever", but that's ok -- we should be rebooting.
// xous::return_scalar(msg.sender, 1).unwrap();
} else { } else {
xous::return_scalar(msg.sender, 0).unwrap(); xous::return_scalar(msg.sender, 0).unwrap();
} }