From 09a5014b3c6f3860d80da0c05195b4b527fb6ae6 Mon Sep 17 00:00:00 2001 From: Jason Smith Date: Mon, 7 Sep 2020 15:07:53 -0700 Subject: [PATCH] TFT is neither "graphical" nor "character" (#19297) --- Marlin/src/inc/Conditionals_post.h | 4 ++-- Marlin/src/lcd/lcdprint.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index 89dc73fb5c..71ae4bb285 100644 --- 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 index 8ea174bd65..031d467bf9 100644 --- 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;