浏览代码

Fix end of short (auto0.g) prints

Scott Lahteine 4 年前
父节点
当前提交
7ec45f4382
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 3
    1
      Marlin/src/MarlinCore.cpp
  2. 1
    3
      Marlin/src/gcode/lcd/M0_M1.cpp

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

438
 
438
 
439
       case 4:                                   // Display "Click to Continue..."
439
       case 4:                                   // Display "Click to Continue..."
440
         #if HAS_RESUME_CONTINUE                 // 30 min timeout with LCD, 1 min without
440
         #if HAS_RESUME_CONTINUE                 // 30 min timeout with LCD, 1 min without
441
-          did_state = queue.enqueue_one_P(PSTR("M0Q1S" TERN(HAS_LCD_MENU, "1800", "60")));
441
+          did_state = queue.enqueue_one_P(
442
+            print_job_timer.duration() < 60 ? PSTR("M0Q1P1") : PSTR("M0Q1S" TERN(HAS_LCD_MENU, "1800", "60"))
443
+          );
442
         #endif
444
         #endif
443
         break;
445
         break;
444
 
446
 

+ 1
- 3
Marlin/src/gcode/lcd/M0_M1.cpp 查看文件

56
 
56
 
57
   planner.synchronize();
57
   planner.synchronize();
58
 
58
 
59
+  const bool seenQ = parser.seen('Q');
59
   #if HAS_LEDS_OFF_FLAG
60
   #if HAS_LEDS_OFF_FLAG
60
-    const bool seenQ = parser.seen('Q');
61
     if (seenQ) printerEventLEDs.onPrintCompleted();      // Change LED color for Print Completed
61
     if (seenQ) printerEventLEDs.onPrintCompleted();      // Change LED color for Print Completed
62
-  #elif HAS_LCD_MENU
63
-    constexpr bool seenQ = false;
64
   #endif
62
   #endif
65
 
63
 
66
   #if HAS_LCD_MENU
64
   #if HAS_LCD_MENU

正在加载...
取消
保存