浏览代码

Fix Hotend-abort-on-idle Check (#21535)

InsanityAutomation 4 年前
父节点
当前提交
c4b69fcddd
没有帐户链接到提交者的电子邮件
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3
    1
      Marlin/src/feature/hotend_idle.cpp

+ 3
- 1
Marlin/src/feature/hotend_idle.cpp 查看文件

34
 
34
 
35
 #include "../module/temperature.h"
35
 #include "../module/temperature.h"
36
 #include "../module/motion.h"
36
 #include "../module/motion.h"
37
+#include "../module/planner.h"
37
 #include "../lcd/marlinui.h"
38
 #include "../lcd/marlinui.h"
38
 
39
 
39
 extern HotendIdleProtection hotend_idle;
40
 extern HotendIdleProtection hotend_idle;
43
 void HotendIdleProtection::check_hotends(const millis_t &ms) {
44
 void HotendIdleProtection::check_hotends(const millis_t &ms) {
44
   bool do_prot = false;
45
   bool do_prot = false;
45
   HOTEND_LOOP() {
46
   HOTEND_LOOP() {
46
-    if (thermalManager.degHotend(e) >= HOTEND_IDLE_MIN_TRIGGER) {
47
+    const bool busy = (TERN0(HAS_RESUME_CONTINUE, wait_for_user) || planner.has_blocks_queued());
48
+    if (thermalManager.degHotend(e) >= HOTEND_IDLE_MIN_TRIGGER && !busy) {
47
       do_prot = true; break;
49
       do_prot = true; break;
48
     }
50
     }
49
   }
51
   }

正在加载...
取消
保存