diff --git a/embed/bootloader/bootui.c b/embed/bootloader/bootui.c index 657fe704..0bdbce89 100644 --- a/embed/bootloader/bootui.c +++ b/embed/bootloader/bootui.c @@ -15,6 +15,10 @@ #include "icon_install.h" #include "icon_wipe.h" +#include "icon_logo.h" +#include "icon_safeplace.h" +#include "icon_welcome.h" + #define BACKLIGHT_NORMAL 150 #define COLOR_BL_FAIL RGB16(0xFF, 0x00, 0x00) // red @@ -50,7 +54,6 @@ void ui_screen_boot(const vendor_header *vhdr, const image_header *hdr) (int)((fw_version >> 24) & 0xFF) ); display_text_center(DISPLAY_RESX / 2, DISPLAY_RESY - 25, ver_str, -1, FONT_NORMAL, COLOR_BL_GRAY, background, 0); - ui_fadein(); } void ui_screen_boot_wait(int delay) @@ -68,9 +71,26 @@ void ui_screen_boot_click(void) { // info UI +void ui_screen_first(void) +{ + display_icon(0, 0, 240, 240, toi_icon_logo + 12, sizeof(toi_icon_logo) - 12, COLOR_BLACK, COLOR_WHITE); +} + +void ui_screen_second(void) +{ + display_bar(0, 0, DISPLAY_RESX, DISPLAY_RESY, COLOR_WHITE); + display_icon((DISPLAY_RESX - 200) / 2, (DISPLAY_RESY - 60) / 2, 200, 60, toi_icon_safeplace + 12, sizeof(toi_icon_safeplace) - 12, COLOR_BLACK, COLOR_WHITE); +} + +void ui_screen_third(void) +{ + display_bar(0, 0, DISPLAY_RESX, DISPLAY_RESY, COLOR_WHITE); + display_icon((DISPLAY_RESX - 180) / 2, (DISPLAY_RESY - 30) / 2, 180, 30, toi_icon_welcome + 12, sizeof(toi_icon_welcome) - 12, COLOR_BLACK, COLOR_WHITE); + display_text_center(120, 213, "Open trezor.io/start", -1, FONT_NORMAL, COLOR_BLACK, COLOR_WHITE, 0); +} + void ui_screen_info(secbool buttons, const vendor_header * const vhdr, const image_header * const hdr) { - display_backlight(0); display_bar(0, 0, DISPLAY_RESX, DISPLAY_RESY, COLOR_WHITE); display_text(16, 32, "Bootloader mode", -1, FONT_NORMAL, COLOR_BLACK, COLOR_WHITE, 0); display_bar(16, 44, DISPLAY_RESX - 14 * 2, 1, COLOR_BLACK); @@ -103,9 +123,8 @@ void ui_screen_info(secbool buttons, const vendor_header * const vhdr, const ima display_bar_radius(123, 184, 108, 50, COLOR_BL_DONE, COLOR_WHITE, 4); display_icon(123 + (108 - 19) / 2, 184 + (50 - 16) / 2, 20, 16, toi_icon_confirm + 12, sizeof(toi_icon_confirm) - 12, COLOR_WHITE, COLOR_BL_DONE); } else { - display_text_center(120, 213, "Go to trezor.io/start", -1, FONT_NORMAL, COLOR_BLACK, COLOR_WHITE, 0); + display_text_center(120, 213, "Open trezor.io/start", -1, FONT_NORMAL, COLOR_BLACK, COLOR_WHITE, 0); } - ui_fadein(); } // install UI @@ -117,7 +136,7 @@ void ui_screen_install_confirm(void) display_bar(16, 44, DISPLAY_RESX - 14 * 2, 1, COLOR_BLACK); display_icon(16, 54, 32, 32, toi_icon_info + 12, sizeof(toi_icon_info) - 12, COLOR_BLACK, COLOR_WHITE); display_text(55, 70, "Do you want to", -1, FONT_NORMAL, COLOR_BLACK, COLOR_WHITE, 0); - display_text(55, 95, "update the firmware?", -1, FONT_NORMAL, COLOR_BLACK, COLOR_WHITE, 0); + display_text(55, 95, "update firmware?", -1, FONT_NORMAL, COLOR_BLACK, COLOR_WHITE, 0); display_bar_radius(9, 184, 108, 50, COLOR_BL_FAIL, COLOR_WHITE, 4); display_icon(9 + (108 - 16) / 2, 184 + (50 - 16) / 2, 16, 16, toi_icon_cancel + 12, sizeof(toi_icon_cancel) - 12, COLOR_WHITE, COLOR_BL_FAIL); diff --git a/embed/bootloader/bootui.h b/embed/bootloader/bootui.h index 0dd57648..7aaf8f9b 100644 --- a/embed/bootloader/bootui.h +++ b/embed/bootloader/bootui.h @@ -8,6 +8,9 @@ void ui_screen_boot(const vendor_header * const vhdr, const image_header * const void ui_screen_boot_wait(int delay); void ui_screen_boot_click(void); +void ui_screen_first(void); +void ui_screen_second(void); +void ui_screen_third(void); void ui_screen_info(secbool buttons, const vendor_header * const vhdr, const image_header * const hdr); void ui_screen_install_confirm(void); diff --git a/embed/bootloader/icon_logo.h b/embed/bootloader/icon_logo.h new file mode 100644 index 00000000..a12ffa2c --- /dev/null +++ b/embed/bootloader/icon_logo.h @@ -0,0 +1,10 @@ +static const uint8_t toi_icon_logo[] = { + // magic + 'T', 'O', 'I', 'g', + // width (16-bit), height (16-bit) + 0xf0, 0x00, 0xf0, 0x00, + // compressed data length (32-bit) + 0x85, 0x04, 0x00, 0x00, + // compressed data + 0xed, 0x92, 0xcf, 0x6b, 0x9c, 0x45, 0x18, 0xc7, 0x9f, 0xdd, 0x6c, 0x9a, 0x26, 0x8d, 0x66, 0xa1, 0x28, 0x22, 0xa6, 0x2e, 0x16, 0x34, 0x1e, 0x9a, 0xbe, 0xb2, 0x8a, 0x08, 0xd2, 0xa6, 0xb0, 0x17, 0x41, 0xe8, 0xf6, 0xa2, 0x07, 0x7f, 0x6c, 0xa1, 0x92, 0x83, 0x97, 0x6e, 0x0b, 0xda, 0x93, 0x66, 0x8d, 0x97, 0x78, 0xd1, 0x78, 0x10, 0x44, 0x90, 0xd4, 0xa6, 0xa0, 0xac, 0x48, 0x2a, 0xfd, 0x03, 0xd2, 0xe0, 0xcd, 0x5f, 0xa9, 0x42, 0x11, 0x7a, 0x79, 0x0b, 0x3d, 0x8a, 0xac, 0x64, 0x77, 0x6b, 0x6c, 0xde, 0xbc, 0xe3, 0xcc, 0x33, 0xf3, 0xbe, 0xef, 0xbe, 0x9b, 0x64, 0x59, 0xf7, 0x75, 0x67, 0x2b, 0x7c, 0x3f, 0x87, 0x9d, 0x67, 0x66, 0x9e, 0x9d, 0xcf, 0x3b, 0xf3, 0x3c, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xcf, 0x92, 0x1a, 0x88, 0xf5, 0xd9, 0x6f, 0x84, 0xb8, 0x79, 0xc6, 0xba, 0xf6, 0xd5, 0x9a, 0x90, 0xf8, 0x57, 0x2d, 0x6b, 0xc7, 0x84, 0xa1, 0x62, 0x55, 0x9b, 0x76, 0x03, 0xef, 0x56, 0xd6, 0xa6, 0xf7, 0x98, 0x08, 0xf9, 0xd5, 0x66, 0x27, 0xbb, 0x91, 0xd7, 0xcb, 0x0e, 0xa0, 0xba, 0x8a, 0xb2, 0x3d, 0x6f, 0x89, 0x2f, 0xfa, 0xe9, 0x07, 0x7c, 0xed, 0x0d, 0x7b, 0xde, 0x9a, 0xd4, 0x6d, 0x3b, 0x44, 0x19, 0x15, 0x78, 0xd6, 0xb4, 0x19, 0x75, 0xcd, 0x2b, 0x2a, 0x7a, 0x44, 0x45, 0x39, 0x5b, 0xde, 0x51, 0x75, 0x5d, 0x8e, 0xd2, 0x35, 0x9b, 0x05, 0x3e, 0x20, 0x65, 0xf5, 0xa8, 0xd2, 0x17, 0x6d, 0x79, 0x27, 0xa5, 0xec, 0xba, 0x0e, 0x27, 0x64, 0x78, 0xcd, 0x96, 0xf7, 0x88, 0x94, 0x2d, 0xea, 0x70, 0x5c, 0x86, 0x6b, 0xb6, 0xbc, 0xd3, 0x52, 0x56, 0x89, 0x9e, 0x1c, 0xde, 0x3e, 0xd6, 0xd7, 0xba, 0xf7, 0x60, 0xa1, 0xf0, 0xba, 0x94, 0x2d, 0x17, 0x98, 0xe7, 0x65, 0x78, 0xa3, 0x50, 0x70, 0xfa, 0xef, 0x2d, 0x89, 0x5d, 0xa8, 0x0f, 0xc8, 0x7b, 0x1b, 0x5e, 0x78, 0xff, 0xbf, 0xde, 0xbb, 0x17, 0x5a, 0x58, 0xb5, 0xe7, 0x6d, 0xb4, 0x2e, 0xcc, 0xc1, 0x0b, 0x2f, 0xbc, 0xf0, 0xc2, 0x0b, 0x2f, 0xbc, 0xf0, 0xfe, 0xf7, 0xde, 0xe6, 0x80, 0xbc, 0xde, 0xa9, 0x68, 0xfe, 0xb8, 0x6b, 0xcf, 0x2b, 0xb6, 0xdf, 0x0b, 0xa6, 0x4f, 0x2a, 0xad, 0x35, 0xaf, 0x10, 0x15, 0x3d, 0x7b, 0x58, 0xcf, 0xec, 0x79, 0xc5, 0xbc, 0x9a, 0x3c, 0x27, 0xac, 0x7b, 0xfd, 0xcb, 0x44, 0xaf, 0x98, 0x58, 0xd4, 0xfb, 0xef, 0x3d, 0x12, 0xb8, 0xc4, 0x77, 0xaf, 0x85, 0xe1, 0xb7, 0xfd, 0xf7, 0xd2, 0x8b, 0xa2, 0x1d, 0xff, 0x2a, 0xd9, 0xe0, 0x85, 0x76, 0xed, 0xfb, 0x64, 0x87, 0xa9, 0xb8, 0xf7, 0x1c, 0xd9, 0x62, 0xb4, 0xf5, 0xb6, 0x65, 0xb2, 0xc7, 0x43, 0x6e, 0xa0, 0xf5, 0xce, 0x91, 0x4d, 0x1e, 0x30, 0xe2, 0xad, 0x13, 0x64, 0x97, 0x0c, 0x8b, 0x3d, 0x87, 0x6c, 0x33, 0xbc, 0x2a, 0xc4, 0xef, 0x33, 0x64, 0x9f, 0xa1, 0xa5, 0x4d, 0x87, 0x06, 0x41, 0x8a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb8, 0x87, 0xd8, 0x77, 0x21, 0xe2, 0x3c, 0x3d, 0x61, 0xa2, 0x53, 0xbc, 0x17, 0xed, 0xbc, 0xd5, 0x9a, 0xf7, 0x36, 0x6f, 0x66, 0x3e, 0x17, 0xe2, 0x66, 0x51, 0x1f, 0xf2, 0xb2, 0xd9, 0x70, 0xba, 0xf7, 0xde, 0x27, 0x22, 0x1a, 0x74, 0x32, 0x08, 0x7f, 0xcb, 0xca, 0xbd, 0x68, 0xc7, 0xa3, 0x43, 0xd1, 0xc4, 0x57, 0xff, 0x9b, 0xd2, 0xf1, 0x32, 0x1f, 0xb2, 0x1e, 0x6c, 0x2d, 0x77, 0xed, 0x1d, 0xdf, 0xdd, 0x2b, 0x6e, 0x74, 0xf6, 0xee, 0x0f, 0x26, 0x97, 0xd4, 0x21, 0xab, 0xe1, 0xde, 0x17, 0x49, 0xbd, 0xa2, 0xdc, 0xc9, 0x9b, 0x72, 0xc3, 0x49, 0x31, 0xe6, 0xf5, 0xb3, 0x49, 0xbd, 0x8d, 0x4e, 0xde, 0xa3, 0xd1, 0xac, 0x19, 0xf3, 0x8a, 0x6b, 0x49, 0xbd, 0x5e, 0x76, 0x6f, 0x6f, 0x74, 0x5d, 0xc9, 0x4c, 0xcc, 0xdb, 0x4c, 0xd6, 0x57, 0x7c, 0xde, 0x1e, 0x5e, 0x8f, 0xc6, 0x5a, 0xd2, 0xc4, 0xad, 0x98, 0xd7, 0xeb, 0xd2, 0x3b, 0xb2, 0xb0, 0xb0, 0xf0, 0xa1, 0xcc, 0xdf, 0x94, 0xe3, 0x3c, 0x7b, 0x3f, 0x99, 0x9d, 0x7d, 0x47, 0x9d, 0xb0, 0xa8, 0xbc, 0xfe, 0x4b, 0xb3, 0x8a, 0x37, 0x38, 0x4f, 0x67, 0x8a, 0x3f, 0xf5, 0xe7, 0x6d, 0x3a, 0xe9, 0x77, 0xd5, 0xb8, 0xa5, 0xbd, 0x32, 0x71, 0x49, 0x4d, 0xb3, 0x5d, 0xb7, 0x34, 0x1d, 0xe0, 0xc3, 0x14, 0xea, 0x40, 0xd5, 0x28, 0x73, 0x5c, 0x29, 0xf9, 0xb3, 0x1d, 0xcf, 0x2c, 0xe9, 0x87, 0xa8, 0xc9, 0xdf, 0xbf, 0xc9, 0xe4, 0x09, 0x87, 0xbd, 0x64, 0xba, 0xad, 0xd8, 0xab, 0xf7, 0xb4, 0x1c, 0x27, 0xf9, 0xfd, 0x76, 0x78, 0x87, 0x94, 0x70, 0x93, 0x86, 0x95, 0xad, 0xa2, 0x16, 0x86, 0xf5, 0xc3, 0x18, 0x2f, 0x9d, 0x95, 0x63, 0x39, 0x89, 0x57, 0xaf, 0xec, 0xf0, 0xaa, 0x65, 0x71, 0x9d, 0x07, 0xb3, 0xf1, 0x91, 0x0c, 0xd7, 0x42, 0x6f, 0x29, 0xf8, 0x9e, 0xc4, 0xf7, 0xf5, 0x0f, 0xe7, 0x15, 0x4f, 0xe9, 0x44, 0x7e, 0xd6, 0x1c, 0xef, 0xd6, 0xf5, 0xca, 0xfd, 0x32, 0xdc, 0x08, 0xbd, 0x73, 0x49, 0xee, 0x2b, 0x0b, 0x94, 0x5a, 0x09, 0xea, 0x6b, 0xb8, 0x43, 0xe1, 0xab, 0x36, 0x88, 0x8e, 0xe9, 0x2e, 0x56, 0xec, 0x97, 0x61, 0x33, 0xf0, 0x66, 0x6a, 0x5c, 0xfd, 0x1e, 0xbd, 0xdf, 0x57, 0xab, 0x3f, 0xeb, 0x02, 0xb6, 0x7b, 0xa7, 0x4d, 0x5d, 0x4f, 0x72, 0x51, 0xc3, 0x4f, 0xf9, 0x8b, 0xbd, 0xd5, 0xea, 0xd7, 0x6e, 0xa2, 0x7e, 0x0e, 0x70, 0x76, 0x78, 0xd5, 0xf1, 0x5e, 0x56, 0x97, 0xd1, 0x3c, 0x67, 0x86, 0x3b, 0x7b, 0x35, 0xca, 0xdc, 0xa2, 0x84, 0x5e, 0x79, 0x40, 0x9b, 0x77, 0x44, 0x98, 0xba, 0x96, 0x4c, 0x17, 0xa8, 0x0e, 0x6f, 0xf7, 0x36, 0x92, 0x7a, 0x37, 0x76, 0x78, 0x79, 0xb3, 0x48, 0x9d, 0xef, 0xbb, 0x98, 0xd4, 0x9b, 0x6b, 0xf7, 0xa6, 0x04, 0x3b, 0x4c, 0xd6, 0xc5, 0xf6, 0xfa, 0xfe, 0xfb, 0x67, 0xde, 0xcd, 0xeb, 0x5f, 0x22, 0xed, 0xfd, 0xac, 0xaa, 0xb8, 0x6c, 0xb2, 0xc4, 0x2f, 0x2a, 0xab, 0xa5, 0x9f, 0x47, 0xf9, 0x69, 0x43, 0xef, 0x76, 0x39, 0xa1, 0x97, 0xbf, 0x5b, 0x1d, 0x14, 0x65, 0xcd, 0xe9, 0x66, 0x93, 0x4c, 0xca, 0xa0, 0xa9, 0x17, 0x27, 0xb8, 0x22, 0xa1, 0xb7, 0x4e, 0xbd, 0x7b, 0xcf, 0x4f, 0xa9, 0xfb, 0xe6, 0xda, 0xbd, 0x69, 0xc1, 0x4f, 0x1a, 0xe4, 0xfb, 0x7a, 0x75, 0x45, 0x86, 0x6b, 0xec, 0x7d, 0x6c, 0x3a, 0x28, 0x43, 0x8f, 0xde, 0x22, 0xd5, 0x4c, 0x7f, 0xc4, 0xbc, 0x87, 0x44, 0x58, 0xd5, 0xe1, 0x30, 0xdc, 0xa7, 0xa2, 0x0a, 0x7b, 0xb9, 0xc5, 0x7c, 0xa7, 0x77, 0xef, 0x69, 0x3a, 0x6e, 0x5e, 0x2c, 0xe6, 0x55, 0x67, 0x7b, 0x26, 0x76, 0x55, 0x25, 0xa4, 0x22, 0xb5, 0xa4, 0x3b, 0x90, 0xbd, 0xfc, 0x7b, 0x25, 0x89, 0x77, 0xcc, 0x08, 0xd5, 0xa1, 0xdc, 0x56, 0xd5, 0xaf, 0xf4, 0xcd, 0xfc, 0x1f, 0x15, 0x3f, 0xf0, 0x87, 0x09, 0xef, 0xcc, 0x33, 0x2b, 0xa6, 0xc5, 0xb5, 0xf7, 0x78, 0x54, 0xf6, 0xde, 0xbc, 0x43, 0x82, 0x07, 0x12, 0x21, 0x9e, 0x7e, 0x66, 0xd3, 0xeb, 0xdc, 0xc5, 0x21, 0xb7, 0x02, 0xaf, 0xfa, 0x5c, 0x91, 0xc4, 0xcb, 0xdd, 0xb2, 0xd1, 0xc1, 0x9b, 0x5a, 0x6f, 0x99, 0xe5, 0x02, 0x2f, 0x7f, 0xee, 0x62, 0x12, 0xef, 0x51, 0xfd, 0x7c, 0x7b, 0x7a, 0x5b, 0x67, 0x0d, 0x0a, 0xbc, 0xfc, 0xb9, 0xb7, 0x93, 0x78, 0xf9, 0x1d, 0x9d, 0x0e, 0x5e, 0x0a, 0x2f, 0xcc, 0x1d, 0x6c, 0xbc, 0x13, 0x72, 0xb8, 0x9b, 0xc4, 0x4b, 0x35, 0x6e, 0xcd, 0x0e, 0xde, 0x11, 0xd7, 0xc4, 0x1f, 0x53, 0xe4, 0xe5, 0xde, 0x9b, 0xe9, 0xde, 0x3b, 0x1e, 0x7a, 0x4b, 0xc6, 0x7b, 0x56, 0x8e, 0x77, 0x62, 0xde, 0x47, 0xe3, 0x5e, 0x7a, 0x90, 0xc5, 0xfe, 0x3c, 0xff, 0x6d, 0x5d, 0x7b, 0x53, 0x6e, 0x78, 0x50, 0x57, 0xa4, 0xf3, 0xf9, 0xbc, 0xfe, 0xcc, 0x83, 0xf9, 0xfc, 0xd3, 0x59, 0x39, 0x0e, 0xc9, 0x95, 0x3c, 0xe5, 0x23, 0xf4, 0x4a, 0x30, 0x51, 0xa4, 0xde, 0xfc, 0xe9, 0x8f, 0x2f, 0x73, 0xfa, 0x80, 0xc3, 0x66, 0x51, 0x8d, 0x27, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x9f, 0xf9, 0x07, +}; diff --git a/embed/bootloader/icon_safeplace.h b/embed/bootloader/icon_safeplace.h new file mode 100644 index 00000000..f5142399 --- /dev/null +++ b/embed/bootloader/icon_safeplace.h @@ -0,0 +1,10 @@ +static const uint8_t toi_icon_safeplace[] = { + // magic + 'T', 'O', 'I', 'g', + // width (16-bit), height (16-bit) + 0xc8, 0x00, 0x3c, 0x00, + // compressed data length (32-bit) + 0xc2, 0x04, 0x00, 0x00, + // compressed data + 0xed, 0x92, 0x4f, 0x68, 0x1b, 0x47, 0x14, 0xc6, 0x47, 0xf6, 0xca, 0x92, 0x65, 0x5b, 0xd2, 0xb1, 0x81, 0x86, 0x88, 0x6d, 0x2f, 0x39, 0xc9, 0x04, 0xd4, 0x34, 0x50, 0xb0, 0x8a, 0x73, 0x2c, 0xb1, 0xa0, 0x47, 0xc7, 0xd8, 0xf7, 0x42, 0xec, 0x42, 0x8f, 0xa5, 0x56, 0x4b, 0x8f, 0xa1, 0x76, 0xeb, 0x73, 0xb1, 0xce, 0x39, 0xd8, 0xa2, 0xa4, 0x50, 0x28, 0xc4, 0x81, 0x86, 0x36, 0x97, 0x46, 0x3a, 0x34, 0xe0, 0x1e, 0xd2, 0x15, 0xc1, 0x04, 0x42, 0xda, 0xac, 0x6c, 0x13, 0xd9, 0xb1, 0xfe, 0x7c, 0x79, 0x6f, 0x76, 0x46, 0x3b, 0xf2, 0xca, 0x8a, 0x1b, 0x57, 0xbe, 0xd4, 0x0f, 0xa4, 0xd9, 0x7d, 0xef, 0x9b, 0xf7, 0xdb, 0x99, 0xf7, 0x09, 0xe1, 0x47, 0x02, 0x55, 0xf1, 0xba, 0x98, 0x76, 0x9f, 0x74, 0x4b, 0x03, 0xbd, 0xb7, 0x25, 0xe0, 0x45, 0xf5, 0x18, 0x8c, 0x18, 0xb0, 0xdf, 0x6f, 0xc6, 0xfc, 0x29, 0x30, 0x4a, 0xb8, 0x7d, 0xe9, 0x4d, 0x18, 0x03, 0xb6, 0x9d, 0xc6, 0x8e, 0x6d, 0xa7, 0x8e, 0xc1, 0x70, 0x91, 0x14, 0x6f, 0xc2, 0x68, 0x4f, 0xfb, 0x18, 0x8c, 0xa3, 0x7a, 0xfd, 0x1b, 0xc6, 0x75, 0xfc, 0x4a, 0x0f, 0x43, 0x77, 0x5a, 0x3f, 0xaa, 0xca, 0x45, 0xa7, 0xf5, 0x1b, 0x7d, 0x7a, 0xe8, 0x73, 0xb7, 0xf1, 0x25, 0xb7, 0x02, 0x2b, 0x3f, 0x71, 0x9f, 0xe5, 0x54, 0xef, 0xfa, 0x39, 0xf7, 0x69, 0xd2, 0x63, 0x28, 0x8d, 0xb0, 0xd6, 0xb0, 0xc9, 0xa7, 0xf5, 0x55, 0x1d, 0x8c, 0x03, 0xea, 0x51, 0x14, 0x21, 0x47, 0x2e, 0x1c, 0x11, 0xee, 0xba, 0x25, 0xc4, 0x35, 0x5e, 0xe7, 0x14, 0xe3, 0x3c, 0xfd, 0xd7, 0x15, 0xa3, 0xe5, 0x02, 0x8f, 0x3d, 0x86, 0xd2, 0x88, 0x55, 0x6f, 0x8b, 0xa1, 0xea, 0x60, 0x70, 0xbc, 0x10, 0x63, 0xbc, 0xbc, 0x94, 0x85, 0x59, 0x99, 0x4a, 0x0d, 0xca, 0x65, 0x57, 0x31, 0xf8, 0x13, 0xb0, 0xac, 0xee, 0x88, 0xa2, 0x29, 0x19, 0x5a, 0x13, 0xf5, 0xb6, 0x98, 0xaa, 0x0e, 0x46, 0xf3, 0xe3, 0x19, 0x62, 0xaf, 0xe2, 0xe1, 0x7b, 0x2e, 0xa9, 0xa4, 0x8f, 0xee, 0x65, 0x1c, 0x14, 0x46, 0x50, 0x9f, 0x9c, 0xc1, 0x81, 0xb0, 0x01, 0x3b, 0x35, 0x4c, 0xb2, 0x1b, 0xd8, 0x51, 0x8c, 0x7b, 0x97, 0x81, 0x1c, 0x33, 0xb4, 0x26, 0x8d, 0x5a, 0xc6, 0xc5, 0xb2, 0xa9, 0xea, 0x60, 0x6c, 0xd3, 0xd7, 0xb4, 0x68, 0x43, 0x52, 0x4c, 0x21, 0xaf, 0x7d, 0x94, 0x46, 0x25, 0xf6, 0x73, 0x51, 0x0c, 0x50, 0x45, 0xde, 0x09, 0xcb, 0x2c, 0xec, 0x2b, 0x46, 0x52, 0x2c, 0xa1, 0xc0, 0x79, 0xad, 0x59, 0xc2, 0x02, 0xed, 0xae, 0x98, 0xaa, 0xc3, 0xbe, 0x02, 0x2c, 0xd4, 0x6d, 0x7b, 0x02, 0x77, 0xbd, 0x73, 0xe4, 0x95, 0x24, 0x64, 0x73, 0x7f, 0xfe, 0x4d, 0xe1, 0x07, 0xfb, 0x1d, 0x34, 0xda, 0x7e, 0x9a, 0x40, 0x59, 0xf9, 0x4a, 0x6a, 0x1c, 0xba, 0x81, 0xd8, 0xad, 0x82, 0xa9, 0x0a, 0x32, 0x86, 0xe4, 0x85, 0xa2, 0xc2, 0x85, 0x29, 0xe0, 0xa7, 0xac, 0xe7, 0x15, 0x68, 0xc6, 0xbc, 0x2c, 0xb7, 0xda, 0x0c, 0xde, 0xc6, 0xab, 0xd2, 0x28, 0x1b, 0x9b, 0xaa, 0x20, 0x23, 0xe2, 0x31, 0x38, 0x23, 0x06, 0x4b, 0xf4, 0xf4, 0x9d, 0xe7, 0x15, 0xcd, 0x58, 0x84, 0x7a, 0x39, 0xc4, 0x50, 0x1a, 0x55, 0x31, 0x55, 0xbd, 0x19, 0x62, 0xf0, 0x26, 0x3d, 0x8e, 0x47, 0xd0, 0xfc, 0x50, 0xbc, 0x86, 0xa1, 0x35, 0xc7, 0x62, 0x84, 0xc9, 0x1c, 0x46, 0x58, 0x25, 0x14, 0xc7, 0xd8, 0x20, 0x9a, 0x31, 0x4b, 0x33, 0xd6, 0x61, 0xcc, 0x43, 0x6b, 0x78, 0x1e, 0xd6, 0xd5, 0xac, 0xa9, 0x0a, 0x32, 0x42, 0xf4, 0xe1, 0x42, 0xcc, 0xc9, 0xc2, 0xef, 0x8f, 0x84, 0xb8, 0xc0, 0x26, 0xa9, 0x92, 0x67, 0x14, 0xe3, 0x02, 0x76, 0x85, 0x18, 0x12, 0x86, 0xaf, 0x96, 0x39, 0xaf, 0x35, 0xec, 0x2b, 0xb2, 0xa2, 0xa9, 0x0a, 0x32, 0xe8, 0x62, 0xf7, 0x26, 0xaf, 0xd7, 0x65, 0x61, 0x83, 0x7c, 0x35, 0x8b, 0x72, 0x1c, 0xf5, 0xc9, 0x2f, 0x34, 0x63, 0x18, 0xf8, 0x2c, 0x53, 0x2a, 0x2a, 0xc6, 0x1f, 0x97, 0x81, 0x2c, 0xe7, 0xb5, 0x26, 0x8d, 0x5a, 0xc6, 0x41, 0xc1, 0x54, 0x75, 0x61, 0x9c, 0x97, 0x37, 0x99, 0xe3, 0xc2, 0x04, 0xf0, 0x17, 0x30, 0x17, 0x85, 0x31, 0xf3, 0x90, 0xc3, 0xcf, 0x2f, 0x14, 0x83, 0xa2, 0x21, 0xf3, 0x5a, 0xe3, 0xad, 0x29, 0x53, 0xd5, 0x85, 0x11, 0x62, 0x33, 0xed, 0x79, 0xc3, 0x70, 0xe9, 0x71, 0x9f, 0xcf, 0x83, 0x96, 0x4b, 0xf7, 0x22, 0x87, 0xf8, 0x36, 0xef, 0x5e, 0x50, 0x0c, 0x6a, 0xf5, 0xd8, 0x63, 0x6b, 0xcd, 0x3a, 0x55, 0xb7, 0x3a, 0x54, 0x5d, 0x18, 0x22, 0x7c, 0xa7, 0xb5, 0x99, 0xf2, 0x2a, 0x6f, 0x3d, 0xc0, 0x9f, 0x34, 0x9d, 0xa1, 0x52, 0xeb, 0xdb, 0x55, 0x3a, 0x9a, 0x67, 0x94, 0x69, 0xf7, 0x9f, 0xaf, 0xf4, 0x3c, 0xce, 0xb9, 0x4f, 0x93, 0xde, 0x2e, 0xad, 0xb1, 0xd6, 0x70, 0x3f, 0xd9, 0xa1, 0x3a, 0x59, 0x98, 0xe6, 0xec, 0x57, 0x9c, 0x31, 0xfe, 0x7f, 0x8c, 0xb3, 0x38, 0x8b, 0x9e, 0x31, 0xed, 0x3e, 0x39, 0x69, 0x8b, 0xf0, 0xf3, 0x5c, 0xcf, 0x7a, 0x0c, 0xd8, 0x3f, 0x29, 0x23, 0x8e, 0x4a, 0xcf, 0xfa, 0xfc, 0x29, 0x30, 0x4a, 0xb8, 0x7d, 0xa9, 0xdf, 0x77, 0xe5, 0x22, 0xd9, 0xf7, 0x91, 0x03, 0xa7, 0x80, 0x00, 0xaa, 0x42, 0x5c, 0x74, 0x9a, 0x2b, 0xf2, 0x2d, 0xea, 0xe6, 0xe5, 0x90, 0xca, 0xfc, 0x32, 0xae, 0xf2, 0x09, 0x96, 0xd0, 0xc7, 0xd0, 0xfa, 0x8d, 0x37, 0x3c, 0x6b, 0x0d, 0x9b, 0x7c, 0x7e, 0xbf, 0x8e, 0xfa, 0xd0, 0x83, 0x26, 0xed, 0x1d, 0xf8, 0x1e, 0x7f, 0x7f, 0xda, 0x8d, 0x11, 0xe1, 0x25, 0xcf, 0x6f, 0x1b, 0xbc, 0xd0, 0xa6, 0x1d, 0x61, 0xa1, 0xa5, 0xf3, 0x3e, 0xa3, 0xae, 0x0c, 0xb2, 0x4a, 0xf9, 0x2d, 0x61, 0xd6, 0xd1, 0xdc, 0x00, 0x1a, 0x42, 0x2c, 0x52, 0xa6, 0x95, 0xed, 0xc2, 0xe0, 0x02, 0xf6, 0xbc, 0x37, 0x66, 0x8c, 0xa0, 0x26, 0xa2, 0xd4, 0x4e, 0xe5, 0x7d, 0x86, 0x32, 0x61, 0x94, 0xf3, 0x48, 0x99, 0x75, 0x99, 0xc1, 0x5c, 0x58, 0x2e, 0x3b, 0x1d, 0x0c, 0x1b, 0xb0, 0x53, 0x21, 0x60, 0xe5, 0x0a, 0x68, 0xf8, 0x9a, 0x11, 0x46, 0x5d, 0x8c, 0x61, 0x57, 0xe7, 0x03, 0x8c, 0x34, 0x6a, 0x19, 0x17, 0xcb, 0x66, 0x1d, 0x78, 0x98, 0x71, 0x50, 0x1c, 0x45, 0x63, 0x72, 0x06, 0x07, 0xc1, 0x99, 0x47, 0x39, 0xb9, 0x4e, 0xdd, 0x81, 0x5f, 0xda, 0xd9, 0x34, 0xca, 0x3a, 0xef, 0x33, 0x1a, 0xe3, 0xb2, 0xbc, 0x84, 0x05, 0x31, 0x85, 0x8a, 0x59, 0xe7, 0x4f, 0x9c, 0x40, 0x25, 0x8e, 0x6d, 0x31, 0x40, 0xb7, 0x1c, 0x60, 0x8c, 0x62, 0x57, 0x90, 0xe0, 0xae, 0x14, 0xca, 0x58, 0x47, 0x6e, 0x1e, 0x79, 0x9d, 0xf7, 0x19, 0xdb, 0x5e, 0xd9, 0xa1, 0x7b, 0x8a, 0xdd, 0x2a, 0x98, 0x75, 0xee, 0x43, 0xeb, 0xa8, 0x1a, 0x58, 0x80, 0x11, 0xe7, 0x1e, 0x09, 0x54, 0x7c, 0x23, 0xcf, 0x62, 0x79, 0x03, 0x29, 0x9d, 0x37, 0x7c, 0xd5, 0x61, 0x78, 0xb3, 0xae, 0x18, 0x16, 0x50, 0xff, 0xba, 0x1b, 0x23, 0xe1, 0x69, 0xab, 0x3e, 0x83, 0x36, 0xa2, 0xd9, 0xce, 0x1f, 0xc5, 0x30, 0xeb, 0xba, 0xcf, 0x07, 0x34, 0xb3, 0x97, 0xa9, 0x23, 0x19, 0xc6, 0x39, 0x62, 0xd8, 0xd3, 0x7e, 0xea, 0x71, 0x8e, 0x44, 0xf0, 0x1c, 0x42, 0xbc, 0x5f, 0x02, 0x5f, 0x61, 0x8f, 0x79, 0xa8, 0xac, 0x25, 0x0d, 0x18, 0x9c, 0x47, 0xd5, 0x9f, 0x87, 0x75, 0x35, 0xdb, 0x65, 0x1e, 0x5c, 0xfd, 0x88, 0x5c, 0xd9, 0xcb, 0x57, 0x3a, 0xed, 0x82, 0x90, 0xbe, 0x6f, 0xd8, 0x2c, 0x06, 0x83, 0x7d, 0x95, 0x3e, 0xec, 0x2b, 0x6f, 0xe6, 0x8f, 0xca, 0x22, 0xd4, 0xcd, 0x57, 0xda, 0xe7, 0x06, 0x63, 0x15, 0xd4, 0x46, 0xe7, 0xd9, 0xf4, 0x37, 0x4c, 0x46, 0x1a, 0xb5, 0x8c, 0x83, 0x82, 0xae, 0x1b, 0x8c, 0x11, 0xf2, 0x55, 0x98, 0x46, 0x19, 0x7e, 0x9e, 0xed, 0x64, 0x88, 0x45, 0xba, 0x1a, 0xba, 0x7f, 0x83, 0x31, 0x25, 0x6d, 0xac, 0xf2, 0x11, 0xc8, 0xf0, 0x19, 0x51, 0xf9, 0x9e, 0xd2, 0x75, 0x83, 0x31, 0x08, 0x34, 0x5d, 0xd4, 0xc8, 0x72, 0xe5, 0x43, 0x0c, 0xb9, 0x27, 0x6f, 0x32, 0xe2, 0x68, 0x18, 0xf9, 0x92, 0xdc, 0xe9, 0x33, 0xe8, 0x82, 0x80, 0xad, 0x76, 0xdd, 0x9c, 0xc7, 0x35, 0x2f, 0x15, 0x64, 0x88, 0x2b, 0x4e, 0x73, 0x45, 0x98, 0x8c, 0x61, 0xfa, 0x16, 0x3f, 0x1f, 0x29, 0x35, 0xf3, 0x25, 0x93, 0x61, 0xad, 0xe1, 0x7e, 0xb2, 0x5d, 0x37, 0x19, 0xa1, 0x9b, 0x2e, 0xa7, 0x3a, 0xee, 0xea, 0x88, 0x88, 0xd2, 0x98, 0xfb, 0x1d, 0x71, 0x14, 0xfb, 0x8d, 0x78, 0x77, 0x03, 0xb9, 0x7e, 0x33, 0x68, 0xc6, 0xa2, 0xff, 0x8c, 0xdd, 0xbe, 0x33, 0x9c, 0x67, 0xe3, 0xff, 0x45, 0x9b, 0x57, +}; diff --git a/embed/bootloader/icon_welcome.h b/embed/bootloader/icon_welcome.h new file mode 100644 index 00000000..0ec1a0d2 --- /dev/null +++ b/embed/bootloader/icon_welcome.h @@ -0,0 +1,10 @@ +static const uint8_t toi_icon_welcome[] = { + // magic + 'T', 'O', 'I', 'g', + // width (16-bit), height (16-bit) + 0xb4, 0x00, 0x1e, 0x00, + // compressed data length (32-bit) + 0x31, 0x03, 0x00, 0x00, + // compressed data + 0xc5, 0x52, 0x3d, 0x53, 0x13, 0x51, 0x14, 0xbd, 0x01, 0x24, 0x42, 0x20, 0xa1, 0x56, 0x07, 0xe8, 0x9c, 0xf1, 0x63, 0x42, 0xa9, 0x33, 0xce, 0x40, 0x8b, 0x85, 0xf0, 0x0f, 0x42, 0x45, 0x9b, 0xd8, 0x21, 0xe3, 0x0c, 0x58, 0x51, 0x39, 0xa1, 0xb3, 0x33, 0xf9, 0x07, 0xf1, 0x17, 0x88, 0x76, 0xb1, 0x11, 0x28, 0x2c, 0x6c, 0x08, 0xd2, 0xa1, 0x33, 0x2e, 0x10, 0x3e, 0x43, 0xd8, 0xe3, 0xb9, 0xf7, 0x6d, 0x36, 0x9b, 0x05, 0x66, 0x1c, 0xc9, 0x8c, 0xb7, 0xd8, 0xbd, 0xef, 0xbd, 0x7b, 0xce, 0xbb, 0xef, 0xdc, 0x23, 0xf2, 0x9f, 0x02, 0x38, 0xba, 0x09, 0x7c, 0x12, 0x98, 0xe2, 0x6f, 0x1d, 0x07, 0xfc, 0x66, 0x80, 0xe5, 0x9b, 0x31, 0x47, 0x30, 0x24, 0x2b, 0x84, 0x3b, 0x59, 0x60, 0xb6, 0x6b, 0xcc, 0x43, 0x40, 0x59, 0xa4, 0x0f, 0x38, 0xe3, 0x22, 0x07, 0x8c, 0x74, 0x8d, 0x79, 0x00, 0xd8, 0x10, 0x49, 0x02, 0x4d, 0x2e, 0x8a, 0xf0, 0xa5, 0x6b, 0xcc, 0xfd, 0xc0, 0x9e, 0x48, 0x0a, 0x00, 0x17, 0x6b, 0x68, 0x74, 0x8f, 0xb9, 0x07, 0xa8, 0x8b, 0xa4, 0xc9, 0x3c, 0x21, 0xe2, 0xe1, 0xa4, 0x7b, 0xcc, 0xcc, 0x8f, 0x6d, 0x74, 0x1c, 0x64, 0xc2, 0x6e, 0xe9, 0x1a, 0xf3, 0x9a, 0xce, 0x8e, 0xa3, 0xc3, 0x07, 0x9d, 0x23, 0x95, 0x91, 0x27, 0x5f, 0xfd, 0xea, 0x44, 0xbb, 0x6a, 0x7a, 0xcb, 0xff, 0x32, 0x61, 0xa5, 0x3c, 0xb0, 0x8c, 0x7e, 0x1a, 0x79, 0x5e, 0xbb, 0x78, 0x23, 0x89, 0xd7, 0xde, 0xcf, 0xf0, 0x28, 0x8a, 0xb1, 0x28, 0xea, 0xec, 0x4a, 0x64, 0xde, 0xd6, 0x39, 0x72, 0x9a, 0x77, 0x98, 0x9b, 0xde, 0xae, 0xea, 0x91, 0x2d, 0xd5, 0x32, 0x77, 0x35, 0x3b, 0x1f, 0x31, 0xe6, 0x07, 0x4c, 0xfd, 0x09, 0x6d, 0xe8, 0x54, 0x49, 0x62, 0x18, 0x17, 0x33, 0x3a, 0xbb, 0x1a, 0x6a, 0x38, 0x90, 0x41, 0x60, 0x55, 0x12, 0x35, 0xad, 0xc2, 0xe7, 0xa0, 0xaa, 0xd7, 0xb3, 0xe5, 0x26, 0x27, 0xe2, 0xb2, 0x1d, 0x63, 0xb6, 0xfc, 0x9b, 0x6d, 0xcc, 0x49, 0x1c, 0x13, 0xc4, 0x18, 0x30, 0xce, 0x8d, 0x3c, 0xb7, 0x86, 0xb5, 0x6c, 0xd8, 0x8a, 0xb4, 0x01, 0xab, 0x1a, 0x75, 0xcb, 0x73, 0x69, 0x1d, 0x5c, 0x18, 0x73, 0x24, 0xb6, 0x25, 0x8e, 0x09, 0x82, 0xb6, 0x98, 0xa5, 0xc0, 0x8f, 0x29, 0x77, 0x46, 0x2f, 0x29, 0x02, 0xbb, 0x0b, 0x9e, 0x5a, 0xc5, 0xaa, 0xa8, 0x53, 0x75, 0x91, 0xa8, 0x29, 0xcd, 0x76, 0x5f, 0x79, 0xfa, 0x2c, 0x65, 0x7e, 0xf7, 0x5e, 0xf5, 0x58, 0xa9, 0x00, 0x87, 0x12, 0xc7, 0x04, 0x41, 0x09, 0x96, 0x93, 0xf0, 0x07, 0xd8, 0x4c, 0x56, 0x85, 0xb1, 0xfe, 0x86, 0x80, 0xb2, 0x55, 0xd1, 0x2e, 0x67, 0xa6, 0x58, 0x99, 0x19, 0x07, 0x72, 0x0f, 0xd8, 0x57, 0xe6, 0x1d, 0x55, 0x10, 0x9f, 0xa4, 0x17, 0x6a, 0xd4, 0x4e, 0x4c, 0x2b, 0x38, 0xb6, 0x72, 0x0a, 0x8d, 0x5b, 0x64, 0xcd, 0x11, 0xdb, 0xaf, 0x50, 0x05, 0xec, 0x59, 0x55, 0xd2, 0xec, 0xc2, 0xdb, 0x37, 0x78, 0x70, 0x60, 0x07, 0xc7, 0xca, 0x4c, 0x71, 0x97, 0xf4, 0x85, 0xe4, 0x3f, 0x8d, 0x63, 0x5a, 0xc1, 0x8d, 0x8d, 0x34, 0x8e, 0xd9, 0xd2, 0x54, 0x91, 0x55, 0x83, 0x7a, 0xb3, 0x76, 0x71, 0x60, 0x55, 0x29, 0x75, 0xa3, 0x42, 0xb7, 0x07, 0xb5, 0x45, 0x65, 0x6a, 0x28, 0xf3, 0xac, 0x48, 0x5e, 0x5f, 0x68, 0xa6, 0x8d, 0x61, 0x22, 0xe6, 0xde, 0xcb, 0xa2, 0x2e, 0x1e, 0x0a, 0x6b, 0x6e, 0x8a, 0x2e, 0x0e, 0xad, 0x8a, 0x53, 0x58, 0x76, 0x65, 0xc3, 0x2e, 0x2b, 0x52, 0x35, 0xc7, 0x9c, 0x0b, 0x98, 0x1b, 0x71, 0x4c, 0x18, 0xeb, 0xa8, 0xe7, 0xf9, 0x8e, 0x0a, 0x3e, 0x78, 0x7c, 0x54, 0xba, 0x55, 0x75, 0x64, 0x55, 0xee, 0xe1, 0x1a, 0xcc, 0x0a, 0x62, 0x1a, 0x5c, 0x62, 0x8e, 0x61, 0xc2, 0x28, 0xe1, 0xb8, 0xc4, 0x27, 0xe7, 0xf1, 0x43, 0x1d, 0x94, 0xb9, 0xc4, 0x3c, 0x1b, 0x32, 0x6b, 0x96, 0xbb, 0x82, 0x39, 0x73, 0x0d, 0x73, 0x1e, 0x67, 0x35, 0xb6, 0x93, 0xc5, 0x89, 0xca, 0x95, 0xf9, 0x87, 0x9e, 0xaf, 0x63, 0xce, 0xe2, 0x42, 0xed, 0x9a, 0xd6, 0x5f, 0x41, 0x5f, 0xb6, 0x1a, 0x0e, 0xe0, 0x2f, 0x75, 0x8e, 0x60, 0x3a, 0xc2, 0x6e, 0x14, 0x75, 0x81, 0x5e, 0x90, 0x52, 0x49, 0xda, 0xcc, 0xce, 0x1b, 0x3d, 0xf3, 0xf3, 0x73, 0x29, 0xe7, 0x8d, 0xf5, 0xd0, 0x1b, 0x6d, 0xe6, 0x08, 0xa6, 0x23, 0x94, 0xb2, 0x69, 0xbe, 0xd6, 0xd2, 0xa4, 0x1a, 0x96, 0x5c, 0x73, 0x12, 0xf1, 0xf3, 0x6d, 0x42, 0x93, 0xe6, 0xe7, 0x1e, 0xe0, 0xe4, 0x12, 0x73, 0x04, 0xd3, 0x11, 0x84, 0xd1, 0xc7, 0xea, 0x6b, 0x3e, 0x54, 0x12, 0xd6, 0xb9, 0xbc, 0x38, 0x72, 0xcc, 0x09, 0x3b, 0x9b, 0x64, 0xe7, 0x09, 0xbb, 0x7f, 0x08, 0xf4, 0x4f, 0x9c, 0x39, 0x82, 0x19, 0xf8, 0x1d, 0xd1, 0xa5, 0x0f, 0x4e, 0x76, 0xfe, 0xce, 0x4c, 0x48, 0x34, 0x57, 0xde, 0x6a, 0xa9, 0x6d, 0x57, 0x80, 0xea, 0x22, 0x94, 0xaa, 0x04, 0xec, 0x2e, 0x78, 0x2a, 0x69, 0x9c, 0x39, 0x82, 0x29, 0x19, 0x47, 0x10, 0x7a, 0xe3, 0xbe, 0x29, 0x68, 0x6f, 0x6a, 0xd9, 0xbe, 0xec, 0x98, 0x47, 0xdd, 0xaa, 0x19, 0x1e, 0xf8, 0x72, 0x99, 0xb9, 0x8d, 0xf1, 0xf4, 0x3c, 0x0c, 0xf6, 0xb1, 0xe1, 0x9a, 0xad, 0xeb, 0x45, 0x35, 0x2b, 0x3a, 0x77, 0x6a, 0x98, 0x48, 0x8c, 0x4d, 0xca, 0xe8, 0x59, 0xb6, 0x73, 0x05, 0x73, 0x1b, 0xd3, 0xc9, 0x5c, 0x71, 0xa6, 0x99, 0xb1, 0x61, 0x51, 0x2a, 0xab, 0x2a, 0x04, 0xcc, 0xf2, 0x4c, 0x57, 0x0d, 0x3d, 0x78, 0x68, 0xe8, 0xf1, 0x2b, 0x98, 0xdb, 0x98, 0x0e, 0x35, 0x64, 0x09, 0xd0, 0xa9, 0x8e, 0x39, 0x5b, 0x89, 0xdc, 0xff, 0x88, 0x5f, 0x2f, 0xa5, 0xc5, 0x2c, 0xd3, 0x5b, 0x7e, 0x75, 0xdc, 0x0e, 0x9e, 0x6e, 0xf9, 0xdf, 0xa7, 0xe4, 0x2a, 0xe6, 0x10, 0x13, 0x4c, 0xf0, 0x0f, +}; diff --git a/embed/bootloader/main.c b/embed/bootloader/main.c index d9282716..04654a13 100644 --- a/embed/bootloader/main.c +++ b/embed/bootloader/main.c @@ -150,12 +150,15 @@ static secbool bootloader_usb_loop(const vendor_header * const vhdr, const image } break; case 6: // FirmwareErase - ui_screen_install_confirm(); - response = ui_button_response(); - if (sectrue != response) { - ui_screen_info(secfalse, vhdr, hdr); - send_user_abort(USB_IFACE_NUM, "Firmware install cancelled"); - break; + // skip confirmation when no firmware is present + if (vhdr && hdr) { + ui_screen_install_confirm(); + response = ui_button_response(); + if (sectrue != response) { + ui_screen_info(secfalse, vhdr, hdr); + send_user_abort(USB_IFACE_NUM, "Firmware install cancelled"); + break; + } } ui_screen_install(); process_msg_FirmwareErase(USB_IFACE_NUM, msg_size, buf); @@ -258,18 +261,35 @@ main_start: firmware_present = load_image_header((const uint8_t *)(FIRMWARE_START + vhdr.hdrlen), FIRMWARE_IMAGE_MAGIC, FIRMWARE_IMAGE_MAXSIZE, vhdr.vsig_m, vhdr.vsig_n, vhdr.vpub, &hdr); } - const vendor_header * const pvhdr = (sectrue == firmware_present) ? &vhdr : NULL; - const image_header * const phdr = (sectrue == firmware_present) ? &hdr : NULL; + if (firmware_present != sectrue) { + ui_screen_first(); + ui_fadein(); + hal_delay(1000); + ui_fadeout(); - if (touched || firmware_present != sectrue) { - ui_screen_info(sectrue, pvhdr, phdr); + ui_screen_second(); + ui_fadein(); + hal_delay(1000); + ui_fadeout(); + + ui_screen_third(); + ui_fadein(); + + if (bootloader_usb_loop(NULL, NULL) != sectrue) { + return 1; + } + } else + if (touched) { + ui_screen_info(sectrue, &vhdr, &hdr); + ui_fadein(); secbool response = ui_button_response(); ui_fadeout(); if (sectrue != response) { goto main_start; } - ui_screen_info(secfalse, pvhdr, phdr); - if (bootloader_usb_loop(pvhdr, phdr) != sectrue) { + ui_screen_info(secfalse, &vhdr, &hdr); + ui_fadein(); + if (bootloader_usb_loop(&vhdr, &hdr) != sectrue) { return 1; } } @@ -295,6 +315,7 @@ main_start: if ((vhdr.vtrust & VTRUST_ALL) != VTRUST_ALL) { ui_screen_boot(&vhdr, &hdr); + ui_fadein(); int delay = (vhdr.vtrust & VTRUST_WAIT) ^ VTRUST_WAIT; while (delay > 0) { diff --git a/src/apps/homescreen/homescreen.py b/src/apps/homescreen/homescreen.py index b514915b..6bd23ae3 100644 --- a/src/apps/homescreen/homescreen.py +++ b/src/apps/homescreen/homescreen.py @@ -21,7 +21,7 @@ async def display_homescreen(): from apps.common import storage if not storage.is_initialized(): - label = 'Go to trezor.io/start' + label = 'Open trezor.io/start' image = None else: label = storage.get_label() or 'My TREZOR'