Browse Source

Fix end of short (auto0.g) prints

Scott Lahteine 4 years ago
parent
commit
7ec45f4382
2 changed files with 4 additions and 4 deletions
  1. 3
    1
      Marlin/src/MarlinCore.cpp
  2. 1
    3
      Marlin/src/gcode/lcd/M0_M1.cpp

+ 3
- 1
Marlin/src/MarlinCore.cpp View File

@@ -438,7 +438,9 @@ void startOrResumeJob() {
438 438
 
439 439
       case 4:                                   // Display "Click to Continue..."
440 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 444
         #endif
443 445
         break;
444 446
 

+ 1
- 3
Marlin/src/gcode/lcd/M0_M1.cpp View File

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

Loading…
Cancel
Save