TFT is neither "graphical" nor "character" (MarlinFirmware#19297)

kpishere · Sep 7, 2020 · 5c31408 · 5c31408
1 parent 4268d86
commit 5c31408
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
@@ -2612,14 +2612,14 @@
   #ifndef LCD_WIDTH
     #if HAS_GRAPHICAL_LCD
       #define LCD_WIDTH 21
-    #elif HAS_CHARACTER_LCD
+    #else
       #define LCD_WIDTH TERN(ULTIPANEL, 20, 16)
     #endif
   #endif
   #ifndef LCD_HEIGHT
     #if HAS_GRAPHICAL_LCD
       #define LCD_HEIGHT 5
-    #elif HAS_CHARACTER_LCD
+    #else
       #define LCD_HEIGHT TERN(ULTIPANEL, 4, 2)
     #endif
   #endif

diff --git a/Marlin/src/lcd/lcdprint.h b/Marlin/src/lcd/lcdprint.h
@@ -79,7 +79,7 @@
   #define SETCURSOR(col, row)    lcd_moveto((col) * (MENU_FONT_WIDTH), ((row) + 1) * (MENU_FONT_HEIGHT))
   #define SETCURSOR_RJ(len, row) lcd_moveto(LCD_PIXEL_WIDTH - (len) * (MENU_FONT_WIDTH), ((row) + 1) * (MENU_FONT_HEIGHT))
 
-#elif HAS_CHARACTER_LCD
+#else
 
   #define _UxGT(a) a
   typedef uint8_t lcd_uint_t;