Browse Source

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

vanilla_fb_2.0.x
Jason Smith 4 years ago
committed by Scott Lahteine
parent
commit
09a5014b3c
  1. 4
      Marlin/src/inc/Conditionals_post.h
  2. 2
      Marlin/src/lcd/lcdprint.h

4
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

2
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;

Loading…
Cancel
Save