From 596d1ff104aa809165862bdf272caa6cc1f8ddb1 Mon Sep 17 00:00:00 2001 From: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com> Date: Thu, 5 Oct 2023 07:47:23 +0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20TFT=20string=20code=20(#26?= =?UTF-8?q?292)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/lcd/tft/tft_string.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/src/lcd/tft/tft_string.cpp b/Marlin/src/lcd/tft/tft_string.cpp index 6ee1bab6d3f7..9b4ab3e0843c 100644 --- a/Marlin/src/lcd/tft/tft_string.cpp +++ b/Marlin/src/lcd/tft/tft_string.cpp @@ -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); @@ -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]; }