From 2690d8568ea55b8fd2b814b878c052d218688e64 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Wed, 17 Feb 2016 18:22:15 -0800
Subject: [PATCH] DOGLCD width/height in Conditionals.h
---
Marlin/Conditionals.h | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h
index 7ff5432503..f9b4e89b73 100644
--- a/Marlin/Conditionals.h
+++ b/Marlin/Conditionals.h
@@ -155,23 +155,30 @@
#define NEWPANEL
#endif
+ #if ENABLED(DOGLCD) // Change number of lines to match the DOG graphic display
+ #ifndef LCD_WIDTH
+ #define LCD_WIDTH 22
+ #endif
+ #ifndef LCD_HEIGHT
+ #define LCD_HEIGHT 5
+ #endif
+ #endif
+
#if ENABLED(ULTIPANEL)
#define NEWPANEL //enable this if you have a click-encoder panel
#define ULTRA_LCD
- #if ENABLED(DOGLCD) // Change number of lines to match the DOG graphic display
- #define LCD_WIDTH 22
- #define LCD_HEIGHT 5
- #else
+ #ifndef LCD_WIDTH
#define LCD_WIDTH 20
+ #endif
+ #ifndef LCD_HEIGHT
#define LCD_HEIGHT 4
#endif
#else //no panel but just LCD
#if ENABLED(ULTRA_LCD)
- #if ENABLED(DOGLCD) // Change number of lines to match the 128x64 graphics display
- #define LCD_WIDTH 22
- #define LCD_HEIGHT 5
- #else
+ #ifndef LCD_WIDTH
#define LCD_WIDTH 16
+ #endif
+ #ifndef LCD_HEIGHT
#define LCD_HEIGHT 2
#endif
#endif