arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-22 22:38:08 +00:00
Code Issues Releases Wiki Activity

fix(core/bootloader): fix T3B1 bootloader UI - unsafe screen, boot image

Browse Source
This commit is contained in:
tychovrahe 2024-08-30 09:21:23 +02:00 committed by TychoVrahe
parent c86dfaa007
commit 6caafd6642
6 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/SConscript.bootloader
View File

@ -261,6 +261,10 @@ def cargo_build():
features = ["model_mercury"] features = ["model_mercury"]
else: else:
features = ["model_tt"] features = ["model_tt"]
if TREZOR_MODEL in ("R",):
features.append("ui_empty_lock")
features.append("ui") features.append("ui")
features.append("bootloader") features.append("bootloader")
features.extend(FEATURES_AVAILABLE) features.extend(FEATURES_AVAILABLE)

3
core/SConscript.bootloader_emu
View File

@ -277,6 +277,9 @@ def cargo_build():
else: else:
features = ["model_tt"] features = ["model_tt"]
if TREZOR_MODEL in ("R",):
features.append("ui_empty_lock")
if NEW_RENDERING: if NEW_RENDERING:
features.append('new_rendering') features.append('new_rendering')

1
core/embed/bootloader/.changelog.d/4140.fixed Normal file
View File

@ -0,0 +1 @@
[T3B1] UI adjustments: fix icon on warning screen, replace empty logo with full during boot

4
core/embed/bootloader/bootui.c
View File

@ -52,7 +52,7 @@
#define COLOR_BL_GRAY COLOR_BL_FG #define COLOR_BL_GRAY COLOR_BL_FG
#endif #endif
#ifndef TREZOR_MODEL_R #if !defined TREZOR_MODEL_R && !defined TREZOR_MODEL_T3B1
#define BOOT_WAIT_HEIGHT 25 #define BOOT_WAIT_HEIGHT 25
#define BOOT_WAIT_Y_TOP (DISPLAY_RESY - BOOT_WAIT_HEIGHT) #define BOOT_WAIT_Y_TOP (DISPLAY_RESY - BOOT_WAIT_HEIGHT)
#else #else
@ -95,7 +95,7 @@ static void ui_screen_boot_old(const vendor_header *const vhdr,
display_bar(0, 0, DISPLAY_RESX, DISPLAY_RESY, boot_background); display_bar(0, 0, DISPLAY_RESX, DISPLAY_RESY, boot_background);
#ifndef TREZOR_MODEL_R #if !defined TREZOR_MODEL_R && !defined TREZOR_MODEL_T3B1
int image_top = show_string ? 30 : (DISPLAY_RESY - 120) / 2; int image_top = show_string ? 30 : (DISPLAY_RESY - 120) / 2;
// check whether vendor image is 120x120 // check whether vendor image is 120x120
if (memcmp(vimg, "TOIF\x78\x00\x78\x00", 8) == 0) { if (memcmp(vimg, "TOIF\x78\x00\x78\x00", 8) == 0) {

2
core/embed/rust/Cargo.toml
View File

@ -28,6 +28,7 @@ ui_jpeg_decoder = ["jpeg"]
ui_image_buffer = [] ui_image_buffer = []
ui_color_32bit = [] ui_color_32bit = []
ui_overlay = [] ui_overlay = []
ui_empty_lock = []
new_rendering = [] new_rendering = []
bootloader = [] bootloader = []
button = [] button = []
@ -64,6 +65,7 @@ test = [
"ui_blurring", "ui_blurring",
"ui_image_buffer", "ui_image_buffer",
"ui_overlay", "ui_overlay",
"ui_empty_lock",
"universal_fw", "universal_fw",
] ]
universal_fw = [] universal_fw = []

2
core/embed/rust/src/ui/model_tr/bootloader/mod.rs
View File

@ -321,7 +321,7 @@ impl UIFeaturesBootloader for ModelTRFeatures {
#[cfg(not(feature = "new_rendering"))] #[cfg(not(feature = "new_rendering"))]
display::rect_fill(SCREEN, BLD_BG); display::rect_fill(SCREEN, BLD_BG);
let mut frame = WelcomeScreen::new(true); let mut frame = WelcomeScreen::new(cfg!(ui_empty_lock));
show(&mut frame, false); show(&mut frame, false);
} }