From 4cc8a5432d4106fd2b15625737b3a76390a640c3 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 2 Jan 2018 01:44:39 +0100 Subject: [PATCH] bootloader: use normal/regular font rather than bold --- SConscript.bootloader | 4 ++-- embed/bootloader/main.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/SConscript.bootloader b/SConscript.bootloader index 59a39a7f..76605e1b 100644 --- a/SConscript.bootloader +++ b/SConscript.bootloader @@ -33,7 +33,7 @@ SOURCE_MOD += [ # modtrezorui CPPDEFINES_MOD += [ - 'TREZOR_FONT_BOLD_ENABLE', + 'TREZOR_FONT_NORMAL_ENABLE', ('TREZOR_FONT_PREFILL', '0'), ('QR_MAX_VERSION', '0'), ] @@ -41,7 +41,7 @@ SOURCE_MOD += [ 'embed/extmod/modtrezorui/display.c', 'embed/extmod/modtrezorui/inflate.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', ] diff --git a/embed/bootloader/main.c b/embed/bootloader/main.c index 3105db73..78e0f088 100644 --- a/embed/bootloader/main.c +++ b/embed/bootloader/main.c @@ -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); 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) { 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) @@ -73,7 +73,7 @@ static void display_welcome(secbool firmware_present) display_clear(); 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_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) { 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); display_image((DISPLAY_RESX - w) / 2, 32, w, h, vimg + 12, datalen); 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]; 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 >> 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(); }