Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DGUS_LCD_CLASSIC supports DGUS_PREHEAT_UI, but currently cannot be enabled. #24066

Merged
merged 4 commits into from
Apr 22, 2022
+5 −3
Merged

DGUS_LCD_CLASSIC supports DGUS_PREHEAT_UI, but currently cannot be enabled. #24066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
72531c3
HAS_DGUS_LCD_CLASSIC has DGUS_PREHEAT_UI also
ellensp Apr 22, 2022
1ceb9b4
disable VP_E1_BED_PREHEAT on DGUS_LCD_UI_HIPRECY
ellensp Apr 22, 2022
2ef4a57
add a space for neatness
ellensp Apr 22, 2022
7a39502
tweak
thinkyhead Apr 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Marlin/src/inc/Conditionals_post.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 4 additions & 2 deletions Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,8 +629,10 @@ 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;
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
case 9: thermalManager.cooldown(); break; // Cool down
Expand Down