arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-07-26 00:18:15 +00:00
Code Issues Releases Wiki Activity

fix(core): remove boot stage 1 from Eckhart UI

Browse Source 
[no changelog]
This commit is contained in:
tychovrahe 2025-06-20 11:39:44 +02:00 committed by TychoVrahe
parent e53cddf65e
commit e281f145b3
5 changed files with 30 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/embed/projects/bootloader/workflow/wf_empty_device.c
View File

@ -41,15 +41,6 @@ workflow_result_t workflow_empty_device(void) {
#endif #endif
ensure(erase_storage(NULL), NULL); ensure(erase_storage(NULL), NULL);
// keep the model screen up for a while
#ifndef USE_BACKLIGHT
systick_delay_ms(1500);
#else
// backlight fading takes some time so the explicit delay here is
// shorter
systick_delay_ms(1000);
#endif
protob_ios_t ios; protob_ios_t ios;
workflow_ifaces_init(sectrue, &ios); workflow_ifaces_init(sectrue, &ios);

22
core/embed/rust/src/ui/layout_bolt/bootloader/mod.rs
View File

@ -29,14 +29,18 @@ use super::{
}, },
UIBolt, UIBolt,
}; };
use crate::ui::{ use crate::{
component::{Event, Label}, time::Duration,
display::{self, toif::Toif, Color, Icon, LOADER_MAX}, trezorhal::time,
geometry::{Alignment, Alignment2D, Offset, Point, Rect}, ui::{
layout::simplified::{process_frame_event, run, show}, component::{Event, Label},
shape::{self, render_on_display}, display::{self, toif::Toif, Color, Icon, LOADER_MAX},
ui_bootloader::{BootloaderLayoutType, BootloaderUI}, geometry::{Alignment, Alignment2D, Offset, Point, Rect},
CommonUI, layout::simplified::{process_frame_event, run, show},
shape::{self, render_on_display},
ui_bootloader::{BootloaderLayoutType, BootloaderUI},
CommonUI,
},
}; };
use intro::Intro; use intro::Intro;
use menu::Menu; use menu::Menu;
@ -165,6 +169,8 @@ impl BootloaderLayoutType for BootloaderLayout {
} }
fn init_welcome() -> Self { fn init_welcome() -> Self {
// let the previous screen on for some time
time::sleep(Duration::from_millis(1000));
Self::Welcome(Welcome::new()) Self::Welcome(Welcome::new())
} }

8
core/embed/rust/src/ui/layout_caesar/bootloader/mod.rs
View File

@ -32,8 +32,10 @@ mod welcome;
mod connect; mod connect;
use crate::ui::{ use crate::{
component::Event, layout::simplified::process_frame_event, ui_bootloader::BootloaderUI, time::Duration,
trezorhal::time,
ui::{component::Event, layout::simplified::process_frame_event, ui_bootloader::BootloaderUI},
}; };
use connect::Connect; use connect::Connect;
use intro::Intro; use intro::Intro;
@ -115,6 +117,8 @@ impl BootloaderLayoutType for BootloaderLayout {
} }
fn init_welcome() -> Self { fn init_welcome() -> Self {
// let the previous screen on for some time
time::sleep(Duration::from_millis(1500));
Self::Welcome(Welcome::new()) Self::Welcome(Welcome::new())
} }

8
core/embed/rust/src/ui/layout_delizia/bootloader/mod.rs
View File

@ -41,7 +41,11 @@ use crate::ui::{
use ufmt::uwrite; use ufmt::uwrite;
use super::theme::bootloader::BLD_WARN_COLOR; use super::theme::bootloader::BLD_WARN_COLOR;
use crate::ui::{component::Event, layout::simplified::process_frame_event}; use crate::{
time::Duration,
trezorhal::time,
ui::{component::Event, layout::simplified::process_frame_event},
};
use connect::Connect; use connect::Connect;
use intro::Intro; use intro::Intro;
use menu::Menu; use menu::Menu;
@ -148,6 +152,8 @@ impl BootloaderLayoutType for BootloaderLayout {
} }
} }
fn init_welcome() -> Self { fn init_welcome() -> Self {
// let the previous screen on for some time
time::sleep(Duration::from_millis(1500));
Self::Welcome(Welcome::new()) Self::Welcome(Welcome::new())
} }

19
core/embed/rust/src/ui/layout_eckhart/ui_bootloader.rs
View File

@ -19,11 +19,11 @@ use super::{
BldActionBar, BldHeader, BldHeaderMsg, BldMenuScreen, BldTextScreen, BldWelcomeScreen, BldActionBar, BldHeader, BldHeaderMsg, BldMenuScreen, BldTextScreen, BldWelcomeScreen,
ConnectScreen, ConnectScreen,
}, },
component::{Button, WelcomeScreen}, component::Button,
cshape::{render_loader, ScreenBorder}, cshape::{render_loader, ScreenBorder},
fonts, fonts,
theme::{ theme::{
self, backlight, self,
bootloader::{ bootloader::{
button_cancel, button_confirm, button_wipe_confirm, BLD_BG, BLD_FG, button_cancel, button_confirm, button_wipe_confirm, BLD_BG, BLD_FG,
TEXT_FW_FINGERPRINT, TEXT_WARNING, WELCOME_COLOR, TEXT_FW_FINGERPRINT, TEXT_WARNING, WELCOME_COLOR,
@ -346,20 +346,7 @@ impl BootloaderUI for UIEckhart {
run(&mut screen) run(&mut screen)
} }
fn screen_boot_stage_1(fading: bool) { fn screen_boot_stage_1(_fading: bool) {}
if fading {
Self::fadeout();
}
let mut frame = WelcomeScreen::new();
show(&mut frame, false);
if fading {
Self::fadein();
} else {
display::set_backlight(backlight::get_backlight_normal());
}
}
fn screen_wipe_progress(progress: u16, initialize: bool) { fn screen_wipe_progress(progress: u16, initialize: bool) {
Self::screen_progress("Resetting Trezor", progress, initialize, theme::RED, None) Self::screen_progress("Resetting Trezor", progress, initialize, theme::RED, None)