From d3efc962895b470edab6780a35d555c963ec0d22 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Mon, 30 May 2016 01:10:47 -0700
Subject: [PATCH] Patch conditionals for DEFAULT_LCD_CONTRAST, MINIPANEL
- `DEFAULT_LCD_CONTRAST` was incorrectly overriding all `DOGLCD`
- `MINIPANEL` conditionals are identical to `MAKRPANEL`
---
Marlin/Conditionals.h | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h
index 6bef2521a8..705036c1f8 100644
--- a/Marlin/Conditionals.h
+++ b/Marlin/Conditionals.h
@@ -48,11 +48,11 @@
#define LCD_HAS_DIRECTIONAL_BUTTONS (BUTTON_EXISTS(UP) || BUTTON_EXISTS(DWN) || BUTTON_EXISTS(LFT) || BUTTON_EXISTS(RT))
- #if ENABLED(MAKRPANEL)
+ #if ENABLED(MAKRPANEL) || ENABLED(MINIPANEL)
#define DOGLCD
- #define DEFAULT_LCD_CONTRAST 17
#define ULTIPANEL
#define NEWPANEL
+ #define DEFAULT_LCD_CONTRAST 17
#endif
#if ENABLED(miniVIKI) || ENABLED(VIKI2) || ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
@@ -123,13 +123,6 @@
#define NEWPANEL
#endif
- #if ENABLED(MINIPANEL)
- #define DOGLCD
- #define ULTIPANEL
- #define NEWPANEL
- #define DEFAULT_LCD_CONTRAST 17
- #endif
-
/**
* I2C PANELS
*/
@@ -251,11 +244,10 @@
/**
* Default LCD contrast for dogm-like LCD displays
*/
- #if ENABLED(DOGLCD) && DISABLED(DEFAULT_LCD_CONTRAST)
- #define DEFAULT_LCD_CONTRAST 32
- #endif
-
#if ENABLED(DOGLCD)
+ #if !defined(DEFAULT_LCD_CONTRAST)
+ #define DEFAULT_LCD_CONTRAST 32
+ #endif
#define HAS_LCD_CONTRAST
#if ENABLED(U8GLIB_ST7920)
#undef HAS_LCD_CONTRAST