|
@@ -56,11 +56,11 @@ void GcodeSuite::M0_M1() {
|
56
|
56
|
|
57
|
57
|
planner.synchronize();
|
58
|
58
|
|
59
|
|
- #if HAS_LCD_MENU || HAS_LEDS_OFF_FLAG
|
|
59
|
+ #if HAS_LEDS_OFF_FLAG
|
60
|
60
|
const bool seenQ = parser.seen('Q');
|
61
|
|
- #if HAS_LEDS_OFF_FLAG
|
62
|
|
- if (seenQ) printerEventLEDs.onPrintCompleted(); // Change LED color for Print Completed
|
63
|
|
- #endif
|
|
61
|
+ if (seenQ) printerEventLEDs.onPrintCompleted(); // Change LED color for Print Completed
|
|
62
|
+ #else
|
|
63
|
+ constexpr bool seenQ = false;
|
64
|
64
|
#endif
|
65
|
65
|
|
66
|
66
|
#if HAS_LCD_MENU
|
|
@@ -75,12 +75,12 @@ void GcodeSuite::M0_M1() {
|
75
|
75
|
}
|
76
|
76
|
|
77
|
77
|
#elif ENABLED(EXTENSIBLE_UI)
|
78
|
|
-
|
79
|
|
- if (parser.string_arg)
|
80
|
|
- ExtUI::onUserConfirmRequired(parser.string_arg); // Can this take an SRAM string??
|
81
|
|
- else
|
82
|
|
- ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_USERWAIT));
|
83
|
|
-
|
|
78
|
+ if (!seenQ) {
|
|
79
|
+ if (parser.string_arg)
|
|
80
|
+ ExtUI::onUserConfirmRequired(parser.string_arg); // Can this take an SRAM string??
|
|
81
|
+ else
|
|
82
|
+ ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_USERWAIT));
|
|
83
|
+ }
|
84
|
84
|
#else
|
85
|
85
|
|
86
|
86
|
if (parser.string_arg) {
|
|
@@ -94,7 +94,7 @@ void GcodeSuite::M0_M1() {
|
94
|
94
|
wait_for_user = true;
|
95
|
95
|
|
96
|
96
|
#if ENABLED(HOST_PROMPT_SUPPORT)
|
97
|
|
- host_prompt_do(PROMPT_USER_CONTINUE, parser.codenum ? PSTR("M1 Stop") : PSTR("M0 Stop"), CONTINUE_STR);
|
|
97
|
+ if (!seenQ) host_prompt_do(PROMPT_USER_CONTINUE, parser.codenum ? PSTR("M1 Stop") : PSTR("M0 Stop"), CONTINUE_STR);
|
98
|
98
|
#endif
|
99
|
99
|
|
100
|
100
|
if (ms > 0) ms += millis(); // wait until this time for a click
|