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

🩹 Fix lcd_preheat compile

Browse Source
This commit is contained in:
Scott Lahteine
2022-07-26 21:15:44 -05:00
parent cee9da6132
commit e7c262dc30
6 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
View File

@ -606,9 +606,11 @@ void DGUSScreenHandler::HandleHeaterControl(DGUS_VP_Variable &var, void *val_ptr
break;
#endif
case VP_BED_CONTROL:
preheat_temp = PREHEAT_1_TEMP_BED;
break;
#if HAS_HEATED_BED
case VP_BED_CONTROL:
preheat_temp = PREHEAT_1_TEMP_BED;
break;
#endif
}
*(int16_t*)var.memadr = *(int16_t*)var.memadr > 0 ? 0 : preheat_temp;

2
Marlin/src/lcd/extui/ui_api.cpp
View File

@ -1076,7 +1076,7 @@ namespace ExtUI {
void coolDown() { thermalManager.cooldown(); }
bool awaitingUserConfirm() {
return TERN0(HAS_RESUME_CONTINUE, wait_for_user) || getHostKeepaliveIsPaused();
return TERN0(HAS_RESUME_CONTINUE, wait_for_user) || TERN0(HOST_KEEPALIVE_FEATURE, getHostKeepaliveIsPaused());
}
void setUserConfirmed() { TERN_(HAS_RESUME_CONTINUE, wait_for_user = false); }