3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-26 13:25:54 +00:00
Code Issues Releases Wiki Activity

🩹 Fix E3V2 non-TJC font size (#27375)

Browse Source
This commit is contained in:
ellensp 2024-09-13 10:29:46 +12:00 committed by GitHub
parent c7e62b33d1
commit 1a5866f5c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Marlin/src/lcd/e3v2/common/dwin_api.cpp
View File

@ -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;
}
}