SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Group EMERGENCY_PARSER commands

Browse source
This commit is contained in:
Scott Lahteine 2016-07-06 11:52:36 -07:00
parent a129078927
commit ecffe92e20
1 changed files with 30 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
Marlin/Marlin_main.cpp
View file

@ -4543,6 +4543,26 @@ inline void gcode_M105() {
*/ */
inline void gcode_M108() { wait_for_heatup = false; } inline void gcode_M108() { wait_for_heatup = false; }
/**
* M112: Emergency Stop
*/
inline void gcode_M112() { kill(PSTR(MSG_KILLED)); }
/**
* M410: Quickstop - Abort all planned moves
*
* This will stop the carriages mid-move, so most likely they
* will be out of sync with the stepper position after this.
*/
inline void gcode_M410() {
stepper.quick_stop();
#if DISABLED(DELTA) && DISABLED(SCARA)
set_current_position_from_planner();
#endif
}
#endif #endif
/** /**
@ -4815,13 +4835,6 @@ inline void gcode_M111() {
SERIAL_EOL; SERIAL_EOL;
} }
/**
* M112: Emergency Stop
*/
#if DISABLED(EMERGENCY_PARSER)
inline void gcode_M112() { kill(PSTR(MSG_KILLED)); }
#endif
#if ENABLED(HOST_KEEPALIVE_FEATURE) #if ENABLED(HOST_KEEPALIVE_FEATURE)
/** /**
@ -5994,22 +6007,6 @@ inline void gcode_M400() { stepper.synchronize(); }
} }
#endif #endif
/**
* M410: Quickstop - Abort all planned moves
*
* This will stop the carriages mid-move, so most likely they
* will be out of sync with the stepper position after this.
*/
#if DISABLED(EMERGENCY_PARSER)
inline void gcode_M410() {
stepper.quick_stop();
#if DISABLED(DELTA) && DISABLED(SCARA)
set_current_position_from_planner();
#endif
}
#endif
#if ENABLED(MESH_BED_LEVELING) #if ENABLED(MESH_BED_LEVELING)
/** /**
@ -6965,9 +6962,19 @@ void process_next_command() {
break; break;
#if DISABLED(EMERGENCY_PARSER) #if DISABLED(EMERGENCY_PARSER)
case 108: // M108: Cancel Waiting
gcode_M108();
break;
case 112: // M112: Emergency Stop case 112: // M112: Emergency Stop
gcode_M112(); gcode_M112();
break; break;
case 410: // M410 quickstop - Abort all the planned moves.
gcode_M410();
break;
#endif #endif
#if ENABLED(HOST_KEEPALIVE_FEATURE) #if ENABLED(HOST_KEEPALIVE_FEATURE)
@ -6987,12 +6994,6 @@ void process_next_command() {
KEEPALIVE_STATE(NOT_BUSY); KEEPALIVE_STATE(NOT_BUSY);
return; // "ok" already printed return; // "ok" already printed
#if DISABLED(EMERGENCY_PARSER)
case 108:
gcode_M108();
break;
#endif
case 109: // M109: Wait for temperature case 109: // M109: Wait for temperature
gcode_M109(); gcode_M109();
break; break;
@ -7276,12 +7277,6 @@ void process_next_command() {
break; break;
#endif // ENABLED(FILAMENT_WIDTH_SENSOR) #endif // ENABLED(FILAMENT_WIDTH_SENSOR)
#if DISABLED(EMERGENCY_PARSER)
case 410: // M410 quickstop - Abort all the planned moves.
gcode_M410();
break;
#endif
#if ENABLED(MESH_BED_LEVELING) #if ENABLED(MESH_BED_LEVELING)
case 420: // M420 Enable/Disable Mesh Bed Leveling case 420: // M420 Enable/Disable Mesh Bed Leveling
gcode_M420(); gcode_M420();