From 704d33c374edf5da3edecf9fb88a617be2a008ac Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 8 Feb 2018 01:30:56 -0600 Subject: [PATCH] Special override of LCD_WIDTH --- Marlin/src/config/examples/Geeetech/GT2560/Configuration.h | 2 +- Marlin/src/inc/Conditionals_LCD.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h index eef4f92d0f..019b5872d4 100644 --- a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h @@ -1837,7 +1837,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 ENABLED(ULTRA_LCD) && ENABLED(DOGLCD) // No panel, just graphical LCD? - #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 // CONFIGURATION_H diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h index d4c43ecf17..0524d202a1 100644 --- a/Marlin/src/inc/Conditionals_LCD.h +++ b/Marlin/src/inc/Conditionals_LCD.h @@ -287,7 +287,11 @@ #if ENABLED(DOGLCD) // Change number of lines to match the DOG graphic display #ifndef LCD_WIDTH - #define LCD_WIDTH 22 + #ifdef LCD_WIDTH_OVERRIDE + #define LCD_WIDTH LCD_WIDTH_OVERRIDE + #else + #define LCD_WIDTH 22 + #endif #endif #ifndef LCD_HEIGHT #define LCD_HEIGHT 5