MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Special override of LCD_WIDTH

Browse Source
This commit is contained in:
Scott Lahteine 2018-02-07 01:37:02 -06:00
parent 42866db251
commit 3137df9ad4
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/Conditionals_LCD.h
View File

@ -277,7 +277,11 @@
#if ENABLED(DOGLCD) // Change number of lines to match the DOG graphic display #if ENABLED(DOGLCD) // Change number of lines to match the DOG graphic display
#ifndef LCD_WIDTH #ifndef LCD_WIDTH
#define LCD_WIDTH 22 #ifdef LCD_WIDTH_OVERRIDE
#define LCD_WIDTH LCD_WIDTH_OVERRIDE
#else
#define LCD_WIDTH 22
#endif
#endif #endif
#ifndef LCD_HEIGHT #ifndef LCD_HEIGHT
#define LCD_HEIGHT 5 #define LCD_HEIGHT 5

4
Marlin/example_configurations/Geeetech/GT2560/Configuration.h
View File

@ -1815,8 +1815,8 @@
*/ */
#if ENABLED(ULTIMAKERCONTROLLER) || ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) || ENABLED(G3D_PANEL) || ENABLED(MKS_MINI_12864) #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 #define SDSUPPORT // Force SD Card support on for these displays
#elif ENABLED(ULTRA_LCD) && ENABLED(DOGLCD) // No panel, just graphical LCD? #else
#define LCD_WIDTH 20 // Default is 22. For this Geeetech use 20 #define LCD_WIDTH_OVERRIDE 20 // Default is 22. For this Geeetech use 20.
#endif #endif
#endif // CONFIGURATION_H #endif // CONFIGURATION_H