Skip to content

Commit 2e4b037

Browse files
thinkyheadthinkyhead
committed
♻️ EITHER/BOTH => ANY/ALL
1 parent fa85e9e commit 2e4b037

File tree

296 files changed

+864
-864
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

296 files changed

+864
-864
lines changed

‎Marlin/src/HAL/AVR/MarlinSerial.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@
283283
static constexpr bool DROPPED_RX = false;
284284
static constexpr bool RX_FRAMING_ERRORS = false;
285285
static constexpr bool MAX_RX_QUEUED = false;
286-
static constexpr bool RX_OVERRUNS = BOTH(HAS_DGUS_LCD, SERIAL_STATS_RX_BUFFER_OVERRUNS);
286+
static constexpr bool RX_OVERRUNS = ALL(HAS_DGUS_LCD, SERIAL_STATS_RX_BUFFER_OVERRUNS);
287287
};
288288

289289
typedef Serial1Class< MarlinSerial< LCDSerialCfg<LCD_SERIAL_PORT> > > MSerialLCD;

‎Marlin/src/HAL/AVR/eeprom.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include "../../inc/MarlinConfig.h"
2525

26-
#if EITHER(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE)
26+
#if ANY(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE)
2727

2828
/**
2929
* PersistentStore for Arduino-style EEPROM interface

‎Marlin/src/HAL/AVR/inc/SanityCheck.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@
9595
/**
9696
* The Trinamic library includes SoftwareSerial.h, leading to a compile error.
9797
*/
98-
#if BOTH(HAS_TRINAMIC_CONFIG, ENDSTOP_INTERRUPTS_FEATURE)
98+
#if ALL(HAS_TRINAMIC_CONFIG, ENDSTOP_INTERRUPTS_FEATURE)
9999
#error "TMCStepper includes SoftwareSerial.h which is incompatible with ENDSTOP_INTERRUPTS_FEATURE. Disable ENDSTOP_INTERRUPTS_FEATURE to continue."
100100
#endif
101101

102-
#if BOTH(HAS_TMC_SW_SERIAL, MONITOR_DRIVER_STATUS)
102+
#if ALL(HAS_TMC_SW_SERIAL, MONITOR_DRIVER_STATUS)
103103
#error "MONITOR_DRIVER_STATUS causes performance issues when used with SoftwareSerial-connected drivers. Disable MONITOR_DRIVER_STATUS or use hardware serial to continue."
104104
#endif
105105

‎Marlin/src/HAL/DUE/HAL_SPI.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
// Public functions
4343
// ------------------------
4444

45-
#if EITHER(DUE_SOFTWARE_SPI, FORCE_SOFT_SPI)
45+
#if ANY(DUE_SOFTWARE_SPI, FORCE_SOFT_SPI)
4646

4747
// ------------------------
4848
// Software SPI

‎Marlin/src/HAL/DUE/inc/Conditionals_post.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323

2424
#if USE_FALLBACK_EEPROM
2525
#define FLASH_EEPROM_EMULATION
26-
#elif EITHER(I2C_EEPROM, SPI_EEPROM)
26+
#elif ANY(I2C_EEPROM, SPI_EEPROM)
2727
#define USE_SHARED_EEPROM 1
2828
#endif

‎Marlin/src/HAL/ESP32/HAL.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ void MarlinHAL::init_board() {
165165
}
166166

