From b7796bcce6a1d375b57d72db5fd4dd03d66fcceb Mon Sep 17 00:00:00 2001
From: InsanityAutomation
<38436470+InsanityAutomation@users.noreply.github.com>
Date: Wed, 28 Aug 2019 01:51:01 -0400
Subject: [PATCH] Disable steppers on M112 (#15065)
And change verbiage to not refer to "Emergency Stop."
---
Marlin/src/Marlin.cpp | 12 ++++++++----
Marlin/src/Marlin.h | 4 ++--
Marlin/src/gcode/control/M108_M112_M410.cpp | 4 ++--
Marlin/src/gcode/control/M80_M81.cpp | 2 +-
Marlin/src/gcode/gcode.cpp | 2 +-
Marlin/src/gcode/gcode.h | 2 +-
Marlin/src/module/planner.h | 4 ++--
7 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/Marlin/src/Marlin.cpp b/Marlin/src/Marlin.cpp
index a548fc43a2..68f37d2a72 100644
--- a/Marlin/src/Marlin.cpp
+++ b/Marlin/src/Marlin.cpp
@@ -745,7 +745,7 @@ void idle(
* Kill all activity and lock the machine.
* After this the machine will need to be reset.
*/
-void kill(PGM_P const lcd_msg/*=nullptr*/) {
+void kill(PGM_P const lcd_msg/*=nullptr*/, const bool steppers_off/*=false*/) {
thermalManager.disable_all_heaters();
SERIAL_ERROR_MSG(MSG_ERR_KILLED);
@@ -760,10 +760,10 @@ void kill(PGM_P const lcd_msg/*=nullptr*/) {
host_action_kill();
#endif
- minkill();
+ minkill(steppers_off);
}
-void minkill() {
+void minkill(const bool steppers_off/*=false*/) {
// Wait a short time (allows messages to get out before shutting down.
for (int i = 1000; i--;) DELAY_US(600);
@@ -773,7 +773,11 @@ void minkill() {
// Wait to ensure all interrupts stopped
for (int i = 1000; i--;) DELAY_US(250);
- thermalManager.disable_all_heaters(); // turn off heaters again
+ // Reiterate heaters off
+ thermalManager.disable_all_heaters();
+
+ // Power off all steppers (for M112) or just the E steppers
+ steppers_off ? disable_all_steppers() : disable_e_steppers();
#if HAS_POWER_SWITCH
PSU_OFF();
diff --git a/Marlin/src/Marlin.h b/Marlin/src/Marlin.h
index db24382bc8..1a9acc0075 100644
--- a/Marlin/src/Marlin.h
+++ b/Marlin/src/Marlin.h
@@ -322,8 +322,8 @@ void disable_e_stepper(const uint8_t e);
void disable_e_steppers();
void disable_all_steppers();
-void kill(PGM_P const lcd_msg=nullptr);
-void minkill();
+void kill(PGM_P const lcd_msg=nullptr, const bool steppers_off=false);
+void minkill(const bool steppers_off=false);
void quickstop_stepper();
diff --git a/Marlin/src/gcode/control/M108_M112_M410.cpp b/Marlin/src/gcode/control/M108_M112_M410.cpp
index 242aac1c06..9b6193bd93 100644
--- a/Marlin/src/gcode/control/M108_M112_M410.cpp
+++ b/Marlin/src/gcode/control/M108_M112_M410.cpp
@@ -38,10 +38,10 @@ void GcodeSuite::M108() {
}
/**
- * M112: Emergency Stop
+ * M112: Full Shutdown
*/
void GcodeSuite::M112() {
- kill();
+ kill(PSTR("M112 Shutdown"), true);
}
/**
diff --git a/Marlin/src/gcode/control/M80_M81.cpp b/Marlin/src/gcode/control/M80_M81.cpp
index efb7495017..03f73fe877 100644
--- a/Marlin/src/gcode/control/M80_M81.cpp
+++ b/Marlin/src/gcode/control/M80_M81.cpp
@@ -86,7 +86,7 @@
/**
* M81: Turn off Power, including Power Supply, if there is one.
*
- * This code should ALWAYS be available for EMERGENCY SHUTDOWN!
+ * This code should ALWAYS be available for FULL SHUTDOWN!
*/
void GcodeSuite::M81() {
thermalManager.disable_all_heaters();
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 91282d0ab5..49503b9b5c 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -407,7 +407,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
#if DISABLED(EMERGENCY_PARSER)
case 108: M108(); break; // M108: Cancel Waiting
- case 112: M112(); break; // M112: Emergency Stop
+ case 112: M112(); break; // M112: Full Shutdown
case 410: M410(); break; // M410: Quickstop - Abort all the planned moves.
#if ENABLED(HOST_PROMPT_SUPPORT)
case 876: M876(); break; // M876: Handle Host prompt responses
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index c12d5bde84..c9b0cec2af 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -132,7 +132,7 @@
* If AUTOTEMP is enabled, S<mintemp> B<maxtemp> F<factor>. Exit autotemp by any M109 without F
* M110 - Set the current line number. (Used by host printing)
* M111 - Set debug flags: "M111 S<flagbits>". See flag bits defined in enum.h.
- * M112 - Emergency stop.
+ * M112 - Full Shutdown.
* M113 - Get or set the timeout interval for Host Keepalive "busy" messages. (Requires HOST_KEEPALIVE_FEATURE)
* M114 - Report current position.
* M115 - Report capabilities. (Extended capabilities requires EXTENDED_CAPABILITIES_REPORT)
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 38884cffa9..77cde6e2bf 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -715,8 +715,8 @@ class Planner {
FORCE_INLINE static float get_axis_position_degrees(const AxisEnum axis) { return get_axis_position_mm(axis); }
#endif
- // Called to force a quick stop of the machine (for example, when an emergency
- // stop is required, or when endstops are hit)
+ // Called to force a quick stop of the machine (for example, when
+ // a Full Shutdown is required, or when endstops are hit)
static void quick_stop();
// Called when an endstop is triggered. Causes the machine to stop inmediately
--
GitLab