From fae09806b9730dcee7acdfd424060c9a6ca671f7 Mon Sep 17 00:00:00 2001 From: tychovrahe Date: Fri, 11 Nov 2022 21:04:32 +0100 Subject: [PATCH] after mini display --- core/embed/bootloader/bootui.c | 4 ++++ core/embed/rust/src/trezorhal/display.rs | 2 ++ core/embed/rust/src/ui/display/mod.rs | 2 ++ core/embed/rust/src/ui/model_tr/bootloader/mod.rs | 11 +++++++++++ 4 files changed, 19 insertions(+) diff --git a/core/embed/bootloader/bootui.c b/core/embed/bootloader/bootui.c index 4cecb0a0ad..3a948088d9 100644 --- a/core/embed/bootloader/bootui.c +++ b/core/embed/bootloader/bootui.c @@ -108,6 +108,8 @@ void ui_screen_boot(const vendor_header *const vhdr, display_text_center(DISPLAY_RESX / 2, DISPLAY_RESY - 5 - 25, ver_str, -1, FONT_NORMAL, COLOR_BL_BG, boot_background); } + + display_refresh(); } void ui_screen_boot_wait(int wait_seconds) { @@ -116,6 +118,7 @@ void ui_screen_boot_wait(int wait_seconds) { display_bar(0, DISPLAY_RESY - 5 - 20, DISPLAY_RESX, 5 + 20, boot_background); display_text_center(DISPLAY_RESX / 2, DISPLAY_RESY - 5, wait_str, -1, FONT_NORMAL, COLOR_BL_BG, boot_background); + display_refresh(); } void ui_screen_boot_click(void) { @@ -123,6 +126,7 @@ void ui_screen_boot_click(void) { display_text_center(DISPLAY_RESX / 2, DISPLAY_RESY - 5, "click to continue ...", -1, FONT_NORMAL, COLOR_BL_BG, boot_background); + display_refresh(); } // welcome UI diff --git a/core/embed/rust/src/trezorhal/display.rs b/core/embed/rust/src/trezorhal/display.rs index d23b603b1c..a00d054c18 100644 --- a/core/embed/rust/src/trezorhal/display.rs +++ b/core/embed/rust/src/trezorhal/display.rs @@ -19,6 +19,8 @@ pub struct ToifInfo { pub format: ToifFormat, } +pub fn refresh() { unsafe {ffi::display_refresh(); }} + pub fn backlight(val: i32) -> i32 { unsafe { ffi::display_backlight(val) } } diff --git a/core/embed/rust/src/ui/display/mod.rs b/core/embed/rust/src/ui/display/mod.rs index f8c1854983..56e09b62d4 100644 --- a/core/embed/rust/src/ui/display/mod.rs +++ b/core/embed/rust/src/ui/display/mod.rs @@ -35,6 +35,8 @@ pub use icon::{Icon, IconAndName}; #[cfg(any(feature = "model_tt", feature = "model_tr"))] pub use loader::{loader, loader_indeterminate, LOADER_MAX, LOADER_MIN}; +pub fn refresh() { display::refresh(); } + pub fn backlight() -> u16 { display::backlight(-1) as u16 } diff --git a/core/embed/rust/src/ui/model_tr/bootloader/mod.rs b/core/embed/rust/src/ui/model_tr/bootloader/mod.rs index b03bf92c0d..96bc6ea6cc 100644 --- a/core/embed/rust/src/ui/model_tr/bootloader/mod.rs +++ b/core/embed/rust/src/ui/model_tr/bootloader/mod.rs @@ -78,6 +78,7 @@ where { frame.place(SCREEN_ADJ); frame.paint(); + display::refresh(); fade_backlight_duration(BACKLIGHT_NORMAL as _, 500); while button_eval().is_some() {} @@ -93,6 +94,7 @@ where } frame.paint(); + display::refresh(); } } } @@ -233,6 +235,8 @@ fn screen_progress( // 0, // fill_to as _, // ); + + display::refresh(); 0 } @@ -279,6 +283,7 @@ extern "C" fn screen_connect() -> u32 { frame.place(SCREEN_ADJ); frame.paint(); + display::refresh(); 0 } @@ -300,6 +305,7 @@ extern "C" fn screen_wipe_success() -> u32 { let mut frame = ResultScreen::new(BLD_FG, BLD_BG, ICON_SPINNER, m_top, m_bottom, true); frame.place(SCREEN_ADJ); frame.paint(); + display::refresh(); 0 } @@ -321,6 +327,7 @@ extern "C" fn screen_wipe_fail() -> u32 { let mut frame = ResultScreen::new(BLD_FG, BLD_BG, ICON_ALERT, m_top, m_bottom, true); frame.place(SCREEN_ADJ); frame.paint(); + display::refresh(); 0 } @@ -346,6 +353,7 @@ extern "C" fn screen_install_fail() -> u32 { let mut frame = ResultScreen::new(BLD_FG, BLD_BG, ICON_ALERT, m_top, m_bottom, true); frame.place(SCREEN_ADJ); frame.paint(); + display::refresh(); 0 } @@ -365,6 +373,7 @@ fn screen_install_success_bld(msg: &'static str, complete_draw: bool) -> u32 { let mut frame = ResultScreen::new(BLD_FG, BLD_BG, ICON_SPINNER, m_top, m_bottom, complete_draw); frame.place(SCREEN_ADJ); frame.paint(); + display::refresh(); 0 } @@ -384,6 +393,7 @@ fn screen_install_success_initial(msg: &'static str, complete_draw: bool) -> u32 let mut frame = ResultScreen::new(BLD_FG, BLD_BG, ICON_SPINNER, m_top, m_bottom, complete_draw); frame.place(SCREEN_ADJ); frame.paint(); + display::refresh(); 0 } @@ -412,5 +422,6 @@ extern "C" fn screen_welcome() -> u32 { frame.place(SCREEN_ADJ); frame.paint(); + display::refresh(); 0 }