|
@@ -4543,6 +4543,26 @@ inline void gcode_M105() {
|
4543
|
4543
|
*/
|
4544
|
4544
|
inline void gcode_M108() { wait_for_heatup = false; }
|
4545
|
4545
|
|
|
4546
|
+
|
|
4547
|
+ /**
|
|
4548
|
+ * M112: Emergency Stop
|
|
4549
|
+ */
|
|
4550
|
+ inline void gcode_M112() { kill(PSTR(MSG_KILLED)); }
|
|
4551
|
+
|
|
4552
|
+
|
|
4553
|
+ /**
|
|
4554
|
+ * M410: Quickstop - Abort all planned moves
|
|
4555
|
+ *
|
|
4556
|
+ * This will stop the carriages mid-move, so most likely they
|
|
4557
|
+ * will be out of sync with the stepper position after this.
|
|
4558
|
+ */
|
|
4559
|
+ inline void gcode_M410() {
|
|
4560
|
+ stepper.quick_stop();
|
|
4561
|
+ #if DISABLED(DELTA) && DISABLED(SCARA)
|
|
4562
|
+ set_current_position_from_planner();
|
|
4563
|
+ #endif
|
|
4564
|
+ }
|
|
4565
|
+
|
4546
|
4566
|
#endif
|
4547
|
4567
|
|
4548
|
4568
|
/**
|
|
@@ -4815,13 +4835,6 @@ inline void gcode_M111() {
|
4815
|
4835
|
SERIAL_EOL;
|
4816
|
4836
|
}
|
4817
|
4837
|
|
4818
|
|
-/**
|
4819
|
|
- * M112: Emergency Stop
|
4820
|
|
- */
|
4821
|
|
-#if DISABLED(EMERGENCY_PARSER)
|
4822
|
|
- inline void gcode_M112() { kill(PSTR(MSG_KILLED)); }
|
4823
|
|
-#endif
|
4824
|
|
-
|
4825
|
4838
|
#if ENABLED(HOST_KEEPALIVE_FEATURE)
|
4826
|
4839
|
|
4827
|
4840
|
/**
|
|
@@ -5994,22 +6007,6 @@ inline void gcode_M400() { stepper.synchronize(); }
|
5994
|
6007
|
}
|
5995
|
6008
|
#endif
|
5996
|
6009
|
|
5997
|
|
-/**
|
5998
|
|
- * M410: Quickstop - Abort all planned moves
|
5999
|
|
- *
|
6000
|
|
- * This will stop the carriages mid-move, so most likely they
|
6001
|
|
- * will be out of sync with the stepper position after this.
|
6002
|
|
- */
|
6003
|
|
-
|
6004
|
|
-#if DISABLED(EMERGENCY_PARSER)
|
6005
|
|
- inline void gcode_M410() {
|
6006
|
|
- stepper.quick_stop();
|
6007
|
|
- #if DISABLED(DELTA) && DISABLED(SCARA)
|
6008
|
|
- set_current_position_from_planner();
|
6009
|
|
- #endif
|
6010
|
|
- }
|
6011
|
|
-#endif
|
6012
|
|
-
|
6013
|
6010
|
#if ENABLED(MESH_BED_LEVELING)
|
6014
|
6011
|
|
6015
|
6012
|
/**
|
|
@@ -6965,9 +6962,19 @@ void process_next_command() {
|
6965
|
6962
|
break;
|
6966
|
6963
|
|
6967
|
6964
|
#if DISABLED(EMERGENCY_PARSER)
|
|
6965
|
+
|
|
6966
|
+ case 108: // M108: Cancel Waiting
|
|
6967
|
+ gcode_M108();
|
|
6968
|
+ break;
|
|
6969
|
+
|
6968
|
6970
|
case 112: // M112: Emergency Stop
|
6969
|
6971
|
gcode_M112();
|
6970
|
6972
|
break;
|
|
6973
|
+
|
|
6974
|
+ case 410: // M410 quickstop - Abort all the planned moves.
|
|
6975
|
+ gcode_M410();
|
|
6976
|
+ break;
|
|
6977
|
+
|
6971
|
6978
|
#endif
|
6972
|
6979
|
|
6973
|
6980
|
#if ENABLED(HOST_KEEPALIVE_FEATURE)
|
|
@@ -6987,12 +6994,6 @@ void process_next_command() {
|
6987
|
6994
|
KEEPALIVE_STATE(NOT_BUSY);
|
6988
|
6995
|
return; // "ok" already printed
|
6989
|
6996
|
|
6990
|
|
- #if DISABLED(EMERGENCY_PARSER)
|
6991
|
|
- case 108:
|
6992
|
|
- gcode_M108();
|
6993
|
|
- break;
|
6994
|
|
- #endif
|
6995
|
|
-
|
6996
|
6997
|
case 109: // M109: Wait for temperature
|
6997
|
6998
|
gcode_M109();
|
6998
|
6999
|
break;
|
|
@@ -7276,12 +7277,6 @@ void process_next_command() {
|
7276
|
7277
|
break;
|
7277
|
7278
|
#endif // ENABLED(FILAMENT_WIDTH_SENSOR)
|
7278
|
7279
|
|
7279
|
|
- #if DISABLED(EMERGENCY_PARSER)
|
7280
|
|
- case 410: // M410 quickstop - Abort all the planned moves.
|
7281
|
|
- gcode_M410();
|
7282
|
|
- break;
|
7283
|
|
- #endif
|
7284
|
|
-
|
7285
|
7280
|
#if ENABLED(MESH_BED_LEVELING)
|
7286
|
7281
|
case 420: // M420 Enable/Disable Mesh Bed Leveling
|
7287
|
7282
|
gcode_M420();
|