diff --git a/src/rust/bitbox02-rust-c/src/lib.rs b/src/rust/bitbox02-rust-c/src/lib.rs index 094a41a26..5c15e6ce2 100644 --- a/src/rust/bitbox02-rust-c/src/lib.rs +++ b/src/rust/bitbox02-rust-c/src/lib.rs @@ -47,7 +47,7 @@ mod workflow; fn panic(info: &core::panic::PanicInfo) -> ! { ::util::log::log!("{}", info); #[cfg(feature = "firmware")] - bitbox02_rust::print_debug!(0, "Error: {}", info); + bitbox02_rust::print_screen!(0, "Error: {}", info); loop {} } diff --git a/src/rust/bitbox02-rust/src/general.rs b/src/rust/bitbox02-rust/src/general.rs index bfe3bc2d0..c4d3388a5 100644 --- a/src/rust/bitbox02-rust/src/general.rs +++ b/src/rust/bitbox02-rust/src/general.rs @@ -14,3 +14,11 @@ #[macro_use] pub mod screen; + +/// displays the input error message on the screen and enters +/// an infinite loop. +#[allow(clippy::empty_loop)] +pub fn abort(err: &str) -> ! { + print_screen!(0, "Error: {}", err); + loop {} +} diff --git a/src/rust/bitbox02-rust/src/general/screen.rs b/src/rust/bitbox02-rust/src/general/screen.rs index ddf93717a..1aedafb50 100644 --- a/src/rust/bitbox02-rust/src/general/screen.rs +++ b/src/rust/bitbox02-rust/src/general/screen.rs @@ -31,11 +31,11 @@ pub fn print_debug_internal(duration: Duration, msg: &str) { /// ```no_run /// # #[macro_use] extern crate bitbox02_rust; fn main() { /// let my_str = "abc"; -/// print_debug!(1000, "{}", &my_str); +/// print_screen!(1000, "{}", &my_str); /// # } /// ``` #[macro_export] -macro_rules! print_debug { +macro_rules! print_screen { ($duration:expr, $($arg:tt)*) => ({ extern crate alloc; let duration = core::time::Duration::from_millis($duration); diff --git a/src/rust/bitbox02-rust/src/hww/api/restore.rs b/src/rust/bitbox02-rust/src/hww/api/restore.rs index c0a43f42f..6cc65c451 100644 --- a/src/rust/bitbox02-rust/src/hww/api/restore.rs +++ b/src/rust/bitbox02-rust/src/hww/api/restore.rs @@ -17,6 +17,7 @@ use crate::pb; use pb::response::Response; +use crate::general::abort; use crate::workflow::{confirm, mnemonic, password, status, unlock}; pub async fn from_file(request: &pb::RestoreBackupRequest) -> Result { @@ -75,7 +76,9 @@ pub async fn from_file(request: &pb::RestoreBackupRequest) -> Result(f: F) { +pub fn with_lock_animation R, R>(f: F) -> R { unsafe { bitbox02_sys::lock_animation_start() }; - f(); + let result = f(); unsafe { bitbox02_sys::lock_animation_stop() }; + result } pub fn screen_stack_pop_all() { diff --git a/src/rust/bitbox02/src/ui/ui_stub.rs b/src/rust/bitbox02/src/ui/ui_stub.rs index 2e1fba914..19279ec1f 100644 --- a/src/rust/bitbox02/src/ui/ui_stub.rs +++ b/src/rust/bitbox02/src/ui/ui_stub.rs @@ -151,7 +151,7 @@ pub fn trinary_input_string_set_input(_component: &mut Component, _word: &str) { panic!("not implemented") } -pub fn with_lock_animation(f: F) { +pub fn with_lock_animation R, R>(f: F) -> R { f() } diff --git a/src/rust/bitbox02/src/ui/ui_stub_c_unit_tests.rs b/src/rust/bitbox02/src/ui/ui_stub_c_unit_tests.rs index 56f0b0193..b51509309 100644 --- a/src/rust/bitbox02/src/ui/ui_stub_c_unit_tests.rs +++ b/src/rust/bitbox02/src/ui/ui_stub_c_unit_tests.rs @@ -162,7 +162,7 @@ pub fn trinary_input_string_set_input(_component: &mut Component, _word: &str) { panic!("not implemented") } -pub fn with_lock_animation(f: F) { +pub fn with_lock_animation R, R>(f: F) -> R { f() }