|
@@ -443,7 +443,7 @@ static bool relative_mode = false;
|
443
|
443
|
volatile bool wait_for_heatup = true;
|
444
|
444
|
|
445
|
445
|
// For M0/M1, this flag may be cleared (by M108) to exit the wait-for-user loop
|
446
|
|
-#if ENABLED(EMERGENCY_PARSER) || ENABLED(ULTIPANEL)
|
|
446
|
+#if HAS_RESUME_CONTINUE
|
447
|
447
|
volatile bool wait_for_user = false;
|
448
|
448
|
#endif
|
449
|
449
|
|
|
@@ -4967,7 +4967,7 @@ inline void gcode_G92() {
|
4967
|
4967
|
report_current_position();
|
4968
|
4968
|
}
|
4969
|
4969
|
|
4970
|
|
-#if ENABLED(EMERGENCY_PARSER) || ENABLED(ULTIPANEL)
|
|
4970
|
+#if HAS_RESUME_CONTINUE
|
4971
|
4971
|
|
4972
|
4972
|
/**
|
4973
|
4973
|
* M0: Unconditional stop - Wait for user button press on LCD
|
|
@@ -5504,7 +5504,7 @@ inline void gcode_M42() {
|
5504
|
5504
|
pin_state[pin - first_pin] = digitalRead(pin);
|
5505
|
5505
|
}
|
5506
|
5506
|
|
5507
|
|
- #if ENABLED(EMERGENCY_PARSER) || ENABLED(ULTIPANEL)
|
|
5507
|
+ #if HAS_RESUME_CONTINUE
|
5508
|
5508
|
wait_for_user = true;
|
5509
|
5509
|
#endif
|
5510
|
5510
|
|
|
@@ -5522,7 +5522,7 @@ inline void gcode_M42() {
|
5522
|
5522
|
}
|
5523
|
5523
|
}
|
5524
|
5524
|
|
5525
|
|
- #if ENABLED(EMERGENCY_PARSER) || ENABLED(ULTIPANEL)
|
|
5525
|
+ #if HAS_RESUME_CONTINUE
|
5526
|
5526
|
if (!wait_for_user) break;
|
5527
|
5527
|
#endif
|
5528
|
5528
|
|
|
@@ -9139,7 +9139,7 @@ void process_next_command() {
|
9139
|
9139
|
break;
|
9140
|
9140
|
|
9141
|
9141
|
case 'M': switch (codenum) {
|
9142
|
|
- #if ENABLED(ULTIPANEL) || ENABLED(EMERGENCY_PARSER)
|
|
9142
|
+ #if HAS_RESUME_CONTINUE
|
9143
|
9143
|
case 0: // M0: Unconditional stop - Wait for user button press on LCD
|
9144
|
9144
|
case 1: // M1: Conditional stop - Wait for user button press on LCD
|
9145
|
9145
|
gcode_M0_M1();
|