Skip to content

Commit 50b6297

Browse files
thinkyheadquiret
thinkyhead
and
quiret
committed
🎨 Wrap font includes
Co-Authored-By: Martin Turski <turningtides@outlook.de>
1 parent 0914f9e commit 50b6297

File tree

57 files changed

+114
-57
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+114
-57
lines changed

‎Marlin/src/lcd/tft/fontdata/Helvetica/Helvetica_19.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434

3535
#include "../../../../inc/MarlinConfigPre.h"
3636

37-
#if HAS_GRAPHICAL_TFT
37+
#define HELVETICA 123
38+
#if HAS_GRAPHICAL_TFT && TFT_FONT == HELVETICA
3839

3940
#include <stdint.h>
4041

‎Marlin/src/lcd/tft/fontdata/Helvetica/helvetica_14.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434

3535
#include "../../../../inc/MarlinConfigPre.h"
3636

37-
#if HAS_GRAPHICAL_TFT
37+
#define HELVETICA 123
38+
#if HAS_GRAPHICAL_TFT && TFT_FONT == HELVETICA
3839

3940
#include <stdint.h>
4041

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_14.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_ASCII_14.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Cyrillic_14.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Greek_14.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Katakana_14.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Korean_14.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Latin_Extended_A_14.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Simplified_Chinese_14.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Symbols_14.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Traditional_Chinese_14.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_14px/NotoSans_Medium_Vietnamese_14.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_16.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_ASCII_16.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Cyrillic_16.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Greek_16.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Katakana_16.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Korean_16.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Latin_Extended_A_16.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Simplified_Chinese_16.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Symbols_16.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Traditional_Chinese_16.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_16px/NotoSans_Medium_Vietnamese_16.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_19.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_ASCII_19.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Cyrillic_19.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Greek_19.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Katakana_19.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Korean_19.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Latin_Extended_A_19.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Simplified_Chinese_19.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Symbols_19.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Traditional_Chinese_19.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/NotoSans/Medium_19px/NotoSans_Medium_Vietnamese_19.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define NOTOSANS 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == NOTOSANS
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_10.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define UNIFONT 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == UNIFONT
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_ASCII_10.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define UNIFONT 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == UNIFONT
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Cyrillic_10.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define UNIFONT 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == UNIFONT
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Greek_10.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define UNIFONT 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == UNIFONT
2627

2728
#include <stdint.h>
2829

‎Marlin/src/lcd/tft/fontdata/Unifont/10px/Unifont_Katakana_10.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
#include "../../../../../inc/MarlinConfigPre.h"
2424

25-
#if HAS_GRAPHICAL_TFT
25+
#define UNIFONT 123
26+
#if HAS_GRAPHICAL_TFT && TFT_FONT == UNIFONT
2627

2728
#include <stdint.h>
2829

0 commit comments

Comments
 (0)