zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix M112 with Emergency Parser

Browse source
This commit is contained in:
Scott Lahteine 2020-01-19 19:00:17 -06:00
parent 4dca6d50c0
commit 79c2f05e7d
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Marlin/src/MarlinCore.cpp
View file

@ -182,6 +182,7 @@
#endif #endif
const char NUL_STR[] PROGMEM = "", const char NUL_STR[] PROGMEM = "",
M112_KILL_STR[] PROGMEM = "M112 Shutdown",
G28_STR[] PROGMEM = "G28", G28_STR[] PROGMEM = "G28",
M21_STR[] PROGMEM = "M21", M21_STR[] PROGMEM = "M21",
M23_STR[] PROGMEM = "M23 %s", M23_STR[] PROGMEM = "M23 %s",

2
Marlin/src/MarlinCore.h
View file

@ -120,5 +120,5 @@ void protected_pin_err();
void event_probe_failure(); void event_probe_failure();
#endif #endif
extern const char NUL_STR[], G28_STR[], M21_STR[], M23_STR[], M24_STR[], extern const char NUL_STR[], M112_KILL_STR[], G28_STR[], M21_STR[], M23_STR[], M24_STR[],
SP_X_STR[], SP_Y_STR[], SP_Z_STR[], SP_E_STR[]; SP_X_STR[], SP_Y_STR[], SP_Z_STR[], SP_E_STR[];

2
Marlin/src/gcode/control/M108_M112_M410.cpp
View file

@ -41,7 +41,7 @@ void GcodeSuite::M108() {
* M112: Full Shutdown * M112: Full Shutdown
*/ */
void GcodeSuite::M112() { void GcodeSuite::M112() {
kill(PSTR("M112 Shutdown"), nullptr, true); kill(M112_KILL_STR, nullptr, true);
} }
/** /**

2
Marlin/src/gcode/queue.cpp
View file

@ -440,7 +440,7 @@ void GCodeQueue::get_serial_commands() {
wait_for_user = false; wait_for_user = false;
#endif #endif
} }
if (strcmp(command, "M112") == 0) kill(); if (strcmp(command, "M112") == 0) kill(M112_KILL_STR, nullptr, true);
if (strcmp(command, "M410") == 0) quickstop_stepper(); if (strcmp(command, "M410") == 0) quickstop_stepper();
#endif #endif