From 79c2f05e7d1e83817f23e09bcafa3b9f55c3acf5 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 19 Jan 2020 19:00:17 -0600 Subject: [PATCH] Fix M112 with Emergency Parser --- Marlin/src/MarlinCore.cpp | 1 + Marlin/src/MarlinCore.h | 2 +- Marlin/src/gcode/control/M108_M112_M410.cpp | 2 +- Marlin/src/gcode/queue.cpp | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp index b7d26ca4e..a6bb262f8 100644 --- a/Marlin/src/MarlinCore.cpp +++ b/Marlin/src/MarlinCore.cpp @@ -182,6 +182,7 @@ #endif const char NUL_STR[] PROGMEM = "", + M112_KILL_STR[] PROGMEM = "M112 Shutdown", G28_STR[] PROGMEM = "G28", M21_STR[] PROGMEM = "M21", M23_STR[] PROGMEM = "M23 %s", diff --git a/Marlin/src/MarlinCore.h b/Marlin/src/MarlinCore.h index acc9a2a62..b7f1460ff 100644 --- a/Marlin/src/MarlinCore.h +++ b/Marlin/src/MarlinCore.h @@ -120,5 +120,5 @@ void protected_pin_err(); void event_probe_failure(); #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[]; diff --git a/Marlin/src/gcode/control/M108_M112_M410.cpp b/Marlin/src/gcode/control/M108_M112_M410.cpp index e083dd097..606a39d51 100644 --- a/Marlin/src/gcode/control/M108_M112_M410.cpp +++ b/Marlin/src/gcode/control/M108_M112_M410.cpp @@ -41,7 +41,7 @@ void GcodeSuite::M108() { * M112: Full Shutdown */ void GcodeSuite::M112() { - kill(PSTR("M112 Shutdown"), nullptr, true); + kill(M112_KILL_STR, nullptr, true); } /** diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp index a026e479a..ff35b553a 100644 --- a/Marlin/src/gcode/queue.cpp +++ b/Marlin/src/gcode/queue.cpp @@ -440,7 +440,7 @@ void GCodeQueue::get_serial_commands() { wait_for_user = false; #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(); #endif