Explorar el Código

🐛 Fix ENABLED => EITHER typo (#22756)

Vert hace 3 años
padre
commit
d69c053225
No account linked to committer's email address

+ 1
- 1
Marlin/src/inc/Conditionals_LCD.h Ver fichero

241
   #define LCD_ST7920_DELAY_2           125
241
   #define LCD_ST7920_DELAY_2           125
242
   #define LCD_ST7920_DELAY_3           125
242
   #define LCD_ST7920_DELAY_3           125
243
 
243
 
244
-#elif ENABLED(ANET_FULL_GRAPHICS_LCD, ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
244
+#elif EITHER(ANET_FULL_GRAPHICS_LCD, ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
245
 
245
 
246
   #define IS_RRD_FG_SC 1
246
   #define IS_RRD_FG_SC 1
247
   #define LCD_ST7920_DELAY_1           150
247
   #define LCD_ST7920_DELAY_1           150

+ 1
- 1
Marlin/src/inc/SanityCheck.h Ver fichero

43
 #define TEST2 1
43
 #define TEST2 1
44
 #define TEST3 0
44
 #define TEST3 0
45
 #define TEST4 true
45
 #define TEST4 true
46
-#if ENABLED(TEST0) || !ENABLED(TEST2) || ENABLED(TEST3)
46
+#if ENABLED(TEST0) || !ENABLED(TEST2) || ENABLED(TEST3) || !ENABLED(TEST1, TEST2, TEST4)
47
   #error "ENABLED is borked!"
47
   #error "ENABLED is borked!"
48
 #endif
48
 #endif
49
 #if BOTH(TEST0, TEST1)
49
 #if BOTH(TEST0, TEST1)

+ 1
- 1
Marlin/src/lcd/marlinui.cpp Ver fichero

32
   #include "../feature/host_actions.h"
32
   #include "../feature/host_actions.h"
33
 #endif
33
 #endif
34
 
34
 
35
-#if ENABLED(BROWSE_MEDIA_ON_INSERT, PASSWORD_ON_SD_PRINT_MENU)
35
+#if BOTH(BROWSE_MEDIA_ON_INSERT, PASSWORD_ON_SD_PRINT_MENU)
36
   #include "../feature/password/password.h"
36
   #include "../feature/password/password.h"
37
 #endif
37
 #endif
38
 
38
 

Loading…
Cancelar
Guardar