From 8ea172cafeed9d39afe5dbdda3aec6e876d9b513 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 19 Jan 2022 02:20:32 -0600
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Misc.=20style=20and=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Marlin/src/lcd/e3v2/common/dwin_api.cpp | 2 +-
Marlin/src/module/settings.cpp | 4 +---
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h | 2 +-
Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h | 2 +-
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h | 2 +-
Marlin/src/pins/stm32f1/pins_CREALITY_V4.h | 2 +-
Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h | 2 +-
7 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/Marlin/src/lcd/e3v2/common/dwin_api.cpp b/Marlin/src/lcd/e3v2/common/dwin_api.cpp
index d89b22a7aa7..f6780bba6c2 100644
--- a/Marlin/src/lcd/e3v2/common/dwin_api.cpp
+++ b/Marlin/src/lcd/e3v2/common/dwin_api.cpp
@@ -21,7 +21,7 @@
*/
#include "../../../inc/MarlinConfigPre.h"
-#if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
+#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
#include "dwin_api.h"
#include "dwin_set.h"
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 750aab74fda..baab8b6dec1 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -1990,9 +1990,7 @@ void MarlinSettings::postprocess() {
_FIELD_TEST(lcd_contrast);
uint8_t lcd_contrast;
EEPROM_READ(lcd_contrast);
- if (!validating) {
- TERN_(HAS_LCD_CONTRAST, ui.set_contrast(lcd_contrast));
- }
+ TERN_(HAS_LCD_CONTRAST, if (!validating) ui.set_contrast(lcd_contrast));
}
//
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
index 03a0360b6e8..df6ae8c0172 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -272,7 +272,7 @@
#define EXP2_09_PIN P0_15
#define EXP2_10_PIN P0_17
-#if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
+#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
// RET6 DWIN ENCODER LCD
#define BTN_ENC EXP1_06_PIN
diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
index 09161383619..56ee7fa7323 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
@@ -203,7 +203,7 @@
#define EXP1_09_PIN P0_16
#define EXP1_10_PIN P2_08
-#if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
+#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
#error "Ender-3 V2 display requires a custom cable with TX = P0_15, RX = P0_16. Comment out this line to continue."
/**
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
index bbf38e414fd..a8ba9049efe 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
@@ -136,7 +136,7 @@
#define EXP1_3 PB7
#endif
-#if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
+#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
/**
* ------ ------ ------
* (ENT) |10 9 | (BEEP) |10 9 | |10 9 |
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index cb7e784751a..dea20642b13 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -187,7 +187,7 @@
#error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
#endif
-#elif EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
+#elif HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
// RET6 DWIN ENCODER LCD
#define BTN_ENC PB14
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
index 4941949f811..6ec5de4ba31 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
@@ -216,7 +216,7 @@
#define BTN_EN1 EXP1_08_PIN
#define BTN_EN2 EXP1_06_PIN
-#elif EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
+#elif HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
// RET6 DWIN ENCODER LCD
#define BTN_ENC PB14