🎨 Wrap font includes

Co-Authored-By: Martin Turski <turningtides@outlook.de>
MarlinFirmware · Mar 24, 2023 · 50b6297 · 50b6297
1 parent 0914f9e
commit 50b6297
Show file tree

Hide file tree

Showing 57 changed files with 114 additions and 57 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>