zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Jason Smith 2020-09-07 15:07:53 -07:00 committed by Scott Lahteine
parent f5dc18730c
commit 09a5014b3c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/inc/Conditionals_post.h
View file

@ -2612,14 +2612,14 @@
#ifndef LCD_WIDTH #ifndef LCD_WIDTH
#if HAS_GRAPHICAL_LCD #if HAS_GRAPHICAL_LCD
#define LCD_WIDTH 21 #define LCD_WIDTH 21
#elif HAS_CHARACTER_LCD #else
#define LCD_WIDTH TERN(ULTIPANEL, 20, 16) #define LCD_WIDTH TERN(ULTIPANEL, 20, 16)
#endif #endif
#endif #endif
#ifndef LCD_HEIGHT #ifndef LCD_HEIGHT
#if HAS_GRAPHICAL_LCD #if HAS_GRAPHICAL_LCD
#define LCD_HEIGHT 5 #define LCD_HEIGHT 5
#elif HAS_CHARACTER_LCD #else
#define LCD_HEIGHT TERN(ULTIPANEL, 4, 2) #define LCD_HEIGHT TERN(ULTIPANEL, 4, 2)
#endif #endif
#endif #endif

2
Marlin/src/lcd/lcdprint.h
View file

@ -79,7 +79,7 @@
#define SETCURSOR(col, row) lcd_moveto((col) * (MENU_FONT_WIDTH), ((row) + 1) * (MENU_FONT_HEIGHT)) #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)) #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 #define _UxGT(a) a
typedef uint8_t lcd_uint_t; typedef uint8_t lcd_uint_t;