Browse Source

Patch conditionals for DEFAULT_LCD_CONTRAST, MINIPANEL

- `DEFAULT_LCD_CONTRAST` was incorrectly overriding all `DOGLCD`
- `MINIPANEL` conditionals are identical to `MAKRPANEL`
Scott Lahteine 8 years ago
parent
commit
d3efc96289
1 changed files with 5 additions and 13 deletions
  1. 5
    13
      Marlin/Conditionals.h

+ 5
- 13
Marlin/Conditionals.h View File

48
 
48
 
49
   #define LCD_HAS_DIRECTIONAL_BUTTONS (BUTTON_EXISTS(UP) || BUTTON_EXISTS(DWN) || BUTTON_EXISTS(LFT) || BUTTON_EXISTS(RT))
49
   #define LCD_HAS_DIRECTIONAL_BUTTONS (BUTTON_EXISTS(UP) || BUTTON_EXISTS(DWN) || BUTTON_EXISTS(LFT) || BUTTON_EXISTS(RT))
50
 
50
 
51
-  #if ENABLED(MAKRPANEL)
51
+  #if ENABLED(MAKRPANEL) || ENABLED(MINIPANEL)
52
     #define DOGLCD
52
     #define DOGLCD
53
-    #define DEFAULT_LCD_CONTRAST 17
54
     #define ULTIPANEL
53
     #define ULTIPANEL
55
     #define NEWPANEL
54
     #define NEWPANEL
55
+    #define DEFAULT_LCD_CONTRAST 17
56
   #endif
56
   #endif
57
 
57
 
58
   #if ENABLED(miniVIKI) || ENABLED(VIKI2) || ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
58
   #if ENABLED(miniVIKI) || ENABLED(VIKI2) || ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
123
     #define NEWPANEL
123
     #define NEWPANEL
124
   #endif
124
   #endif
125
 
125
 
126
-  #if ENABLED(MINIPANEL)
127
-    #define DOGLCD
128
-    #define ULTIPANEL
129
-    #define NEWPANEL
130
-    #define DEFAULT_LCD_CONTRAST 17
131
-  #endif
132
-
133
   /**
126
   /**
134
    * I2C PANELS
127
    * I2C PANELS
135
    */
128
    */
251
   /**
244
   /**
252
    * Default LCD contrast for dogm-like LCD displays
245
    * Default LCD contrast for dogm-like LCD displays
253
    */
246
    */
254
-  #if ENABLED(DOGLCD) && DISABLED(DEFAULT_LCD_CONTRAST)
255
-    #define DEFAULT_LCD_CONTRAST 32
256
-  #endif
257
-
258
   #if ENABLED(DOGLCD)
247
   #if ENABLED(DOGLCD)
248
+    #if !defined(DEFAULT_LCD_CONTRAST)
249
+      #define DEFAULT_LCD_CONTRAST 32
250
+    #endif
259
     #define HAS_LCD_CONTRAST
251
     #define HAS_LCD_CONTRAST
260
     #if ENABLED(U8GLIB_ST7920)
252
     #if ENABLED(U8GLIB_ST7920)
261
       #undef HAS_LCD_CONTRAST
253
       #undef HAS_LCD_CONTRAST

Loading…
Cancel
Save