Browse Source

🐛 Fix compile with PREVENT_COLD_EXTRUSION off

Scott Lahteine 3 years ago
parent
commit
8f0f6c1ac1

+ 9
- 2
Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp View File

@@ -691,7 +691,10 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
691 691
   VPHELPER(VP_X_PARK_POS, &mks_park_pos.x, ScreenHandler.GetParkPos_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
692 692
   VPHELPER(VP_Y_PARK_POS, &mks_park_pos.y, ScreenHandler.GetParkPos_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
693 693
   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
695 698
 
696 699
   #if ENABLED(SENSORLESS_HOMING)  // TMC SENSORLESS Setting
697 700
     #if AXIS_HAS_STEALTHCHOP(X)
@@ -743,7 +746,11 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
743 746
   VPHELPER(VP_ZOffset_Distance,nullptr ,ScreenHandler.GetZoffsetDistance, nullptr),
744 747
   VPHELPER(VP_MESH_LEVEL_ADJUST, nullptr, ScreenHandler.MeshLevelDistanceConfig, nullptr),
745 748
   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
+
747 754
   VPHELPER(VP_AutoTurnOffSw, nullptr, &ScreenHandler.GetTurnOffCtrl, nullptr),
748 755
 
749 756
   #if HOTENDS >= 1

+ 13
- 9
Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp View File

@@ -342,7 +342,7 @@ void DGUSScreenHandler::GetTurnOffCtrl(DGUS_VP_Variable &var, void *val_ptr) {
342 342
 void DGUSScreenHandler::GetMinExtrudeTemp(DGUS_VP_Variable &var, void *val_ptr) {
343 343
   DEBUG_ECHOLNPGM("GetMinExtrudeTemp");
344 344
   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);
346 346
   mks_min_extrusion_temp = value;
347 347
   settings.save();
348 348
 }
@@ -1083,11 +1083,13 @@ void DGUSScreenHandler::HandleAccChange_MKS(DGUS_VP_Variable &var, void *val_ptr
1083 1083
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
1084 1084
 }
1085 1085
 
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
1091 1093
 
1092 1094
 #if HAS_PID_HEATING
1093 1095
   void DGUSScreenHandler::HandleTemperaturePIDChanged(DGUS_VP_Variable &var, void *val_ptr) {
@@ -1231,7 +1233,7 @@ void DGUSScreenHandler::MKS_FilamentLoadUnload(DGUS_VP_Variable &var, void *val_
1231 1233
       break;
1232 1234
   }
1233 1235
 
1234
-  #if HAS_HOTEND
1236
+  #if BOTH(HAS_HOTEND, PREVENT_COLD_EXTRUSION)
1235 1237
     if (hotend_too_cold) {
1236 1238
       if (thermalManager.targetTooColdToExtrude(hotend_too_cold - 1)) thermalManager.setTargetHotend(thermalManager.extrude_min_temp, hotend_too_cold - 1);
1237 1239
       sendinfoscreen(PSTR("NOTICE"), nullptr, PSTR("Please wait."), PSTR("Nozzle heating!"), true, true, true, true);
@@ -1428,8 +1430,10 @@ bool DGUSScreenHandler::loop() {
1428 1430
         #endif
1429 1431
       #endif
1430 1432
 
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
1433 1437
 
1434 1438
       DGUS_ExtrudeLoadInit();
1435 1439
 

+ 3
- 1
Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h View File

@@ -82,7 +82,9 @@ public:
82 82
   static void GetZoffsetDistance(DGUS_VP_Variable &var, void *val_ptr);
83 83
   static void GetMinExtrudeTemp(DGUS_VP_Variable &var, void *val_ptr);
84 84
   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
86 88
   static void DGUS_LanguageDisplay(uint8_t var);
87 89
   static void TMC_ChangeConfig(DGUS_VP_Variable &var, void *val_ptr);
88 90
   static void GetTurnOffCtrl(DGUS_VP_Variable &var, void *val_ptr);

Loading…
Cancel
Save