bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🎨 Misc. style and cleanup

Browse Source
This commit is contained in:
Scott Lahteine 2022-01-19 02:20:32 -06:00
parent 7b4f5108ac
commit 8ea172cafe
7 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/lcd/e3v2/common/dwin_api.cpp
View File

@ -21,7 +21,7 @@
*/ */
#include "../../../inc/MarlinConfigPre.h" #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_api.h"
#include "dwin_set.h" #include "dwin_set.h"

4
Marlin/src/module/settings.cpp
View File

@ -1990,9 +1990,7 @@ void MarlinSettings::postprocess() {
_FIELD_TEST(lcd_contrast); _FIELD_TEST(lcd_contrast);
uint8_t lcd_contrast; uint8_t lcd_contrast;
EEPROM_READ(lcd_contrast); EEPROM_READ(lcd_contrast);
if (!validating) { TERN_(HAS_LCD_CONTRAST, if (!validating) ui.set_contrast(lcd_contrast));
TERN_(HAS_LCD_CONTRAST, ui.set_contrast(lcd_contrast));
}
} }
// //

2
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
View File

@ -272,7 +272,7 @@
#define EXP2_09_PIN P0_15 #define EXP2_09_PIN P0_15
#define EXP2_10_PIN P0_17 #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 // RET6 DWIN ENCODER LCD
#define BTN_ENC EXP1_06_PIN #define BTN_ENC EXP1_06_PIN

2
Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
View File

@ -203,7 +203,7 @@
#define EXP1_09_PIN P0_16 #define EXP1_09_PIN P0_16
#define EXP1_10_PIN P2_08 #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." #error "Ender-3 V2 display requires a custom cable with TX = P0_15, RX = P0_16. Comment out this line to continue."
/** /**

2
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
View File

@ -136,7 +136,7 @@
#define EXP1_3 PB7 #define EXP1_3 PB7
#endif #endif
#if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI) #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
/** /**
* ------ ------ ------ * ------ ------ ------
* (ENT) |10 9 | (BEEP) |10 9 | |10 9 | * (ENT) |10 9 | (BEEP) |10 9 | |10 9 |

2
Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
View File

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

2
Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
View File

@ -216,7 +216,7 @@
#define BTN_EN1 EXP1_08_PIN #define BTN_EN1 EXP1_08_PIN
#define BTN_EN2 EXP1_06_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 // RET6 DWIN ENCODER LCD
#define BTN_ENC PB14 #define BTN_ENC PB14