rasmus/MTGcompanion
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

display: fix font cell row/col-major bug causing garbled glyphs (draw_bitmap expects row-major)

Browse Source
This commit is contained in:
Rasmus
2026-09-10 17:31:47 +02:00
parent 993962865b
commit 31217c686f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/display_manager.c
View File

@@ -128,11 +128,13 @@ int display_put_text(int x, int y, const char *str, uint16_t fg, uint16_t bg)
char c = *str++; char c = *str++;
if (c >= FONT5X7_FIRST_CHAR && c <= FONT5X7_LAST_CHAR) { if (c >= FONT5X7_FIRST_CHAR && c <= FONT5X7_LAST_CHAR) {
const uint8_t *glyph = font5x7[c - FONT5X7_FIRST_CHAR]; const uint8_t *glyph = font5x7[c - FONT5X7_FIRST_CHAR];
uint16_t cell[FONT5X7_W][FONT5X7_H]; /* Row-major [row][col] so the linear buffer matches what
* esp_lcd_panel_draw_bitmap expects. */
uint16_t cell[FONT5X7_H][FONT5X7_W];
for (int gy = 0; gy < FONT5X7_H; gy++) { for (int gy = 0; gy < FONT5X7_H; gy++) {
for (int gx = 0; gx < FONT5X7_W; gx++) { for (int gx = 0; gx < FONT5X7_W; gx++) {
cell[gx][gy] = (glyph[gy] >> gx) & 1 ? fg : bg; cell[gy][gx] = (glyph[gy] >> gx) & 1 ? fg : bg;
} }
} }
if (x + FONT5X7_W <= DISP_W && y + FONT5X7_H <= DISP_H) { if (x + FONT5X7_W <= DISP_W && y + FONT5X7_H <= DISP_H) {