167167
void MarlinHAL::idletask() {
168-
#if BOTH(WIFISUPPORT, OTASUPPORT)
168+
#if ALL(WIFISUPPORT, OTASUPPORT)
169169
OTA_handle();
170170
#endif
171171
TERN_(ESP3D_WIFISUPPORT, esp3dlib.idletask());

‎Marlin/src/HAL/ESP32/inc/SanityCheck.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#error "TMC220x Software Serial is not supported on ESP32."
4141
#endif
4242

43-
#if BOTH(WIFISUPPORT, ESP3D_WIFISUPPORT)
43+
#if ALL(WIFISUPPORT, ESP3D_WIFISUPPORT)
4444
#error "Only enable one WiFi option, either WIFISUPPORT or ESP3D_WIFISUPPORT."
4545
#endif
4646

@@ -52,18 +52,18 @@
5252
#error "FAST_PWM_FAN is not available on TinyBee."
5353
#endif
5454

55-
#if BOTH(I2S_STEPPER_STREAM, BABYSTEPPING) && DISABLED(INTEGRATED_BABYSTEPPING)
55+
#if ALL(I2S_STEPPER_STREAM, BABYSTEPPING) && DISABLED(INTEGRATED_BABYSTEPPING)
5656
#error "BABYSTEPPING on I2S stream requires INTEGRATED_BABYSTEPPING."
5757
#endif
5858

5959
#if USING_PULLDOWNS
6060
#error "PULLDOWN pin mode is not available on ESP32 boards."
6161
#endif
6262

63-
#if BOTH(I2S_STEPPER_STREAM, LIN_ADVANCE) && DISABLED(EXPERIMENTAL_I2S_LA)
63+
#if ALL(I2S_STEPPER_STREAM, LIN_ADVANCE) && DISABLED(EXPERIMENTAL_I2S_LA)
6464
#error "I2S stream is currently incompatible with LIN_ADVANCE."
6565
#endif
6666

67-
#if BOTH(I2S_STEPPER_STREAM, PRINTCOUNTER) && PRINTCOUNTER_SAVE_INTERVAL > 0 && DISABLED(PRINTCOUNTER_SYNC)
67+
#if ALL(I2S_STEPPER_STREAM, PRINTCOUNTER) && PRINTCOUNTER_SAVE_INTERVAL > 0 && DISABLED(PRINTCOUNTER_SYNC)
6868
#error "PRINTCOUNTER_SAVE_INTERVAL may cause issues on ESP32 with an I2S expander. Define PRINTCOUNTER_SYNC in Configuration.h for an imperfect solution."
6969
#endif

‎Marlin/src/HAL/ESP32/ota.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#include "../../inc/MarlinConfigPre.h"
2424

25-
#if BOTH(WIFISUPPORT, OTASUPPORT)
25+
#if ALL(WIFISUPPORT, OTASUPPORT)
2626

2727
#include <WiFi.h>
2828
#include <ESPmDNS.h>

‎Marlin/src/HAL/ESP32/spiffs.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include "../../inc/MarlinConfigPre.h"
2525

26-
#if BOTH(WIFISUPPORT, WEBSUPPORT)
26+
#if ALL(WIFISUPPORT, WEBSUPPORT)
2727

2828
#include "../../core/serial.h"
2929

‎Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
#include "../../inc/MarlinConfig.h"
2727

28-
#if EITHER(MKS_MINI_12864, FYSETC_MINI_12864_2_1)
28+
#if ANY(MKS_MINI_12864, FYSETC_MINI_12864_2_1)
2929

3030
#include <U8glib-HAL.h>
3131
#include "../shared/HAL_SPI.h"
@@ -101,6 +101,6 @@ uint8_t u8g_eps_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_pt
101101
return 1;
102102
}
103103

104-
#endif // EITHER(MKS_MINI_12864, FYSETC_MINI_12864_2_1)
104+
#endif // ANY(MKS_MINI_12864, FYSETC_MINI_12864_2_1)
105105

106106
#endif // ARDUINO_ARCH_ESP32

‎Marlin/src/HAL/ESP32/web.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include "../../inc/MarlinConfigPre.h"
2525

26-
#if BOTH(WIFISUPPORT, WEBSUPPORT)
26+
#if ALL(WIFISUPPORT, WEBSUPPORT)
2727

2828
#include "../../inc/MarlinConfig.h"
2929

‎Marlin/src/HAL/LINUX/spi_pins.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "../../core/macros.h"
2525
#include "../../inc/MarlinConfigPre.h"
2626

27-
#if BOTH(HAS_MARLINUI_U8GLIB, SDSUPPORT) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_ENABLE == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
27+
#if ALL(HAS_MARLINUI_U8GLIB, SDSUPPORT) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_ENABLE == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
2828
#define SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
2929
// needed due to the speed and mode required for communicating with each device being different.
3030
// This requirement can be removed if the SPI access to these devices is updated to use

