Skip to content

Commit 94e67a0

Browse files
committed
🐛 Fix compile with PREVENT_COLD_EXTRUSION off
1 parent c977e82 commit 94e67a0

File tree

3 files changed

+25
-12
lines changed

3 files changed

+25
-12
lines changed

Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,10 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
691691
VPHELPER(VP_X_PARK_POS, &mks_park_pos.x, ScreenHandler.GetParkPos_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
692692
VPHELPER(VP_Y_PARK_POS, &mks_park_pos.y, ScreenHandler.GetParkPos_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
693693
VPHELPER(VP_Z_PARK_POS, &mks_park_pos.z, ScreenHandler.GetParkPos_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
694-
VPHELPER(VP_MIN_EX_T, &thermalManager.extrude_min_temp, ScreenHandler.HandleGetExMinTemp_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
694+
695+
#if ENABLED(PREVENT_COLD_EXTRUSION)
696+
VPHELPER(VP_MIN_EX_T, &thermalManager.extrude_min_temp, ScreenHandler.HandleGetExMinTemp_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
697+
#endif
695698

696699
#if ENABLED(SENSORLESS_HOMING) // TMC SENSORLESS Setting
697700
#if AXIS_HAS_STEALTHCHOP(X)
@@ -743,7 +746,11 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
743746
VPHELPER(VP_ZOffset_Distance,nullptr ,ScreenHandler.GetZoffsetDistance, nullptr),
744747
VPHELPER(VP_MESH_LEVEL_ADJUST, nullptr, ScreenHandler.MeshLevelDistanceConfig, nullptr),
745748
VPHELPER(VP_MESH_LEVEL_POINT,nullptr, ScreenHandler.MeshLevel,nullptr),
746-
VPHELPER(VP_Min_EX_T_E, &thermalManager.extrude_min_temp, &ScreenHandler.GetMinExtrudeTemp, &ScreenHandler.DGUSLCD_SendWordValueToDisplay),
749+
750+
#if ENABLED(PREVENT_COLD_EXTRUSION)
751+
VPHELPER(VP_Min_EX_T_E, &thermalManager.extrude_min_temp, &ScreenHandler.GetMinExtrudeTemp, &ScreenHandler.DGUSLCD_SendWordValueToDisplay),
752+
#endif
753+
747754
VPHELPER(VP_AutoTurnOffSw, nullptr, &ScreenHandler.GetTurnOffCtrl, nullptr),
748755

749756
#if HOTENDS >= 1

Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ void DGUSScreenHandler::GetTurnOffCtrl(DGUS_VP_Variable &var, void *val_ptr) {
342342
void DGUSScreenHandler::GetMinExtrudeTemp(DGUS_VP_Variable &var, void *val_ptr) {
343343
DEBUG_ECHOLNPGM("GetMinExtrudeTemp");
344344
const uint16_t value = swap16(*(uint16_t *)val_ptr);
345-
thermalManager.extrude_min_temp = value;
345+
TERN_(PREVENT_COLD_EXTRUSION, thermalManager.extrude_min_temp = value);
346346
mks_min_extrusion_temp = value;
347347
settings.save();
348348
}
@@ -1083,11 +1083,13 @@ void DGUSScreenHandler::HandleAccChange_MKS(DGUS_VP_Variable &var, void *val_ptr
10831083
skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
10841084
}
10851085

1086-
void DGUSScreenHandler::HandleGetExMinTemp_MKS(DGUS_VP_Variable &var, void *val_ptr) {
1087-
const uint16_t value_ex_min_temp = swap16(*(uint16_t*)val_ptr);
1088-
thermalManager.extrude_min_temp = value_ex_min_temp;
1089-
skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
1090-
}
1086+
#if ENABLED(PREVENT_COLD_EXTRUSION)
1087+
void DGUSScreenHandler::HandleGetExMinTemp_MKS(DGUS_VP_Variable &var, void *val_ptr) {
1088+
const uint16_t value_ex_min_temp = swap16(*(uint16_t*)val_ptr);
1089+
thermalManager.extrude_min_temp = value_ex_min_temp;
1090+
skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
1091+
}
1092+
#endif
10911093

10921094
#if HAS_PID_HEATING
10931095
void DGUSScreenHandler::HandleTemperaturePIDChanged(DGUS_VP_Variable &var, void *val_ptr) {
@@ -1231,7 +1233,7 @@ void DGUSScreenHandler::MKS_FilamentLoadUnload(DGUS_VP_Variable &var, void *val_
12311233
break;
12321234
}
12331235

1234-
#if HAS_HOTEND
1236+
#if BOTH(HAS_HOTEND, PREVENT_COLD_EXTRUSION)
12351237
if (hotend_too_cold) {
12361238
if (thermalManager.targetTooColdToExtrude(hotend_too_cold - 1)) thermalManager.setTargetHotend(thermalManager.extrude_min_temp, hotend_too_cold - 1);
12371239
sendinfoscreen(PSTR("NOTICE"), nullptr, PSTR("Please wait."), PSTR("Nozzle heating!"), true, true, true, true);
@@ -1428,8 +1430,10 @@ bool DGUSScreenHandler::loop() {
14281430
#endif
14291431
#endif
14301432

1431-
if (mks_min_extrusion_temp != 0)
1432-
thermalManager.extrude_min_temp = mks_min_extrusion_temp;
1433+
#if ENABLED(PREVENT_COLD_EXTRUSION)
1434+
if (mks_min_extrusion_temp != 0)
1435+
thermalManager.extrude_min_temp = mks_min_extrusion_temp;
1436+
#endif
14331437

14341438
DGUS_ExtrudeLoadInit();
14351439

Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ class DGUSScreenHandler {
8282
static void GetZoffsetDistance(DGUS_VP_Variable &var, void *val_ptr);
8383
static void GetMinExtrudeTemp(DGUS_VP_Variable &var, void *val_ptr);
8484
static void GetParkPos_MKS(DGUS_VP_Variable &var, void *val_ptr);
85-
static void HandleGetExMinTemp_MKS(DGUS_VP_Variable &var, void *val_ptr);
85+
#if ENABLED(PREVENT_COLD_EXTRUSION)
86+
static void HandleGetExMinTemp_MKS(DGUS_VP_Variable &var, void *val_ptr);
87+
#endif
8688
static void DGUS_LanguageDisplay(uint8_t var);
8789
static void TMC_ChangeConfig(DGUS_VP_Variable &var, void *val_ptr);
8890
static void GetTurnOffCtrl(DGUS_VP_Variable &var, void *val_ptr);

0 commit comments

Comments
 (0)