From 72531c36480202f0d0dff84d0dbdd620bd5dafd5 Mon Sep 17 00:00:00 2001 From: ellensp <530024+ellensp@users.noreply.github.com> Date: Fri, 22 Apr 2022 13:18:40 +1200 Subject: [PATCH 1/4] HAS_DGUS_LCD_CLASSIC has DGUS_PREHEAT_UI also --- Marlin/src/inc/Conditionals_post.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index ada2a512b527..9e6c8b7735fd 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -3295,7 +3295,7 @@ #define HAS_TEMPERATURE 1 #endif -#if HAS_TEMPERATURE && EITHER(HAS_MARLINUI_MENU, HAS_DWIN_E3V2) +#if HAS_TEMPERATURE && ANY(HAS_MARLINUI_MENU, HAS_DWIN_E3V2,HAS_DGUS_LCD_CLASSIC) #ifdef PREHEAT_6_LABEL #define PREHEAT_COUNT 6 #elif defined(PREHEAT_5_LABEL) From 1ceb9b40f78f8bfef7b29043cbaf985a8776a26d Mon Sep 17 00:00:00 2001 From: ellensp <530024+ellensp@users.noreply.github.com> Date: Fri, 22 Apr 2022 13:20:03 +1200 Subject: [PATCH 2/4] disable VP_E1_BED_PREHEAT on DGUS_LCD_UI_HIPRECY --- Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp index 9b25f8aeb13f..36d271e3dfa8 100644 --- a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp +++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp @@ -630,7 +630,9 @@ void DGUSScreenHandler::HandleHeaterControl(DGUS_VP_Variable &var, void *val_ptr switch (var.VP) { default: return; case VP_E0_BED_PREHEAT: TERN_(HAS_HOTEND, ui.preheat_all(0)); break; - case VP_E1_BED_PREHEAT: TERN_(HAS_MULTI_HOTEND, ui.preheat_all(1)); break; + #if DISABLED(DGUS_LCD_UI_HIPRECY) + case VP_E1_BED_PREHEAT: TERN_(HAS_MULTI_HOTEND, ui.preheat_all(1)); break; + #endif } case 7: break; // Custom preheat case 9: thermalManager.cooldown(); break; // Cool down From 2ef4a5797d944fbc2acd00909a1fd7263e38b5cd Mon Sep 17 00:00:00 2001 From: ellensp <530024+ellensp@users.noreply.github.com> Date: Fri, 22 Apr 2022 13:31:23 +1200 Subject: [PATCH 3/4] add a space for neatness --- Marlin/src/inc/Conditionals_post.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index 9e6c8b7735fd..e1de8b28b06c 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -3295,7 +3295,7 @@ #define HAS_TEMPERATURE 1 #endif -#if HAS_TEMPERATURE && ANY(HAS_MARLINUI_MENU, HAS_DWIN_E3V2,HAS_DGUS_LCD_CLASSIC) +#if HAS_TEMPERATURE && ANY(HAS_MARLINUI_MENU, HAS_DWIN_E3V2, HAS_DGUS_LCD_CLASSIC) #ifdef PREHEAT_6_LABEL #define PREHEAT_COUNT 6 #elif defined(PREHEAT_5_LABEL) From 7a395024e1dcb8e3e332ab77f9a9e106290e11a4 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 22 Apr 2022 05:18:02 -0500 Subject: [PATCH 4/4] tweak --- Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp index 36d271e3dfa8..46d3506254a1 100644 --- a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp +++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp @@ -629,9 +629,9 @@ void DGUSScreenHandler::HandleHeaterControl(DGUS_VP_Variable &var, void *val_ptr default: switch (var.VP) { default: return; - case VP_E0_BED_PREHEAT: TERN_(HAS_HOTEND, ui.preheat_all(0)); break; - #if DISABLED(DGUS_LCD_UI_HIPRECY) - case VP_E1_BED_PREHEAT: TERN_(HAS_MULTI_HOTEND, ui.preheat_all(1)); break; + case VP_E0_BED_PREHEAT: TERN_(HAS_HOTEND, ui.preheat_all(0)); break; + #if DISABLED(DGUS_LCD_UI_HIPRECY) && HAS_MULTI_HOTEND + case VP_E1_BED_PREHEAT: ui.preheat_all(1); break; #endif } case 7: break; // Custom preheat