Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix QR and text display in T3B1 prodtest #4570

Merged
merged 2 commits into from
Feb 6, 2025
Merged

fix QR and text display in T3B1 prodtest #4570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
788184d
fix(core/prodtest): fix text rendering
TychoVrahe Feb 3, 2025
55c38bb
fix(core/prodtest): fix QR code display
TychoVrahe Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/embed/gfx/gfx_draw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ void gfx_draw_bitmap(gfx_rect_t rect, const gfx_bitmap_t* bitmap) {

#if TREZOR_FONT_BPP == 1
#define GLYPH_FORMAT GFX_FORMAT_MONO1P
#define GLYPH_STRIDE(w) (((w) + 7) / 8)
#define GLYPH_STRIDE(w) (w)
#elif TREZOR_FONT_BPP == 2
#error Unsupported TREZOR_FONT_BPP value
#define GLYPH_FORMAT GFX_FORMAT_MONO2
Expand Down
1 change: 1 addition & 0 deletions core/embed/projects/prodtest/.changelog.d/4564.fixed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[T2B1, T3B1] Fix displaying QR code and text.
21 changes: 13 additions & 8 deletions core/embed/projects/prodtest/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,6 @@
// Command line interface context
cli_t g_cli = {0};

static gfx_text_attr_t bold = {
.font = FONT_BOLD,
.fg_color = COLOR_WHITE,
.bg_color = COLOR_BLACK,
};

#define VCP_IFACE 0

static size_t console_read(void *context, char *buf, size_t size) {
Expand Down Expand Up @@ -163,9 +157,20 @@ static inline gfx_rect_t gfx_rect_shrink(gfx_rect_t r, int padding) {
static void draw_welcome_screen(void) {
gfx_clear();
gfx_rect_t r = gfx_rect_wh(0, 0, DISPLAY_RESX, DISPLAY_RESY);
uint8_t qr_scale = 4;
int16_t text_offset = 30;
gfx_text_attr_t bold = {
.font = FONT_BOLD,
.fg_color = COLOR_WHITE,
.bg_color = COLOR_BLACK,
};

#if defined TREZOR_MODEL_T2B1 || defined TREZOR_MODEL_T3B1
gfx_draw_bar(r, COLOR_WHITE);
qr_scale = 2;
text_offset = 9;
bold.fg_color = COLOR_BLACK;
bold.bg_color = COLOR_WHITE;
#else
gfx_draw_bar(gfx_rect_shrink(r, 3), COLOR_WHITE);
gfx_draw_bar(gfx_rect_shrink(r, 4), COLOR_BLACK);
Expand All @@ -178,9 +183,9 @@ static void draw_welcome_screen(void) {
gfx_offset_t pos;

pos = gfx_offset(DISPLAY_RESX / 2, DISPLAY_RESY / 2);
gfx_draw_qrcode(pos, 4, dom);
gfx_draw_qrcode(pos, qr_scale, dom);

pos = gfx_offset(DISPLAY_RESX / 2, DISPLAY_RESY - 30);
pos = gfx_offset(DISPLAY_RESX / 2, DISPLAY_RESY - text_offset);
gfx_draw_text(pos, dom + sizeof(MODEL_IDENTIFIER) - 1, -1, &bold,
GFX_ALIGN_CENTER);
}
Expand Down
Loading