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

bootloader: use normal/regular font rather than bold

Browse Source
This commit is contained in:
Pavol Rusnak 2018-01-02 01:44:39 +01:00
parent 94588dd588
commit 4cc8a5432d
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SConscript.bootloader
View File

@ -33,7 +33,7 @@ SOURCE_MOD += [
# modtrezorui # modtrezorui
CPPDEFINES_MOD += [ CPPDEFINES_MOD += [
'TREZOR_FONT_BOLD_ENABLE', 'TREZOR_FONT_NORMAL_ENABLE',
('TREZOR_FONT_PREFILL', '0'), ('TREZOR_FONT_PREFILL', '0'),
('QR_MAX_VERSION', '0'), ('QR_MAX_VERSION', '0'),
] ]
@ -41,7 +41,7 @@ SOURCE_MOD += [
'embed/extmod/modtrezorui/display.c', 'embed/extmod/modtrezorui/display.c',
'embed/extmod/modtrezorui/inflate.c', 'embed/extmod/modtrezorui/inflate.c',
'embed/extmod/modtrezorui/font_bitmap.c', 'embed/extmod/modtrezorui/font_bitmap.c',
'embed/extmod/modtrezorui/font_roboto_bold_20.c', 'embed/extmod/modtrezorui/font_roboto_regular_20.c',
'embed/extmod/modtrezorui/trezor-qrenc/qr_encode.c', 'embed/extmod/modtrezorui/trezor-qrenc/qr_encode.c',
] ]

10
embed/bootloader/main.c
View File

@ -39,13 +39,13 @@ static void display_header(int icon, const char *text)
display_icon(8, 4, 24, 24, toi_icon_wipe, sizeof(toi_icon_wipe), COLOR_BLACK, COLOR_BL_ORANGE); display_icon(8, 4, 24, 24, toi_icon_wipe, sizeof(toi_icon_wipe), COLOR_BLACK, COLOR_BL_ORANGE);
break; break;
} }
display_text(8 + 24 + 8, 23, text, -1, FONT_BOLD, COLOR_BLACK, COLOR_BL_ORANGE, 0); display_text(8 + 24 + 8, 23, text, -1, FONT_NORMAL, COLOR_BLACK, COLOR_BL_ORANGE, 0);
} }
static void display_footer(const char *text, uint16_t color, int bottom) static void display_footer(const char *text, uint16_t color, int bottom)
{ {
display_bar(0, DISPLAY_RESY - bottom - 24, DISPLAY_RESX, bottom + 24, COLOR_BLACK); display_bar(0, DISPLAY_RESY - bottom - 24, DISPLAY_RESX, bottom + 24, COLOR_BLACK);
display_text_center(DISPLAY_RESX / 2, DISPLAY_RESY - bottom, text, -1, FONT_BOLD, color, COLOR_BLACK, 0); display_text_center(DISPLAY_RESX / 2, DISPLAY_RESY - bottom, text, -1, FONT_NORMAL, color, COLOR_BLACK, 0);
} }
static void display_done(int restart) static void display_done(int restart)
@ -73,7 +73,7 @@ static void display_welcome(secbool firmware_present)
display_clear(); display_clear();
if (secfalse == firmware_present) { if (secfalse == firmware_present) {
display_icon((DISPLAY_RESX - 124) / 2, (DISPLAY_RESY - 40 - 180) / 2, 124, 180, toi_icon_lock, sizeof(toi_icon_lock), COLOR_WHITE, COLOR_BLACK); display_icon((DISPLAY_RESX - 124) / 2, (DISPLAY_RESY - 40 - 180) / 2, 124, 180, toi_icon_lock, sizeof(toi_icon_lock), COLOR_WHITE, COLOR_BLACK);
display_text_center(DISPLAY_RESX / 2, DISPLAY_RESY - 20, "Go to trezor.io/start", -1, FONT_BOLD, COLOR_WHITE, COLOR_BLACK, 0); display_text_center(DISPLAY_RESX / 2, DISPLAY_RESY - 20, "Go to trezor.io/start", -1, FONT_NORMAL, COLOR_WHITE, COLOR_BLACK, 0);
} }
if (sectrue == firmware_present) { if (sectrue == firmware_present) {
display_header(ICON_TOOLS, "TREZOR Bootloader"); display_header(ICON_TOOLS, "TREZOR Bootloader");
@ -99,7 +99,7 @@ static void display_vendor(const uint8_t *vimg, const char *vstr, uint32_t vstr_
uint32_t datalen = *(uint32_t *)(vimg + 8); uint32_t datalen = *(uint32_t *)(vimg + 8);
display_image((DISPLAY_RESX - w) / 2, 32, w, h, vimg + 12, datalen); display_image((DISPLAY_RESX - w) / 2, 32, w, h, vimg + 12, datalen);
if (vstr && vstr_len) { if (vstr && vstr_len) {
display_text_center(DISPLAY_RESX / 2, DISPLAY_RESY - 48, vstr, vstr_len, FONT_BOLD, COLOR_WHITE, background, 0); display_text_center(DISPLAY_RESX / 2, DISPLAY_RESY - 48, vstr, vstr_len, FONT_NORMAL, COLOR_WHITE, background, 0);
} }
char ver_str[32]; char ver_str[32];
mini_snprintf(ver_str, sizeof(ver_str), "%d.%d.%d.%d", mini_snprintf(ver_str, sizeof(ver_str), "%d.%d.%d.%d",
@ -108,7 +108,7 @@ static void display_vendor(const uint8_t *vimg, const char *vstr, uint32_t vstr_
(int)((fw_version >> 16) & 0xFF), (int)((fw_version >> 16) & 0xFF),
(int)((fw_version >> 24) & 0xFF) (int)((fw_version >> 24) & 0xFF)
); );
display_text_center(DISPLAY_RESX / 2, DISPLAY_RESY - 25, ver_str, -1, FONT_BOLD, COLOR_GRAY128, background, 0); display_text_center(DISPLAY_RESX / 2, DISPLAY_RESY - 25, ver_str, -1, FONT_NORMAL, COLOR_GRAY128, background, 0);
display_refresh(); display_refresh();
} }