3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-30 15:26:18 +00:00
Code Issues Releases Wiki Activity

🐛 Fix ENABLED => EITHER typo (#22756)

Browse Source
This commit is contained in:
Vert 2021-09-12 22:39:52 -04:00 committed by Scott Lahteine
parent e679fafaaf
commit 50e52c0fdb
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/inc/Conditionals_LCD.h
View File

@ -241,7 +241,7 @@
#define LCD_ST7920_DELAY_2 125 #define LCD_ST7920_DELAY_2 125
#define LCD_ST7920_DELAY_3 125 #define LCD_ST7920_DELAY_3 125
#elif ENABLED(ANET_FULL_GRAPHICS_LCD, ANET_FULL_GRAPHICS_LCD_ALT_WIRING) #elif EITHER(ANET_FULL_GRAPHICS_LCD, ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
#define IS_RRD_FG_SC 1 #define IS_RRD_FG_SC 1
#define LCD_ST7920_DELAY_1 150 #define LCD_ST7920_DELAY_1 150

2
Marlin/src/inc/SanityCheck.h
View File

@ -43,7 +43,7 @@
#define TEST2 1 #define TEST2 1
#define TEST3 0 #define TEST3 0
#define TEST4 true #define TEST4 true
#if ENABLED(TEST0) || !ENABLED(TEST2) || ENABLED(TEST3) #if ENABLED(TEST0) || !ENABLED(TEST2) || ENABLED(TEST3) || !ENABLED(TEST1, TEST2, TEST4)
#error "ENABLED is borked!" #error "ENABLED is borked!"
#endif #endif
#if BOTH(TEST0, TEST1) #if BOTH(TEST0, TEST1)

2
Marlin/src/lcd/marlinui.cpp
View File

@ -32,7 +32,7 @@
#include "../feature/host_actions.h" #include "../feature/host_actions.h"
#endif #endif
#if ENABLED(BROWSE_MEDIA_ON_INSERT, PASSWORD_ON_SD_PRINT_MENU) #if BOTH(BROWSE_MEDIA_ON_INSERT, PASSWORD_ON_SD_PRINT_MENU)
#include "../feature/password/password.h" #include "../feature/password/password.h"
#endif #endif