SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Clean up LCD width/height determination

Browse source
This commit is contained in:
Scott Lahteine 2018-11-12 02:37:31 -06:00
parent a0c795b097
commit a3923424c7
2 changed files with 17 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
View file

@ -2036,7 +2036,7 @@
#if ENABLED(ULTIMAKERCONTROLLER) || ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) || ENABLED(G3D_PANEL) || ENABLED(MKS_MINI_12864)
#define SDSUPPORT // Force SD Card support on for these displays
#elif DISABLED(LIGHTWEIGHT_UI)
#define LCD_WIDTH_OVERRIDE 20 // Default is 22. For this Geeetech use 20.
#define LCD_WIDTH 20 // Default is 22. For this Geeetech use 20.
#endif
// Allow servo angle to be edited and saved to EEPROM

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

@ -1630,37 +1630,25 @@
#endif
// Get LCD character width/height, which may be overridden by pins, configs, etc.
#if HAS_GRAPHICAL_LCD
#ifndef LCD_WIDTH
#ifdef LCD_WIDTH_OVERRIDE
#define LCD_WIDTH LCD_WIDTH_OVERRIDE
#elif ENABLED(LIGHTWEIGHT_UI)
#if ENABLED(LIGHTWEIGHT_UI)
#define LCD_WIDTH 16
#else
#elif HAS_GRAPHICAL_LCD
#define LCD_WIDTH 22
#endif
#endif
#ifndef LCD_HEIGHT
#ifdef LCD_HEIGHT_OVERRIDE
#define LCD_HEIGHT LCD_HEIGHT_OVERRIDE
#elif ENABLED(LIGHTWEIGHT_UI)
#define LCD_HEIGHT 4
#else
#define LCD_HEIGHT 5
#endif
#endif
#elif ENABLED(ULTIPANEL)
#ifndef LCD_WIDTH
#define LCD_WIDTH 20
#endif
#ifndef LCD_HEIGHT
#define LCD_HEIGHT 4
#endif
#elif HAS_SPI_LCD
#ifndef LCD_WIDTH
#define LCD_WIDTH 16
#endif
#endif
#ifndef LCD_HEIGHT
#if ENABLED(LIGHTWEIGHT_UI)
#define LCD_HEIGHT 4
#elif HAS_GRAPHICAL_LCD
#define LCD_HEIGHT 5
#elif ENABLED(ULTIPANEL)
#define LCD_HEIGHT 4
#elif HAS_SPI_LCD
#define LCD_HEIGHT 2
#endif
#endif