@@ -93,33 +93,37 @@ bool dwinHandshake() {
9393// Get font character width
9494uint8_t fontWidth (uint8_t cfont) {
9595 switch (cfont) {
96- case font6x12 : return 6 ;
96+ #if DISABLED(TJC_DISPLAY)
97+ case font6x12 : return 6 ;
98+ case font20x40: return 20 ;
99+ case font24x48: return 24 ;
100+ case font28x56: return 28 ;
101+ case font32x64: return 32 ;
102+ #endif
97103 case font8x16 : return 8 ;
98104 case font10x20: return 10 ;
99105 case font12x24: return 12 ;
100106 case font14x28: return 14 ;
101107 case font16x32: return 16 ;
102- case font20x40: return 20 ;
103- case font24x48: return 24 ;
104- case font28x56: return 28 ;
105- case font32x64: return 32 ;
106108 default : return 0 ;
107109 }
108110}
109111
110112// Get font character height
111113uint8_t fontHeight (uint8_t cfont) {
112114 switch (cfont) {
113- case font6x12 : return 12 ;
115+ #if DISABLED(TJC_DISPLAY)
116+ case font6x12 : return 12 ;
117+ case font20x40: return 40 ;
118+ case font24x48: return 48 ;
119+ case font28x56: return 56 ;
120+ case font32x64: return 64 ;
121+ #endif
114122 case font8x16 : return 16 ;
115123 case font10x20: return 20 ;
116124 case font12x24: return 24 ;
117125 case font14x28: return 28 ;
118126 case font16x32: return 32 ;
119- case font20x40: return 40 ;
120- case font24x48: return 48 ;
121- case font28x56: return 56 ;
122- case font32x64: return 64 ;
123127 default : return 0 ;
124128 }
125129}
0 commit comments