Explorar el Código

Change SSD1306_OLED_I2C_CONTROLLER to HAS_SSD1306_OLED_I2C (#13223)

kwalters3 hace 5 años
padre
commit
5eb82ca6a8

+ 5
- 4
Marlin/src/inc/Conditionals_LCD.h Ver fichero

@@ -158,10 +158,11 @@
158 158
   #define ENCODER_STEPS_PER_MENU_ITEM 2
159 159
 #endif
160 160
 
161
-// Generic support for SSD1306 / SSD1309 / SH1106 OLED based LCDs.
162
-#if ENABLED(U8GLIB_SSD1306) || ENABLED(U8GLIB_SSD1309) || ENABLED(U8GLIB_SH1106)
163
-  #define ULTRA_LCD  //general LCD support, also 16x2
164
-  #define DOGLCD  // Support for I2C LCD 128x64 (Controller SSD1306 / SSD1309 / SH1106 graphic Display Family)
161
+// 128x64 I2C OLED LCDs - SSD1306/SSD1309/SH1106
162
+#define HAS_SSD1306_OLED_I2C (ENABLED(U8GLIB_SSD1306) || ENABLED(U8GLIB_SSD1309) || ENABLED(U8GLIB_SH1106))
163
+#if HAS_SSD1306_OLED_I2C
164
+  #define ULTRA_LCD
165
+  #define DOGLCD
165 166
 #endif
166 167
 
167 168
 #if ENABLED(PANEL_ONE) || ENABLED(U8GLIB_SH1106)

+ 1
- 1
Marlin/src/pins/pins_DUE3DOM.h Ver fichero

@@ -146,7 +146,7 @@
146 146
     #define SDSS             4
147 147
     #define SD_DETECT_PIN   14
148 148
 
149
-  #elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)
149
+  #elif HAS_SSD1306_OLED_I2C
150 150
 
151 151
     #define BTN_EN1         50
152 152
     #define BTN_EN2         52

+ 1
- 1
Marlin/src/pins/pins_DUE3DOM_MINI.h Ver fichero

@@ -138,7 +138,7 @@
138 138
     #define SDSS             4
139 139
     #define SD_DETECT_PIN   14
140 140
 
141
-  #elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)
141
+  #elif HAS_SSD1306_OLED_I2C
142 142
 
143 143
     #define BTN_EN1         50
144 144
     #define BTN_EN2         52

+ 1
- 1
Marlin/src/pins/pins_RADDS.h Ver fichero

@@ -247,7 +247,7 @@
247 247
     #define SDSS            10
248 248
     #define SD_DETECT_PIN   14
249 249
 
250
-  #elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)
250
+  #elif HAS_SSD1306_OLED_I2C
251 251
 
252 252
     #define BTN_EN1         50
253 253
     #define BTN_EN2         52

+ 1
- 1
Marlin/src/pins/pins_RURAMPS4D_11.h Ver fichero

@@ -228,7 +228,7 @@
228 228
 
229 229
     #define SD_DETECT_PIN   51
230 230
 
231
-  #elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)
231
+  #elif HAS_SSD1306_OLED_I2C
232 232
 
233 233
     #define BEEPER_PIN      62
234 234
     #define LCD_SDSS        10

+ 1
- 1
Marlin/src/pins/pins_RURAMPS4D_13.h Ver fichero

@@ -214,7 +214,7 @@
214 214
 
215 215
     #define SD_DETECT_PIN   51
216 216
 
217
-  #elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)
217
+  #elif HAS_SSD1306_OLED_I2C
218 218
 
219 219
     #define BEEPER_PIN      62
220 220
     #define LCD_SDSS        10

Loading…
Cancelar
Guardar