Selaa lähdekoodia

Patch conditionals for DEFAULT_LCD_CONTRAST, MINIPANEL

- `DEFAULT_LCD_CONTRAST` was incorrectly overriding all `DOGLCD`
- `MINIPANEL` conditionals are identical to `MAKRPANEL`
Scott Lahteine 8 vuotta sitten
vanhempi
commit
d3efc96289
1 muutettua tiedostoa jossa 5 lisäystä ja 13 poistoa
  1. 5
    13
      Marlin/Conditionals.h

+ 5
- 13
Marlin/Conditionals.h Näytä tiedosto

@@ -48,11 +48,11 @@
48 48
 
49 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 52
     #define DOGLCD
53
-    #define DEFAULT_LCD_CONTRAST 17
54 53
     #define ULTIPANEL
55 54
     #define NEWPANEL
55
+    #define DEFAULT_LCD_CONTRAST 17
56 56
   #endif
57 57
 
58 58
   #if ENABLED(miniVIKI) || ENABLED(VIKI2) || ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
@@ -123,13 +123,6 @@
123 123
     #define NEWPANEL
124 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 127
    * I2C PANELS
135 128
    */
@@ -251,11 +244,10 @@
251 244
   /**
252 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 247
   #if ENABLED(DOGLCD)
248
+    #if !defined(DEFAULT_LCD_CONTRAST)
249
+      #define DEFAULT_LCD_CONTRAST 32
250
+    #endif
259 251
     #define HAS_LCD_CONTRAST
260 252
     #if ENABLED(U8GLIB_ST7920)
261 253
       #undef HAS_LCD_CONTRAST

Loading…
Peruuta
Tallenna