1
0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-22 22:38:08 +00:00

fix(core): fixed unwanted delays in T2B1

[no changelog]
This commit is contained in:
tychovrahe 2023-08-17 13:42:22 +02:00 committed by matejcik
parent b151a3db6b
commit 90bdab6599
4 changed files with 11 additions and 10 deletions

View File

@ -307,6 +307,8 @@ int bootloader_main(void) {
display_reinit(); display_reinit();
ui_screen_boot_empty(false);
mpu_config_bootloader(); mpu_config_bootloader();
const image_header *hdr = NULL; const image_header *hdr = NULL;
@ -351,8 +353,6 @@ int bootloader_main(void) {
display_set_little_endian(); display_set_little_endian();
#endif #endif
ui_screen_boot_empty(false);
#ifdef USE_I2C #ifdef USE_I2C
i2c_init(); i2c_init();
#endif #endif
@ -426,7 +426,11 @@ int bootloader_main(void) {
ui_set_initial_setup(true); ui_set_initial_setup(true);
ui_screen_welcome_model(); ui_screen_welcome_model();
#ifndef USE_BACKLIGHT
hal_delay(1500);
#else
hal_delay(1000); hal_delay(1000);
#endif
ui_screen_welcome(); ui_screen_welcome();
// erase storage // erase storage

View File

@ -519,6 +519,7 @@ static void test_otp_write_device_variant(const char *args) {
#define BACKLIGHT_NORMAL 150 #define BACKLIGHT_NORMAL 150
int main(void) { int main(void) {
display_reinit();
display_orientation(0); display_orientation(0);
random_delays_init(); random_delays_init();
#ifdef USE_SD_CARD #ifdef USE_SD_CARD
@ -536,7 +537,6 @@ int main(void) {
#endif #endif
usb_init_all(); usb_init_all();
display_reinit();
display_clear(); display_clear();
draw_border(1, 3); draw_border(1, 3);

View File

@ -1,7 +1,7 @@
use crate::{ use crate::{
strutil::hexlify, strutil::hexlify,
time::Duration, time::Duration,
trezorhal::{io::io_button_read, time}, trezorhal::io::io_button_read,
ui::{ ui::{
component::{Component, Event, EventCtx, Label, LineBreaking::BreakWordsNoHyphen, Never}, component::{Component, Event, EventCtx, Label, LineBreaking::BreakWordsNoHyphen, Never},
constant::SCREEN, constant::SCREEN,
@ -320,7 +320,7 @@ extern "C" fn screen_wipe_fail() {
} }
#[no_mangle] #[no_mangle]
extern "C" fn screen_boot_empty(_firmware_present: bool) { extern "C" fn screen_boot_empty(_fading: bool) {
display::rect_fill(SCREEN, BLD_BG); display::rect_fill(SCREEN, BLD_BG);
LOGO_EMPTY.draw( LOGO_EMPTY.draw(
SCREEN.top_center() + Offset::y(11), SCREEN.top_center() + Offset::y(11),
@ -329,9 +329,6 @@ extern "C" fn screen_boot_empty(_firmware_present: bool) {
BLD_BG, BLD_BG,
); );
display::refresh(); display::refresh();
if !_firmware_present {
time::sleep(Duration::from_millis(1000));
}
} }
#[no_mangle] #[no_mangle]

View File

@ -228,9 +228,9 @@ void display_init(void) {
// Reset the LCD // Reset the LCD
HAL_GPIO_WritePin(OLED_RST_PORT, OLED_RST_PIN, GPIO_PIN_SET); HAL_GPIO_WritePin(OLED_RST_PORT, OLED_RST_PIN, GPIO_PIN_SET);
HAL_Delay(40); HAL_Delay(1);
HAL_GPIO_WritePin(OLED_RST_PORT, OLED_RST_PIN, GPIO_PIN_RESET); HAL_GPIO_WritePin(OLED_RST_PORT, OLED_RST_PIN, GPIO_PIN_RESET);
HAL_Delay(400); HAL_Delay(1);
HAL_GPIO_WritePin(OLED_RST_PORT, OLED_RST_PIN, GPIO_PIN_SET); HAL_GPIO_WritePin(OLED_RST_PORT, OLED_RST_PIN, GPIO_PIN_SET);
// init // init