From 3137df9ad43d2af8f1ca2f6a53c788467fae6010 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 7 Feb 2018 01:37:02 -0600
Subject: [PATCH] Special override of LCD_WIDTH
---
Marlin/Conditionals_LCD.h | 6 +++++-
.../example_configurations/Geeetech/GT2560/Configuration.h | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/Marlin/Conditionals_LCD.h b/Marlin/Conditionals_LCD.h
index 97784a182ab..2ed21aa433e 100644
--- a/Marlin/Conditionals_LCD.h
+++ b/Marlin/Conditionals_LCD.h
@@ -277,7 +277,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
diff --git a/Marlin/example_configurations/Geeetech/GT2560/Configuration.h b/Marlin/example_configurations/Geeetech/GT2560/Configuration.h
index 8cbac840351..36d6350021a 100644
--- a/Marlin/example_configurations/Geeetech/GT2560/Configuration.h
+++ b/Marlin/example_configurations/Geeetech/GT2560/Configuration.h
@@ -1815,8 +1815,8 @@
*/
#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
+#else
+ #define LCD_WIDTH_OVERRIDE 20 // Default is 22. For this Geeetech use 20.
#endif
#endif // CONFIGURATION_H