Browse Source

🐛 Fix compile with PREVENT_COLD_EXTRUSION off

Scott Lahteine 4 years ago
parent
commit
8f0f6c1ac1

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

691
   VPHELPER(VP_X_PARK_POS, &mks_park_pos.x, ScreenHandler.GetParkPos_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
691
   VPHELPER(VP_X_PARK_POS, &mks_park_pos.x, ScreenHandler.GetParkPos_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
692
   VPHELPER(VP_Y_PARK_POS, &mks_park_pos.y, ScreenHandler.GetParkPos_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
692
   VPHELPER(VP_Y_PARK_POS, &mks_park_pos.y, ScreenHandler.GetParkPos_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
693
   VPHELPER(VP_Z_PARK_POS, &mks_park_pos.z, ScreenHandler.GetParkPos_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
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
   #if ENABLED(SENSORLESS_HOMING)  // TMC SENSORLESS Setting
699
   #if ENABLED(SENSORLESS_HOMING)  // TMC SENSORLESS Setting
697
     #if AXIS_HAS_STEALTHCHOP(X)
700
     #if AXIS_HAS_STEALTHCHOP(X)
743
   VPHELPER(VP_ZOffset_Distance,nullptr ,ScreenHandler.GetZoffsetDistance, nullptr),
746
   VPHELPER(VP_ZOffset_Distance,nullptr ,ScreenHandler.GetZoffsetDistance, nullptr),
744
   VPHELPER(VP_MESH_LEVEL_ADJUST, nullptr, ScreenHandler.MeshLevelDistanceConfig, nullptr),
747
   VPHELPER(VP_MESH_LEVEL_ADJUST, nullptr, ScreenHandler.MeshLevelDistanceConfig, nullptr),
745
   VPHELPER(VP_MESH_LEVEL_POINT,nullptr, ScreenHandler.MeshLevel,nullptr),
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
   VPHELPER(VP_AutoTurnOffSw, nullptr, &ScreenHandler.GetTurnOffCtrl, nullptr),
754
   VPHELPER(VP_AutoTurnOffSw, nullptr, &ScreenHandler.GetTurnOffCtrl, nullptr),
748
 
755
 
749
   #if HOTENDS >= 1
756
   #if HOTENDS >= 1

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

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

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

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

Loading…
Cancel
Save