From 8a400b160205b8cc3657f7c9e63b62a2bb5a0747 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 7 Jan 2023 22:59:25 -0600 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20DGUS=5FLCD=5FUI=20version=20chec?= =?UTF-8?q?k?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/MarlinCore.cpp | 2 +- Marlin/src/gcode/gcode.cpp | 2 +- Marlin/src/gcode/gcode.h | 2 +- Marlin/src/gcode/sd/M24_M25.cpp | 4 ++-- Marlin/src/inc/Conditionals_LCD.h | 14 +++++++------- Marlin/src/inc/SanityCheck.h | 2 ++ Marlin/src/lcd/extui/dgus/DGUSDisplayDef.h | 8 ++++---- Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h | 8 ++++---- .../src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp | 2 +- .../lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp | 2 +- .../src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp | 2 +- .../lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp | 2 +- Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp | 2 +- .../src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp | 2 +- .../src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp | 2 +- .../lcd/extui/dgus/origin/DGUSScreenHandler.cpp | 2 +- Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp | 2 +- .../src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp | 2 +- .../lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp | 2 +- .../lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp | 2 +- .../src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp | 2 +- .../definition/DGUS_ScreenAddrList.cpp | 2 +- .../dgus_reloaded/definition/DGUS_ScreenSetup.cpp | 2 +- .../extui/dgus_reloaded/definition/DGUS_VPList.cpp | 2 +- .../extui/dgus_reloaded/dgus_reloaded_extui.cpp | 2 +- Marlin/src/lcd/extui/ia_creality/FileNavigator.cpp | 2 +- .../src/lcd/extui/ia_creality/creality_extui.cpp | 2 +- Marlin/src/module/settings.cpp | 8 ++++---- 28 files changed, 45 insertions(+), 43 deletions(-) diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp index ea57e3ccd7829..676d230d35ea1 100644 --- a/Marlin/src/MarlinCore.cpp +++ b/Marlin/src/MarlinCore.cpp @@ -232,7 +232,7 @@ #include "feature/password/password.h" #endif -#if ENABLED(DGUS_LCD_UI_MKS) +#if DGUS_LCD_UI_MKS #include "lcd/extui/dgus/DGUSScreenHandler.h" #endif diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp index bb859d8026419..f08ade8c38358 100644 --- a/Marlin/src/gcode/gcode.cpp +++ b/Marlin/src/gcode/gcode.cpp @@ -1081,7 +1081,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) { case 1001: M1001(); break; // M1001: [INTERNAL] Handle SD completion #endif - #if ENABLED(DGUS_LCD_UI_MKS) + #if DGUS_LCD_UI_MKS case 1002: M1002(); break; // M1002: [INTERNAL] Tool-change and Relative E Move #endif diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h index 5d56e53dd5e04..b50d8363a4cf5 100644 --- a/Marlin/src/gcode/gcode.h +++ b/Marlin/src/gcode/gcode.h @@ -1226,7 +1226,7 @@ class GcodeSuite { static void M1001(); #endif - #if ENABLED(DGUS_LCD_UI_MKS) + #if DGUS_LCD_UI_MKS static void M1002(); #endif diff --git a/Marlin/src/gcode/sd/M24_M25.cpp b/Marlin/src/gcode/sd/M24_M25.cpp index 64ac0cce09fd1..847af65b12083 100644 --- a/Marlin/src/gcode/sd/M24_M25.cpp +++ b/Marlin/src/gcode/sd/M24_M25.cpp @@ -41,7 +41,7 @@ #include "../../feature/powerloss.h" #endif -#if ENABLED(DGUS_LCD_UI_MKS) +#if DGUS_LCD_UI_MKS #include "../../lcd/extui/dgus/DGUSDisplayDef.h" #endif @@ -52,7 +52,7 @@ */ void GcodeSuite::M24() { - #if ENABLED(DGUS_LCD_UI_MKS) + #if DGUS_LCD_UI_MKS if ((print_job_timer.isPaused() || print_job_timer.isRunning()) && !parser.seen("ST")) MKS_resume_print_move(); #endif diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h index 40b8ffcbc99f9..79568fb625640 100644 --- a/Marlin/src/inc/Conditionals_LCD.h +++ b/Marlin/src/inc/Conditionals_LCD.h @@ -36,19 +36,19 @@ #define FYSETC_MINI_12864_2_1 #endif -// Updated DGUS_UI shorthand single option can be used, or old settings, for now +// Old settings are now conditional on DGUS_LCD_UI #if DGUS_UI_IS(ORIGIN) - #define DGUS_LCD_UI_ORIGIN + #define DGUS_LCD_UI_ORIGIN 1 #elif DGUS_UI_IS(FYSETC) - #define DGUS_LCD_UI_FYSETC + #define DGUS_LCD_UI_FYSETC 1 #elif DGUS_UI_IS(HIPRECY) - #define DGUS_LCD_UI_HIPRECY + #define DGUS_LCD_UI_HIPRECY 1 #elif DGUS_UI_IS(MKS) - #define DGUS_LCD_UI_MKS + #define DGUS_LCD_UI_MKS 1 #elif DGUS_UI_IS(RELOADED) - #define DGUS_LCD_UI_RELOADED + #define DGUS_LCD_UI_RELOADED 1 #elif DGUS_UI_IS(IA_CREALITY) - #define DGUS_LCD_UI_IA_CREALITY + #define DGUS_LCD_UI_IA_CREALITY 1 #endif /** diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index b2797e66fc7d6..a7a1d2c9ab5a6 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -656,6 +656,8 @@ #error "EXTRA_LIN_ADVANCE_K is now ADVANCE_K_EXTRA." #elif defined(POLAR_SEGMENTS_PER_SECOND) || defined(DELTA_SEGMENTS_PER_SECOND) || defined(SCARA_SEGMENTS_PER_SECOND) || defined(TPARA_SEGMENTS_PER_SECOND) #error "(POLAR|DELTA|SCARA|TPARA)_SEGMENTS_PER_SECOND is now DEFAULT_SEGMENTS_PER_SECOND." +#elif ANY(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY, DGUS_LCD_UI_MKS, DGUS_LCD_UI_RELOADED) && !defined(DGUS_LCD_UI) + #error "DGUS_LCD_UI_[TYPE] is now set using DGUS_LCD_UI TYPE." #endif // L64xx stepper drivers have been removed diff --git a/Marlin/src/lcd/extui/dgus/DGUSDisplayDef.h b/Marlin/src/lcd/extui/dgus/DGUSDisplayDef.h index 9cbcf0dd7b126..8403e29e56449 100644 --- a/Marlin/src/lcd/extui/dgus/DGUSDisplayDef.h +++ b/Marlin/src/lcd/extui/dgus/DGUSDisplayDef.h @@ -46,12 +46,12 @@ extern const struct DGUS_VP_Variable ListOfVP[]; #include "../../../inc/MarlinConfig.h" -#if ENABLED(DGUS_LCD_UI_ORIGIN) +#if DGUS_LCD_UI_ORIGIN #include "origin/DGUSDisplayDef.h" -#elif ENABLED(DGUS_LCD_UI_MKS) +#elif DGUS_LCD_UI_MKS #include "mks/DGUSDisplayDef.h" -#elif ENABLED(DGUS_LCD_UI_FYSETC) +#elif DGUS_LCD_UI_FYSETC #include "fysetc/DGUSDisplayDef.h" -#elif ENABLED(DGUS_LCD_UI_HIPRECY) +#elif DGUS_LCD_UI_HIPRECY #include "hiprecy/DGUSDisplayDef.h" #endif diff --git a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h index 575a71d2892f3..4486105d3c4a0 100644 --- a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h +++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h @@ -46,13 +46,13 @@ #define BE16_P(V) ( ((uint8_t*)(V))[0] << 8U | ((uint8_t*)(V))[1] ) #define BE32_P(V) ( ((uint8_t*)(V))[0] << 24U | ((uint8_t*)(V))[1] << 16U | ((uint8_t*)(V))[2] << 8U | ((uint8_t*)(V))[3] ) -#if ENABLED(DGUS_LCD_UI_ORIGIN) +#if DGUS_LCD_UI_ORIGIN #include "origin/DGUSScreenHandler.h" -#elif ENABLED(DGUS_LCD_UI_MKS) +#elif DGUS_LCD_UI_MKS #include "mks/DGUSScreenHandler.h" -#elif ENABLED(DGUS_LCD_UI_FYSETC) +#elif DGUS_LCD_UI_FYSETC #include "fysetc/DGUSScreenHandler.h" -#elif ENABLED(DGUS_LCD_UI_HIPRECY) +#elif DGUS_LCD_UI_HIPRECY #include "hiprecy/DGUSScreenHandler.h" #endif diff --git a/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp index 0e825c9e7c336..3e731de438cb8 100644 --- a/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp +++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp @@ -24,7 +24,7 @@ #include "../../../../inc/MarlinConfigPre.h" -#if ENABLED(DGUS_LCD_UI_FYSETC) +#if DGUS_LCD_UI_FYSETC #include "DGUSDisplayDef.h" #include "../DGUSDisplay.h" diff --git a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp index 1f72c685fb81c..b68f72a1fb511 100644 --- a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp +++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp @@ -22,7 +22,7 @@ #include "../../../../inc/MarlinConfigPre.h" -#if ENABLED(DGUS_LCD_UI_FYSETC) +#if DGUS_LCD_UI_FYSETC #include "../DGUSScreenHandler.h" diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp index 6e4c76ca68df3..a348a1f9a11c3 100644 --- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp +++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp @@ -24,7 +24,7 @@ #include "../../../../inc/MarlinConfigPre.h" -#if ENABLED(DGUS_LCD_UI_HIPRECY) +#if DGUS_LCD_UI_HIPRECY #include "DGUSDisplayDef.h" #include "../DGUSDisplay.h" diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp index f04bef2fd8dae..475a03307eeb5 100644 --- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp +++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp @@ -22,7 +22,7 @@ #include "../../../../inc/MarlinConfigPre.h" -#if ENABLED(DGUS_LCD_UI_HIPRECY) +#if DGUS_LCD_UI_HIPRECY #include "../DGUSScreenHandler.h" diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp index ae8d9565e3f57..40f6a349d5863 100644 --- a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp +++ b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp @@ -22,7 +22,7 @@ #include "../../../../inc/MarlinConfigPre.h" -#if ENABLED(DGUS_LCD_UI_MKS) +#if DGUS_LCD_UI_MKS #include "DGUSDisplayDef.h" #include "../DGUSDisplay.h" diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp index 36ab016b35a68..882cfadcd2ac5 100644 --- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp +++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp @@ -22,7 +22,7 @@ #include "../../../../inc/MarlinConfigPre.h" -#if ENABLED(DGUS_LCD_UI_MKS) +#if DGUS_LCD_UI_MKS #include "../DGUSScreenHandler.h" diff --git a/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp index 0115d3b8c13b4..004b453e6e2b4 100644 --- a/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp +++ b/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp @@ -26,7 +26,7 @@ #include "../../../../inc/MarlinConfigPre.h" -#if ENABLED(DGUS_LCD_UI_ORIGIN) +#if DGUS_LCD_UI_ORIGIN #include "DGUSDisplayDef.h" #include "../DGUSDisplay.h" diff --git a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp index aaa8b72e11822..55be3777e1083 100644 --- a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp +++ b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp @@ -22,7 +22,7 @@ #include "../../../../inc/MarlinConfigPre.h" -#if ENABLED(DGUS_LCD_UI_ORIGIN) +#if DGUS_LCD_UI_ORIGIN #include "../DGUSScreenHandler.h" diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp index 15b3f5adcde4d..df22407c0f41e 100644 --- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp +++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp @@ -24,7 +24,7 @@ #include "../../../inc/MarlinConfigPre.h" -#if ENABLED(DGUS_LCD_UI_RELOADED) +#if DGUS_LCD_UI_RELOADED #include "DGUSDisplay.h" diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp index ce03ab6b8340e..2b750df9c9cad 100644 --- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp +++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp @@ -22,7 +22,7 @@ #include "../../../inc/MarlinConfigPre.h" -#if ENABLED(DGUS_LCD_UI_RELOADED) +#if DGUS_LCD_UI_RELOADED #include "DGUSRxHandler.h" diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp index 0b584fac3bcee..4d758ae5ef741 100644 --- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp +++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp @@ -22,7 +22,7 @@ #include "../../../inc/MarlinConfigPre.h" -#if ENABLED(DGUS_LCD_UI_RELOADED) +#if DGUS_LCD_UI_RELOADED #include "DGUSScreenHandler.h" diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp index 090d53c92e77c..4caccc0717684 100644 --- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp +++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp @@ -22,7 +22,7 @@ #include "../../../inc/MarlinConfigPre.h" -#if ENABLED(DGUS_LCD_UI_RELOADED) +#if DGUS_LCD_UI_RELOADED #include "DGUSSetupHandler.h" diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp index 1837a0c93ab27..47603052e966e 100644 --- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp +++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp @@ -22,7 +22,7 @@ #include "../../../inc/MarlinConfigPre.h" -#if ENABLED(DGUS_LCD_UI_RELOADED) +#if DGUS_LCD_UI_RELOADED #include "DGUSTxHandler.h" diff --git a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenAddrList.cpp b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenAddrList.cpp index 1627d44c84662..855c0bccfa133 100644 --- a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenAddrList.cpp +++ b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenAddrList.cpp @@ -22,7 +22,7 @@ #include "../../../../inc/MarlinConfigPre.h" -#if ENABLED(DGUS_LCD_UI_RELOADED) +#if DGUS_LCD_UI_RELOADED #include "DGUS_ScreenAddrList.h" diff --git a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenSetup.cpp b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenSetup.cpp index 13319edd0595c..a9f13b5ee54c7 100644 --- a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenSetup.cpp +++ b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenSetup.cpp @@ -22,7 +22,7 @@ #include "../../../../inc/MarlinConfigPre.h" -#if ENABLED(DGUS_LCD_UI_RELOADED) +#if DGUS_LCD_UI_RELOADED #include "DGUS_ScreenSetup.h" diff --git a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.cpp b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.cpp index e77aa4501165a..faa6a0d23556d 100644 --- a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.cpp +++ b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.cpp @@ -22,7 +22,7 @@ #include "../../../../inc/MarlinConfigPre.h" -#if ENABLED(DGUS_LCD_UI_RELOADED) +#if DGUS_LCD_UI_RELOADED #include "DGUS_VPList.h" diff --git a/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp b/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp index f6f2c0f89df9f..1ff22da2687bb 100644 --- a/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp +++ b/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp @@ -26,7 +26,7 @@ #include "../../../inc/MarlinConfigPre.h" -#if ENABLED(DGUS_LCD_UI_RELOADED) +#if DGUS_LCD_UI_RELOADED #include "../ui_api.h" #include "DGUSScreenHandler.h" diff --git a/Marlin/src/lcd/extui/ia_creality/FileNavigator.cpp b/Marlin/src/lcd/extui/ia_creality/FileNavigator.cpp index 7a191e906ac66..cdde3c4f6b51f 100644 --- a/Marlin/src/lcd/extui/ia_creality/FileNavigator.cpp +++ b/Marlin/src/lcd/extui/ia_creality/FileNavigator.cpp @@ -31,7 +31,7 @@ #include "../../../inc/MarlinConfigPre.h" -#if ENABLED(DGUS_LCD_UI_IA_CREALITY) +#if DGUS_LCD_UI_IA_CREALITY #include "FileNavigator.h" diff --git a/Marlin/src/lcd/extui/ia_creality/creality_extui.cpp b/Marlin/src/lcd/extui/ia_creality/creality_extui.cpp index 874e46b3d665d..d9e3cb587703f 100644 --- a/Marlin/src/lcd/extui/ia_creality/creality_extui.cpp +++ b/Marlin/src/lcd/extui/ia_creality/creality_extui.cpp @@ -32,7 +32,7 @@ #include "../../../inc/MarlinConfigPre.h" -#if ENABLED(DGUS_LCD_UI_IA_CREALITY) +#if DGUS_LCD_UI_IA_CREALITY #include "creality_extui.h" #include "FileNavigator.h" diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp index 1b6f1574796fb..afdbf3d10342e 100644 --- a/Marlin/src/module/settings.cpp +++ b/Marlin/src/module/settings.cpp @@ -166,7 +166,7 @@ #include "../feature/fancheck.h" #endif -#if ENABLED(DGUS_LCD_UI_MKS) +#if DGUS_LCD_UI_MKS #include "../lcd/extui/dgus/DGUSScreenHandler.h" #include "../lcd/extui/dgus/DGUSDisplayDef.h" #endif @@ -569,7 +569,7 @@ typedef struct SettingsDataStruct { // // MKS UI controller // - #if ENABLED(DGUS_LCD_UI_MKS) + #if DGUS_LCD_UI_MKS MKS_Language mks_language_index; // Display Language xy_int_t mks_corner_offsets[5]; // Bed Tramming xyz_int_t mks_park_pos; // Custom Parking (without NOZZLE_PARK) @@ -1614,7 +1614,7 @@ void MarlinSettings::postprocess() { // // MKS UI controller // - #if ENABLED(DGUS_LCD_UI_MKS) + #if DGUS_LCD_UI_MKS EEPROM_WRITE(mks_language_index); EEPROM_WRITE(mks_corner_offsets); EEPROM_WRITE(mks_park_pos); @@ -2602,7 +2602,7 @@ void MarlinSettings::postprocess() { // // MKS UI controller // - #if ENABLED(DGUS_LCD_UI_MKS) + #if DGUS_LCD_UI_MKS _FIELD_TEST(mks_language_index); EEPROM_READ(mks_language_index); EEPROM_READ(mks_corner_offsets);