瀏覽代碼

🐛 Fix Manual Move cold extrude override (#24045)

Followup to #19606

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
ellensp 3 年之前
父節點
當前提交
5005c7b64c
沒有連結到貢獻者的電子郵件帳戶。

+ 2
- 0
Marlin/src/lcd/menu/menu.cpp 查看文件

28
 #include "../../module/planner.h"
28
 #include "../../module/planner.h"
29
 #include "../../module/motion.h"
29
 #include "../../module/motion.h"
30
 #include "../../module/printcounter.h"
30
 #include "../../module/printcounter.h"
31
+#include "../../module/temperature.h"
31
 #include "../../gcode/queue.h"
32
 #include "../../gcode/queue.h"
32
 
33
 
33
 #if HAS_BUZZER
34
 #if HAS_BUZZER
171
  */
172
  */
172
 void MarlinUI::goto_screen(screenFunc_t screen, const uint16_t encoder/*=0*/, const uint8_t top/*=0*/, const uint8_t items/*=0*/) {
173
 void MarlinUI::goto_screen(screenFunc_t screen, const uint16_t encoder/*=0*/, const uint8_t top/*=0*/, const uint8_t items/*=0*/) {
173
   if (currentScreen != screen) {
174
   if (currentScreen != screen) {
175
+    thermalManager.set_menu_cold_override(false);
174
 
176
 
175
     TERN_(IS_DWIN_MARLINUI, did_first_redraw = false);
177
     TERN_(IS_DWIN_MARLINUI, did_first_redraw = false);
176
 
178
 

+ 1
- 1
Marlin/src/lcd/menu/menu_motion.cpp 查看文件

228
         ui.goto_screen([]{
228
         ui.goto_screen([]{
229
           MenuItem_confirm::select_screen(
229
           MenuItem_confirm::select_screen(
230
             GET_TEXT(MSG_BUTTON_PROCEED), GET_TEXT(MSG_BACK),
230
             GET_TEXT(MSG_BUTTON_PROCEED), GET_TEXT(MSG_BACK),
231
-            _goto_menu_move_distance_e, nullptr,
231
+            [] { _goto_menu_move_distance_e(); thermalManager.set_menu_cold_override(true); }, nullptr,
232
             GET_TEXT(MSG_HOTEND_TOO_COLD), (const char *)nullptr, PSTR("!")
232
             GET_TEXT(MSG_HOTEND_TOO_COLD), (const char *)nullptr, PSTR("!")
233
           );
233
           );
234
         });
234
         });

+ 6
- 0
Marlin/src/module/temperature.cpp 查看文件

487
   #endif
487
   #endif
488
 #endif
488
 #endif
489
 
489
 
490
+#if BOTH(HAS_MARLINUI_MENU, PREVENT_COLD_EXTRUSION) && E_MANUAL > 0
491
+  bool Temperature::allow_cold_extrude_override = false;
492
+#else
493
+  constexpr bool Temperature::allow_cold_extrude_override;
494
+#endif
495
+
490
 #if ENABLED(PREVENT_COLD_EXTRUSION)
496
 #if ENABLED(PREVENT_COLD_EXTRUSION)
491
   bool Temperature::allow_cold_extrude = false;
497
   bool Temperature::allow_cold_extrude = false;
492
   celsius_t Temperature::extrude_min_temp = EXTRUDE_MINTEMP;
498
   celsius_t Temperature::extrude_min_temp = EXTRUDE_MINTEMP;

+ 9
- 1
Marlin/src/module/temperature.h 查看文件

429
       static uint8_t soft_pwm_controller_speed;
429
       static uint8_t soft_pwm_controller_speed;
430
     #endif
430
     #endif
431
 
431
 
432
+    #if BOTH(HAS_MARLINUI_MENU, PREVENT_COLD_EXTRUSION) && E_MANUAL > 0
433
+      static bool allow_cold_extrude_override;
434
+      static void set_menu_cold_override(const bool allow) { allow_cold_extrude_override = allow; }
435
+    #else
436
+      static constexpr bool allow_cold_extrude_override = false;
437
+      static void set_menu_cold_override(const bool) {}
438
+    #endif
439
+
432
     #if ENABLED(PREVENT_COLD_EXTRUSION)
440
     #if ENABLED(PREVENT_COLD_EXTRUSION)
433
       static bool allow_cold_extrude;
441
       static bool allow_cold_extrude;
434
       static celsius_t extrude_min_temp;
442
       static celsius_t extrude_min_temp;
435
-      static bool tooCold(const celsius_t temp) { return allow_cold_extrude ? false : temp < extrude_min_temp - (TEMP_WINDOW); }
443
+      static bool tooCold(const celsius_t temp) { return !allow_cold_extrude && !allow_cold_extrude_override && temp < extrude_min_temp - (TEMP_WINDOW); }
436
       static bool tooColdToExtrude(const uint8_t E_NAME)       { return tooCold(wholeDegHotend(HOTEND_INDEX)); }
444
       static bool tooColdToExtrude(const uint8_t E_NAME)       { return tooCold(wholeDegHotend(HOTEND_INDEX)); }
437
       static bool targetTooColdToExtrude(const uint8_t E_NAME) { return tooCold(degTargetHotend(HOTEND_INDEX)); }
445
       static bool targetTooColdToExtrude(const uint8_t E_NAME) { return tooCold(degTargetHotend(HOTEND_INDEX)); }
438
     #else
446
     #else

Loading…
取消
儲存