From 1a5866f5c63d14853bca69a74a6412ec0ac682e5 Mon Sep 17 00:00:00 2001 From: ellensp <530024+ellensp@users.noreply.github.com> Date: Fri, 13 Sep 2024 10:29:46 +1200 Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20E3V2=20non-TJC=20font=20si?= =?UTF-8?q?ze=20(#27375)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/lcd/e3v2/common/dwin_api.cpp | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/Marlin/src/lcd/e3v2/common/dwin_api.cpp b/Marlin/src/lcd/e3v2/common/dwin_api.cpp index 1688b242305..4a93d304ca3 100644 --- a/Marlin/src/lcd/e3v2/common/dwin_api.cpp +++ b/Marlin/src/lcd/e3v2/common/dwin_api.cpp @@ -93,16 +93,18 @@ bool dwinHandshake() { // Get font character width uint8_t fontWidth(uint8_t cfont) { switch (cfont) { - case font6x12 : return 6; + #if DISABLED(TJC_DISPLAY) + case font6x12 : return 6; + case font20x40: return 20; + case font24x48: return 24; + case font28x56: return 28; + case font32x64: return 32; + #endif case font8x16 : return 8; case font10x20: return 10; case font12x24: return 12; case font14x28: return 14; case font16x32: return 16; - case font20x40: return 20; - case font24x48: return 24; - case font28x56: return 28; - case font32x64: return 32; default: return 0; } } @@ -110,16 +112,18 @@ uint8_t fontWidth(uint8_t cfont) { // Get font character height uint8_t fontHeight(uint8_t cfont) { switch (cfont) { - case font6x12 : return 12; + #if DISABLED(TJC_DISPLAY) + case font6x12 : return 12; + case font20x40: return 40; + case font24x48: return 48; + case font28x56: return 56; + case font32x64: return 64; + #endif case font8x16 : return 16; case font10x20: return 20; case font12x24: return 24; case font14x28: return 28; case font16x32: return 32; - case font20x40: return 40; - case font24x48: return 48; - case font28x56: return 56; - case font32x64: return 64; default: return 0; } }