‎Marlin/src/HAL/LPC1768/inc/Conditionals_post.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#if USE_FALLBACK_EEPROM
2525
#define FLASH_EEPROM_EMULATION
26-
#elif EITHER(I2C_EEPROM, SPI_EEPROM)
26+
#elif ANY(I2C_EEPROM, SPI_EEPROM)
2727
#define USE_SHARED_EEPROM 1
2828
#endif
2929

‎Marlin/src/HAL/LPC1768/spi_pins.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include "../../core/macros.h"
2525

26-
#if BOTH(SDSUPPORT, HAS_MARLINUI_U8GLIB) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_ENABLE == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
26+
#if ALL(SDSUPPORT, HAS_MARLINUI_U8GLIB) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_ENABLE == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
2727
#define SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
2828
// needed due to the speed and mode required for communicating with each device being different.
2929
// This requirement can be removed if the SPI access to these devices is updated to use

‎Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ uint8_t swSpiTransfer_mode_3(uint8_t b, const uint8_t spi_speed, const pin_t sck
132132
static uint8_t SPI_speed = 0;
133133

134134
static void u8g_sw_spi_HAL_LPC1768_shift_out(uint8_t dataPin, uint8_t clockPin, uint8_t val) {
135-
#if EITHER(FYSETC_MINI_12864, MKS_MINI_12864)
135+
#if ANY(FYSETC_MINI_12864, MKS_MINI_12864)
136136
swSpiTransfer_mode_3(val, SPI_speed, clockPin, -1, dataPin);
137137
#else
138138
swSpiTransfer_mode_0(val, SPI_speed, clockPin, -1, dataPin);
@@ -160,7 +160,7 @@ uint8_t u8g_com_HAL_LPC1768_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val,
160160
break;
161161

162162
case U8G_COM_MSG_CHIP_SELECT:
163-
#if EITHER(FYSETC_MINI_12864, MKS_MINI_12864) // LCD SPI is running mode 3 while SD card is running mode 0
163+
#if ANY(FYSETC_MINI_12864, MKS_MINI_12864) // LCD SPI is running mode 3 while SD card is running mode 0
164164
if (arg_val) { // SCK idle state needs to be set to the proper idle state before
165165
// the next chip select goes active
166166
u8g_SetPILevel(u8g, U8G_PI_SCK, 1); // Set SCK to mode 3 idle state before CS goes active

‎Marlin/src/HAL/NATIVE_SIM/spi_pins.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "../../core/macros.h"
2525
#include "../../inc/MarlinConfigPre.h"
2626

27-
#if BOTH(HAS_MARLINUI_U8GLIB, SDSUPPORT) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_ENABLE == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
27+
#if ALL(HAS_MARLINUI_U8GLIB, SDSUPPORT) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_ENABLE == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
2828
#define SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
2929
// needed due to the speed and mode required for communicating with each device being different.
3030
// This requirement can be removed if the SPI access to these devices is updated to use

‎Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_sw_spi.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ static uint8_t swSpiInit(const uint8_t spi_speed, const uint8_t clk_pin, const u
131131
}
132132

133133
static void u8g_sw_spi_shift_out(uint8_t dataPin, uint8_t clockPin, uint8_t val) {
134-
#if EITHER(FYSETC_MINI_12864, MKS_MINI_12864)
134+
#if ANY(FYSETC_MINI_12864, MKS_MINI_12864)
135135
swSpiTransfer_mode_3(val, SPI_speed, clockPin, -1, dataPin);
136136
#else
137137
swSpiTransfer_mode_0(val, SPI_speed, clockPin, -1, dataPin);
@@ -159,7 +159,7 @@ uint8_t u8g_com_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_pt
159159
break;
160160

161161
case U8G_COM_MSG_CHIP_SELECT:
162-
#if EITHER(FYSETC_MINI_12864, MKS_MINI_12864) // LCD SPI is running mode 3 while SD card is running mode 0
162+
#if ANY(FYSETC_MINI_12864, MKS_MINI_12864) // LCD SPI is running mode 3 while SD card is running mode 0
163163
if (arg_val) { // SCK idle state needs to be set to the proper idle state before
164164
// the next chip select goes active
165165
u8g_SetPILevel(u8g, U8G_PI_SCK, 1); // Set SCK to mode 3 idle state before CS goes active

‎Marlin/src/HAL/SAMD21/HAL_SPI.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
// Public functions
4646
// --------------------------------------------------------------------------
4747

48-
#if EITHER(SOFTWARE_SPI, FORCE_SOFT_SPI)
48+
#if ANY(SOFTWARE_SPI, FORCE_SOFT_SPI)
4949

5050
// ------------------------
5151
// Software SPI

‎Marlin/src/HAL/SAMD21/inc/Conditionals_post.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828

2929
#if USE_FALLBACK_EEPROM
3030
#define FLASH_EEPROM_EMULATION
31-
#elif EITHER(I2C_EEPROM, SPI_EEPROM)
31+
#elif ANY(I2C_EEPROM, SPI_EEPROM)
3232
#define USE_SHARED_EEPROM 1
3333
#endif

‎Marlin/src/HAL/SAMD51/HAL_SPI.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
// Public functions
4545
// --------------------------------------------------------------------------
4646

47-
#if EITHER(SOFTWARE_SPI, FORCE_SOFT_SPI)
47+
#if ANY(SOFTWARE_SPI, FORCE_SOFT_SPI)
4848

4949
// ------------------------
5050
// Software SPI

‎Marlin/src/HAL/SAMD51/inc/Conditionals_post.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323

2424
#if USE_FALLBACK_EEPROM
2525
#define FLASH_EEPROM_EMULATION
26-
#elif EITHER(I2C_EEPROM, SPI_EEPROM)
26+
#elif ANY(I2C_EEPROM, SPI_EEPROM)
2727
#define USE_SHARED_EEPROM 1
2828
#endif

‎Marlin/src/HAL/STM32/inc/Conditionals_adv.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222
#pragma once
2323

24-
#if BOTH(SDSUPPORT, USBD_USE_CDC_MSC) && DISABLED(NO_SD_HOST_DRIVE)
24+
#if ALL(SDSUPPORT, USBD_USE_CDC_MSC) && DISABLED(NO_SD_HOST_DRIVE)
2525
#define HAS_SD_HOST_DRIVE 1
2626
#endif
2727

‎Marlin/src/HAL/STM32/inc/Conditionals_post.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
// If no real or emulated EEPROM selected, fall back to SD emulation
2525
#if USE_FALLBACK_EEPROM
2626
#define SDCARD_EEPROM_EMULATION
27-
#elif EITHER(I2C_EEPROM, SPI_EEPROM)
27+
#elif ANY(I2C_EEPROM, SPI_EEPROM)
2828
#define USE_SHARED_EEPROM 1
2929
#endif
3030

‎Marlin/src/HAL/STM32/usb_host.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
#include "../../inc/MarlinConfig.h"
2828

29-
#if BOTH(USE_OTG_USB_HOST, USBHOST)
29+
#if ALL(USE_OTG_USB_HOST, USBHOST)
3030

3131
#include "usb_host.h"
3232
#include "../shared/Marduino.h"

‎Marlin/src/HAL/STM32F1/HAL.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ void MarlinHAL::init() {
224224
#endif
225225
#if HAS_SD_HOST_DRIVE
226226
MSC_SD_init();
227-
#elif BOTH(SERIAL_USB, EMERGENCY_PARSER)
227+
#elif ALL(SERIAL_USB, EMERGENCY_PARSER)
228228
usb_cdcacm_set_hooks(USB_CDCACM_HOOK_RX, my_rx_callback);
229229
#endif
230230
#if PIN_EXISTS(USB_CONNECT)

‎Marlin/src/HAL/STM32F1/HAL.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
#define _MSERIAL(X) MSerial##X
8383
#define MSERIAL(X) _MSERIAL(X)
8484

85-
#if EITHER(STM32_HIGH_DENSITY, STM32_XL_DENSITY)
85+
#if ANY(STM32_HIGH_DENSITY, STM32_XL_DENSITY)
8686
#define NUM_UARTS 5
8787
#else
8888
#define NUM_UARTS 3

‎Marlin/src/HAL/STM32F1/MarlinSerial.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ constexpr bool serial_handles_emergency(int port) {
116116
#endif
117117
DEFINE_HWSERIAL_MARLIN(MSerial2, 2);
118118
DEFINE_HWSERIAL_MARLIN(MSerial3, 3);
119-
#if EITHER(STM32_HIGH_DENSITY, STM32_XL_DENSITY)
119+
#if ANY(STM32_HIGH_DENSITY, STM32_XL_DENSITY)
120120
DEFINE_HWSERIAL_UART_MARLIN(MSerial4, 4);
121121
DEFINE_HWSERIAL_UART_MARLIN(MSerial5, 5);
122122
#endif

‎Marlin/src/HAL/STM32F1/MarlinSerial.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ typedef Serial1Class<MarlinSerial> MSerialT;
5252
extern MSerialT MSerial1;
5353
extern MSerialT MSerial2;
5454
extern MSerialT MSerial3;
55-
#if EITHER(STM32_HIGH_DENSITY, STM32_XL_DENSITY)
55+
#if ANY(STM32_HIGH_DENSITY, STM32_XL_DENSITY)
5656
extern MSerialT MSerial4;
5757
extern MSerialT MSerial5;
5858
#endif

‎Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#include "../../../inc/MarlinConfig.h"
2626

27-
#if BOTH(HAS_MARLINUI_U8GLIB, FORCE_SOFT_SPI)
27+
#if ALL(HAS_MARLINUI_U8GLIB, FORCE_SOFT_SPI)
2828

2929
#include <U8glib-HAL.h>
3030
#include "../../shared/HAL_SPI.h"

‎Marlin/src/HAL/STM32F1/inc/Conditionals_post.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation
2525
#if USE_FALLBACK_EEPROM
2626
#define SDCARD_EEPROM_EMULATION
27-
#elif EITHER(I2C_EEPROM, SPI_EEPROM)
27+
#elif ANY(I2C_EEPROM, SPI_EEPROM)
2828
#define USE_SHARED_EEPROM 1
2929
#endif
3030

‎Marlin/src/HAL/STM32F1/pinsDebug.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ static void pwm_details(const pin_t pin) {
9898
timer_dev * const tdev = PIN_MAP[pin].timer_device;
9999
const uint8_t channel = PIN_MAP[pin].timer_channel;
100100
const char num = (
101-
#if EITHER(STM32_HIGH_DENSITY, STM32_XL_DENSITY)
101+
#if ANY(STM32_HIGH_DENSITY, STM32_XL_DENSITY)
102102
tdev == &timer8 ? '8' :
103103
tdev == &timer5 ? '5' :
104104
#endif

‎Marlin/src/HAL/STM32F1/sdio.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
#include "../../inc/MarlinConfig.h" // Allow pins/pins.h to set density
2828

29-
#if EITHER(STM32_HIGH_DENSITY, STM32_XL_DENSITY)
29+
#if ANY(STM32_HIGH_DENSITY, STM32_XL_DENSITY)
3030

3131
#include "sdio.h"
3232

‎Marlin/src/HAL/shared/HAL_ST7920.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* (bypassing U8G), it will allow the LIGHTWEIGHT_UI to operate.
2828
*/
2929

30-
#if BOTH(HAS_MARLINUI_U8GLIB, LIGHTWEIGHT_UI)
30+
#if ALL(HAS_MARLINUI_U8GLIB, LIGHTWEIGHT_UI)
3131
void ST7920_cs();
3232
void ST7920_ncs();
3333
void ST7920_set_cmd();

‎Marlin/src/HAL/shared/eeprom_api.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
#include "../../inc/MarlinConfigPre.h"
2424

25-
#if EITHER(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE)
25+
#if ANY(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE)
2626

2727
#include "eeprom_api.h"
2828
PersistentStore persistentStore;

0 commit comments

Comments
 (0)