From 50b62975231fe08001c79953c796f9b371da88ad Mon Sep 17 00:00:00 2001 From: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Fri, 24 Mar 2023 02:42:10 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Wrap=20font=20includes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Martin Turski <turningtides@outlook.de> --- Marlin/src/lcd/tft/fontdata/Helvetica/Helvetica_19.cpp | 3 ++- Marlin/src/lcd/tft/fontdata/Helvetica/helvetica_14.cpp | 3 ++- .../tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_14.cpp | 3 ++- .../fontdata/NotoSans/Medium_14px/NotoSans_Medium_ASCII_14.cpp | 3 ++- .../NotoSans/Medium_14px/NotoSans_Medium_Cyrillic_14.cpp | 3 ++- .../fontdata/NotoSans/Medium_14px/NotoSans_Medium_Greek_14.cpp | 3 ++- .../NotoSans/Medium_14px/NotoSans_Medium_Katakana_14.cpp | 3 ++- .../NotoSans/Medium_14px/NotoSans_Medium_Korean_14.cpp | 3 ++- .../Medium_14px/NotoSans_Medium_Latin_Extended_A_14.cpp | 3 ++- .../Medium_14px/NotoSans_Medium_Simplified_Chinese_14.cpp | 3 ++- .../NotoSans/Medium_14px/NotoSans_Medium_Symbols_14.cpp | 3 ++- .../Medium_14px/NotoSans_Medium_Traditional_Chinese_14.cpp | 3 ++- .../NotoSans/Medium_14px/NotoSans_Medium_Vietnamese_14.cpp | 3 ++- .../tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_16.cpp | 3 ++- .../fontdata/NotoSans/Medium_16px/NotoSans_Medium_ASCII_16.cpp | 3 ++- .../NotoSans/Medium_16px/NotoSans_Medium_Cyrillic_16.cpp | 3 ++- .../fontdata/NotoSans/Medium_16px/NotoSans_Medium_Greek_16.cpp | 3 ++- .../NotoSans/Medium_16px/NotoSans_Medium_Katakana_16.cpp | 3 ++- .../NotoSans/Medium_16px/NotoSans_Medium_Korean_16.cpp | 3 ++- .../Medium_16px/NotoSans_Medium_Latin_Extended_A_16.cpp | 3 ++- .../Medium_16px/NotoSans_Medium_Simplified_Chinese_16.cpp | 3 ++- .../NotoSans/Medium_16px/NotoSans_Medium_Symbols_16.cpp | 3 ++- .../Medium_16px/NotoSans_Medium_Traditional_Chinese_16.cpp | 3 ++- .../NotoSans/Medium_16px/NotoSans_Medium_Vietnamese_16.cpp | 3 ++- .../tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_19.cpp | 3 ++- .../fontdata/NotoSans/Medium_19px/NotoSans_Medium_ASCII_19.cpp | 3 ++- .../NotoSans/Medium_19px/NotoSans_Medium_Cyrillic_19.cpp | 3 ++- .../fontdata/NotoSans/Medium_19px/NotoSans_Medium_Greek_19.cpp | 3 ++- .../NotoSans/Medium_19px/NotoSans_Medium_Katakana_19.cpp | 3 ++- .../NotoSans/Medium_19px/NotoSans_Medium_Korean_19.cpp | 3 ++- .../Medium_19px/NotoSans_Medium_Latin_Extended_A_19.cpp | 3 ++- .../Medium_19px/NotoSans_Medium_Simplified_Chinese_19.cpp | 3 ++- .../NotoSans/Medium_19px/NotoSans_Medium_Symbols_19.cpp | 3 ++- .../Medium_19px/NotoSans_Medium_Traditional_Chinese_19.cpp | 3 ++- .../NotoSans/Medium_19px/NotoSans_Medium_Vietnamese_19.cpp | 3 ++- Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_10.cpp | 3 ++- Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_ASCII_10.cpp | 3 ++- .../src/lcd/tft/fontdata/Unifont/10px/Unifont_Cyrillic_10.cpp | 3 ++- Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Greek_10.cpp | 3 ++- .../src/lcd/tft/fontdata/Unifont/10px/Unifont_Katakana_10.cpp | 3 ++- Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Korean_10.cpp | 3 ++- .../tft/fontdata/Unifont/10px/Unifont_Latin_Extended_A_10.cpp | 3 ++- .../fontdata/Unifont/10px/Unifont_Simplified_Chinese_10.cpp | 3 ++- .../src/lcd/tft/fontdata/Unifont/10px/Unifont_Symbols_10.cpp | 3 ++- .../fontdata/Unifont/10px/Unifont_Traditional_Chinese_10.cpp | 3 ++- .../lcd/tft/fontdata/Unifont/10px/Unifont_Vietnamese_10.cpp | 3 ++- Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_20.cpp | 3 ++- Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_ASCII_20.cpp | 3 ++- .../src/lcd/tft/fontdata/Unifont/20px/Unifont_Cyrillic_20.cpp | 3 ++- Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Greek_20.cpp | 3 ++- .../src/lcd/tft/fontdata/Unifont/20px/Unifont_Katakana_20.cpp | 3 ++- Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Korean_20.cpp | 3 ++- .../tft/fontdata/Unifont/20px/Unifont_Latin_Extended_A_20.cpp | 3 ++- .../fontdata/Unifont/20px/Unifont_Simplified_Chinese_20.cpp | 3 ++- .../src/lcd/tft/fontdata/Unifont/20px/Unifont_Symbols_20.cpp | 3 ++- .../fontdata/Unifont/20px/Unifont_Traditional_Chinese_20.cpp | 3 ++- .../lcd/tft/fontdata/Unifont/20px/Unifont_Vietnamese_20.cpp | 3 ++- 57 files changed, 114 insertions(+), 57 deletions(-) diff --git a/Marlin/src/lcd/tft/fontdata/Helvetica/Helvetica_19.cpp b/Marlin/src/lcd/tft/fontdata/Helvetica/Helvetica_19.cpp index 5b4570d010f..ab2f91577a4 100644 --- a/Marlin/src/lcd/tft/fontdata/Helvetica/Helvetica_19.cpp +++ b/Marlin/src/lcd/tft/fontdata/Helvetica/Helvetica_19.cpp @@ -34,7 +34,8 @@ #include "../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define HELVETICA 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == HELVETICA #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/Helvetica/helvetica_14.cpp b/Marlin/src/lcd/tft/fontdata/Helvetica/helvetica_14.cpp index 44e7d40a276..2fbf812369c 100644 --- a/Marlin/src/lcd/tft/fontdata/Helvetica/helvetica_14.cpp +++ b/Marlin/src/lcd/tft/fontdata/Helvetica/helvetica_14.cpp @@ -34,7 +34,8 @@ #include "../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define HELVETICA 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == HELVETICA #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_14.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_14.cpp index 9a543517627..d9bdde8b2d2 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_14.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_14.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_ASCII_14.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_ASCII_14.cpp index 3db57d8ebe0..0d452c94419 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_ASCII_14.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_ASCII_14.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Cyrillic_14.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Cyrillic_14.cpp index f02086646c3..7c1fc2ac4e2 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Cyrillic_14.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Cyrillic_14.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Greek_14.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Greek_14.cpp index cbb789870d9..bb0cec7aca4 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Greek_14.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Greek_14.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Katakana_14.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Katakana_14.cpp index ae167c2c081..eda142fef14 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Katakana_14.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Katakana_14.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Korean_14.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Korean_14.cpp index 7d69f85f4a8..258ccf87998 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Korean_14.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Korean_14.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Latin_Extended_A_14.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Latin_Extended_A_14.cpp index 4ff175700fc..d736d12c179 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Latin_Extended_A_14.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Latin_Extended_A_14.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Simplified_Chinese_14.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Simplified_Chinese_14.cpp index 01c7638e37d..04825f3659d 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Simplified_Chinese_14.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Simplified_Chinese_14.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Symbols_14.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Symbols_14.cpp index 07f3359dc49..a806753a97d 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Symbols_14.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Symbols_14.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Traditional_Chinese_14.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Traditional_Chinese_14.cpp index 63ea2fc74b8..863d0c28051 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Traditional_Chinese_14.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Traditional_Chinese_14.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Vietnamese_14.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Vietnamese_14.cpp index dd6603f682e..6a363582e1b 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Vietnamese_14.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Vietnamese_14.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_16.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_16.cpp index 13699013382..08ec0bf9d05 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_16.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_16.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_ASCII_16.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_ASCII_16.cpp index 0da231be38c..cac0216a758 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_ASCII_16.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_ASCII_16.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Cyrillic_16.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Cyrillic_16.cpp index 36ca1df5479..58ecea399fa 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Cyrillic_16.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Cyrillic_16.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Greek_16.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Greek_16.cpp index ff3ef3f8432..f20b747cc47 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Greek_16.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Greek_16.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Katakana_16.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Katakana_16.cpp index a159a269477..18c9345ca37 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Katakana_16.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Katakana_16.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Korean_16.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Korean_16.cpp index 26e6799a899..3839ed419e1 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Korean_16.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Korean_16.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Latin_Extended_A_16.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Latin_Extended_A_16.cpp index 0617ee27589..afce5184244 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Latin_Extended_A_16.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Latin_Extended_A_16.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Simplified_Chinese_16.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Simplified_Chinese_16.cpp index cd9c617c755..aa76df275a9 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Simplified_Chinese_16.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Simplified_Chinese_16.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Symbols_16.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Symbols_16.cpp index ef20a4bcc6d..63a2a7d071f 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Symbols_16.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Symbols_16.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Traditional_Chinese_16.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Traditional_Chinese_16.cpp index 177e741825c..606625646bb 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Traditional_Chinese_16.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Traditional_Chinese_16.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Vietnamese_16.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Vietnamese_16.cpp index 16cee9a7a29..3905fba3e99 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Vietnamese_16.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Vietnamese_16.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_19.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_19.cpp index c04f1c6d2d7..925254e7f85 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_19.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_19.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_ASCII_19.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_ASCII_19.cpp index 417db3946fa..97ef16cf447 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_ASCII_19.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_ASCII_19.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Cyrillic_19.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Cyrillic_19.cpp index 413141c3b12..dba08111cec 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Cyrillic_19.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Cyrillic_19.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Greek_19.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Greek_19.cpp index f4dcd225c85..497e7fa8e86 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Greek_19.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Greek_19.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Katakana_19.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Katakana_19.cpp index 3f8d4f761aa..f5d92c5fd54 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Katakana_19.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Katakana_19.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Korean_19.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Korean_19.cpp index 7f030d656dd..14a0073211f 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Korean_19.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Korean_19.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Latin_Extended_A_19.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Latin_Extended_A_19.cpp index 00d90611fdc..ccc23097fe1 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Latin_Extended_A_19.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Latin_Extended_A_19.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Simplified_Chinese_19.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Simplified_Chinese_19.cpp index b5999beb720..86621477e14 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Simplified_Chinese_19.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Simplified_Chinese_19.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Symbols_19.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Symbols_19.cpp index 5d277930827..d28f2800d65 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Symbols_19.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Symbols_19.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Traditional_Chinese_19.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Traditional_Chinese_19.cpp index e5fd6077cc5..c34f5bb7f16 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Traditional_Chinese_19.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Traditional_Chinese_19.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Vietnamese_19.cpp b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Vietnamese_19.cpp index 1f77fbe8749..5ff24ab3b06 100644 --- a/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Vietnamese_19.cpp +++ b/Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Vietnamese_19.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define NOTOSANS 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_10.cpp b/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_10.cpp index d22ee15a5f6..2572cc60c42 100644 --- a/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_10.cpp +++ b/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_10.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define UNIFONT 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == UNIFONT #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_ASCII_10.cpp b/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_ASCII_10.cpp index d4965cc061e..27f3dcf3259 100644 --- a/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_ASCII_10.cpp +++ b/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_ASCII_10.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define UNIFONT 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == UNIFONT #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Cyrillic_10.cpp b/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Cyrillic_10.cpp index 013a015ccaa..1e112a1de1c 100644 --- a/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Cyrillic_10.cpp +++ b/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Cyrillic_10.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define UNIFONT 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == UNIFONT #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Greek_10.cpp b/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Greek_10.cpp index 1febf8b5b3d..71375485d28 100644 --- a/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Greek_10.cpp +++ b/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Greek_10.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define UNIFONT 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == UNIFONT #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Katakana_10.cpp b/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Katakana_10.cpp index ae2819dba1a..1e0d15629da 100644 --- a/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Katakana_10.cpp +++ b/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Katakana_10.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define UNIFONT 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == UNIFONT #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Korean_10.cpp b/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Korean_10.cpp index e4516acac26..d1bf3ba514c 100644 --- a/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Korean_10.cpp +++ b/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Korean_10.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define UNIFONT 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == UNIFONT #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Latin_Extended_A_10.cpp b/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Latin_Extended_A_10.cpp index 6059c6ccdd6..8d381d276ac 100644 --- a/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Latin_Extended_A_10.cpp +++ b/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Latin_Extended_A_10.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define UNIFONT 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == UNIFONT #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Simplified_Chinese_10.cpp b/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Simplified_Chinese_10.cpp index b971dc92a0a..3ce396d098f 100644 --- a/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Simplified_Chinese_10.cpp +++ b/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Simplified_Chinese_10.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define UNIFONT 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == UNIFONT #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Symbols_10.cpp b/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Symbols_10.cpp index 9f804f7d69b..8776bfba6c8 100644 --- a/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Symbols_10.cpp +++ b/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Symbols_10.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define UNIFONT 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == UNIFONT #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Traditional_Chinese_10.cpp b/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Traditional_Chinese_10.cpp index 5f820cf8fc7..a9b1406441d 100644 --- a/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Traditional_Chinese_10.cpp +++ b/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Traditional_Chinese_10.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define UNIFONT 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == UNIFONT #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Vietnamese_10.cpp b/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Vietnamese_10.cpp index 66ee7f01f62..d61d1be71bc 100644 --- a/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Vietnamese_10.cpp +++ b/Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Vietnamese_10.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define UNIFONT 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == UNIFONT #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_20.cpp b/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_20.cpp index 9d6847722f4..023cc4f9781 100644 --- a/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_20.cpp +++ b/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_20.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define UNIFONT 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == UNIFONT #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_ASCII_20.cpp b/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_ASCII_20.cpp index 1e5d2280535..e28b806b9fa 100644 --- a/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_ASCII_20.cpp +++ b/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_ASCII_20.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define UNIFONT 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == UNIFONT #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Cyrillic_20.cpp b/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Cyrillic_20.cpp index 751b60c43cc..8e82a228f1c 100644 --- a/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Cyrillic_20.cpp +++ b/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Cyrillic_20.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define UNIFONT 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == UNIFONT #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Greek_20.cpp b/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Greek_20.cpp index fee79c3faef..d5c175977a5 100644 --- a/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Greek_20.cpp +++ b/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Greek_20.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define UNIFONT 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == UNIFONT #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Katakana_20.cpp b/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Katakana_20.cpp index f809a202592..3b21375016e 100644 --- a/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Katakana_20.cpp +++ b/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Katakana_20.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define UNIFONT 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == UNIFONT #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Korean_20.cpp b/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Korean_20.cpp index 7f750e7fa29..ac8dee91ef5 100644 --- a/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Korean_20.cpp +++ b/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Korean_20.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define UNIFONT 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == UNIFONT #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Latin_Extended_A_20.cpp b/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Latin_Extended_A_20.cpp index 49b80018261..9a22047c9a9 100644 --- a/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Latin_Extended_A_20.cpp +++ b/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Latin_Extended_A_20.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define UNIFONT 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == UNIFONT #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Simplified_Chinese_20.cpp b/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Simplified_Chinese_20.cpp index 970d30bec73..85e0d205d78 100644 --- a/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Simplified_Chinese_20.cpp +++ b/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Simplified_Chinese_20.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define UNIFONT 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == UNIFONT #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Symbols_20.cpp b/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Symbols_20.cpp index 5f663efc564..a0d269e02f5 100644 --- a/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Symbols_20.cpp +++ b/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Symbols_20.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define UNIFONT 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == UNIFONT #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Traditional_Chinese_20.cpp b/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Traditional_Chinese_20.cpp index 70359bbc71c..c541e1401d5 100644 --- a/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Traditional_Chinese_20.cpp +++ b/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Traditional_Chinese_20.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define UNIFONT 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == UNIFONT #include <stdint.h> diff --git a/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Vietnamese_20.cpp b/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Vietnamese_20.cpp index 21fbc29d81e..8c9b29153c1 100644 --- a/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Vietnamese_20.cpp +++ b/Marlin/src/lcd/tft/fontdata/Unifont/20px/Unifont_Vietnamese_20.cpp @@ -22,7 +22,8 @@ #include "../../../../../inc/MarlinConfigPre.h" -#if HAS_GRAPHICAL_TFT +#define UNIFONT 123 +#if HAS_GRAPHICAL_TFT && TFT_FONT == UNIFONT #include <stdint.h>