Browse Source

🎨 Misc. style and cleanup

Scott Lahteine 3 years ago
parent
commit
fd595aa01b

+ 1
- 1
Marlin/src/lcd/e3v2/common/dwin_api.cpp View File

21
  */
21
  */
22
 #include "../../../inc/MarlinConfigPre.h"
22
 #include "../../../inc/MarlinConfigPre.h"
23
 
23
 
24
-#if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
24
+#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
25
 
25
 
26
 #include "dwin_api.h"
26
 #include "dwin_api.h"
27
 #include "dwin_set.h"
27
 #include "dwin_set.h"

+ 1
- 3
Marlin/src/module/settings.cpp View File

1990
         _FIELD_TEST(lcd_contrast);
1990
         _FIELD_TEST(lcd_contrast);
1991
         uint8_t lcd_contrast;
1991
         uint8_t lcd_contrast;
1992
         EEPROM_READ(lcd_contrast);
1992
         EEPROM_READ(lcd_contrast);
1993
-        if (!validating) {
1994
-          TERN_(HAS_LCD_CONTRAST, ui.set_contrast(lcd_contrast));
1995
-        }
1993
+        TERN_(HAS_LCD_CONTRAST, if (!validating) ui.set_contrast(lcd_contrast));
1996
       }
1994
       }
1997
 
1995
 
1998
       //
1996
       //

+ 1
- 1
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h View File

272
 #define EXP2_09_PIN                        P0_15
272
 #define EXP2_09_PIN                        P0_15
273
 #define EXP2_10_PIN                        P0_17
273
 #define EXP2_10_PIN                        P0_17
274
 
274
 
275
-#if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
275
+#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
276
 
276
 
277
   // RET6 DWIN ENCODER LCD
277
   // RET6 DWIN ENCODER LCD
278
   #define BTN_ENC                    EXP1_06_PIN
278
   #define BTN_ENC                    EXP1_06_PIN

+ 1
- 1
Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h View File

203
 #define EXP1_09_PIN                        P0_16
203
 #define EXP1_09_PIN                        P0_16
204
 #define EXP1_10_PIN                        P2_08
204
 #define EXP1_10_PIN                        P2_08
205
 
205
 
206
-#if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
206
+#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
207
   #error "Ender-3 V2 display requires a custom cable with TX = P0_15, RX = P0_16. Comment out this line to continue."
207
   #error "Ender-3 V2 display requires a custom cable with TX = P0_15, RX = P0_16. Comment out this line to continue."
208
 
208
 
209
  /**
209
  /**

+ 1
- 1
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h View File

136
   #define EXP1_3                            PB7
136
   #define EXP1_3                            PB7
137
 #endif
137
 #endif
138
 
138
 
139
-#if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
139
+#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
140
   /**
140
   /**
141
    *        ------                ------                ------
141
    *        ------                ------                ------
142
    * (ENT) |10  9 | (BEEP)       |10  9 |              |10  9 |
142
    * (ENT) |10  9 | (BEEP)       |10  9 |              |10  9 |

+ 1
- 1
Marlin/src/pins/stm32f1/pins_CREALITY_V4.h View File

187
     #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
187
     #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
188
   #endif
188
   #endif
189
 
189
 
190
-#elif EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
190
+#elif HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
191
 
191
 
192
   // RET6 DWIN ENCODER LCD
192
   // RET6 DWIN ENCODER LCD
193
   #define BTN_ENC                           PB14
193
   #define BTN_ENC                           PB14

+ 1
- 1
Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h View File

216
   #define BTN_EN1                    EXP1_08_PIN
216
   #define BTN_EN1                    EXP1_08_PIN
217
   #define BTN_EN2                    EXP1_06_PIN
217
   #define BTN_EN2                    EXP1_06_PIN
218
 
218
 
219
-#elif EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
219
+#elif HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
220
 
220
 
221
   // RET6 DWIN ENCODER LCD
221
   // RET6 DWIN ENCODER LCD
222
   #define BTN_ENC                           PB14
222
   #define BTN_ENC                           PB14

Loading…
Cancel
Save