Skip to content

Commit

Permalink
🩹 Fix TFT string code (MarlinFirmware#26292)
Browse files Browse the repository at this point in the history
  • Loading branch information
EvilGremlin authored Oct 5, 2023
1 parent 8964924 commit 596d1ff
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Marlin/src/lcd/tft/tft_string.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ void TFT_String::set_font(const uint8_t *font) {
for (glyph = 0; glyph < EXTRA_GLYPHS; glyph++) glyphs_extra[glyph] = nullptr;
#endif

DEBUG_ECHOLNPGM("Format: ", ((unifont_t *)font_header)->Format);
DEBUG_ECHOLNPGM("Format: ", ((unifont_t *)font_header)->format);
DEBUG_ECHOLNPGM("capitalAHeight: ", ((unifont_t *)font_header)->capitalAHeight);
DEBUG_ECHOLNPGM("fontStartEncoding: ", ((unifont_t *)font_header)->fontStartEncoding);
DEBUG_ECHOLNPGM("fontEndEncoding: ", ((unifont_t *)font_header)->fontEndEncoding);
Expand Down Expand Up @@ -129,7 +129,7 @@ glyph_t *TFT_String::glyph(uint16_t character) {
#if EXTRA_GLYPHS
if (font_header_extra == nullptr || character < font_header_extra->fontStartEncoding || character > font_header_extra->fontEndEncoding) return glyphs['?'];

if ((font_header_extra->Format & 0xF0) == FONT_MARLIN_GLYPHS) {
if ((font_header_extra->format & 0xF0) == FONT_MARLIN_GLYPHS) {
if (glyphs_extra[character - font_header_extra->fontStartEncoding])
return (glyph_t *)glyphs_extra[character - font_header_extra->fontStartEncoding];
}
Expand Down

0 comments on commit 596d1ff

Please sign in to comment.