|
@@ -71,7 +71,7 @@ void GcodeSuite::M0_M1() {
|
71
|
71
|
|
72
|
72
|
if (has_message)
|
73
|
73
|
ui.set_status(args, true);
|
74
|
|
- else {
|
|
74
|
+ else if (!parser.seenval('Q')) {
|
75
|
75
|
LCD_MESSAGEPGM(MSG_USERWAIT);
|
76
|
76
|
#if ENABLED(LCD_PROGRESS_BAR) && PROGRESS_MSG_EXPIRE > 0
|
77
|
77
|
ui.reset_progress_bar_timeout();
|
|
@@ -101,12 +101,8 @@ void GcodeSuite::M0_M1() {
|
101
|
101
|
host_prompt_do(PROMPT_USER_CONTINUE, PSTR("M0/1 Break Called"), CONTINUE_STR);
|
102
|
102
|
#endif
|
103
|
103
|
|
104
|
|
- if (ms > 0) {
|
105
|
|
- ms += millis(); // wait until this time for a click
|
106
|
|
- while (PENDING(millis(), ms) && wait_for_user) idle();
|
107
|
|
- }
|
108
|
|
- else
|
109
|
|
- while (wait_for_user) idle();
|
|
104
|
+ if (ms > 0) ms += millis(); // wait until this time for a click
|
|
105
|
+ while (wait_for_user && (ms > 0 || PENDING(millis(), ms))) idle();
|
110
|
106
|
|
111
|
107
|
#if HAS_LEDS_OFF_FLAG
|
112
|
108
|
printerEventLEDs.onResumeAfterWait();
|