Require a Kill or Encoder Button

Author: thinkyhead

Marlin/Configuration_adv.h

@@ -3972,7 +3972,7 @@
 //#define POSTMORTEM_DEBUGGING
 
 /**
- * Reset the MCU automatically instead of locking it after a kill
+ * Software Reset options
  */
-//#define SOFT_RESET_ON_KILL
-//#define SOFT_RESET_VIA_SERIAL          // 'KILL' and '^X' commands will soft-reset the controller
+//#define SOFT_RESET_VIA_SERIAL         // 'KILL' and '^X' commands will soft-reset the controller
+//#define SOFT_RESET_ON_KILL            // Use a digital button to soft-reset the controller after KILL

Marlin/src/MarlinCore.cpp

@@ -863,20 +863,23 @@ void minkill(const bool steppers_off/*=false*/) {
 
   TERN_(HAS_SUICIDE, suicide());
 
-  #if HAS_KILL
-    while ( kill_state()) watchdog_refresh(); // Wait for KILL button to be released
-    while (!kill_state()) watchdog_refresh(); // Wait for KILL button to be pressed
-  #elif BOTH(HAS_ENCODER_ACTION, SOFT_RESET_ON_KILL)
-    while (!ui.button_pressed()) watchdog_refresh(); // Wait for a button press
-    while ( ui.button_pressed()) watchdog_refresh(); // Wait for a button release
-  #endif
-
   #if EITHER(HAS_KILL, SOFT_RESET_ON_KILL)
+
+    // Wait for both KILL and ENC to be released
+    while (TERN0(HAS_KILL, !kill_state()) || TERN0(SOFT_RESET_ON_KILL, !ui.button_pressed()))
+      watchdog_refresh();
+
+    // Wait for either KILL or ENC press
+    while (TERN1(HAS_KILL, kill_state()) && TERN1(SOFT_RESET_ON_KILL, ui.button_pressed()))
+      watchdog_refresh();
+
+    // Reboot the board
     HAL_reboot();
-  #endif
 
-  #if !HAS_KILL
-    for (;;) watchdog_refresh();  // Wait for reset
+  #else
+
+    for (;;) watchdog_refresh();  // Wait for RESET button or power-cycle
+
   #endif
 }
 

Marlin/src/inc/SanityCheck.h

@@ -2208,12 +2208,19 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
 #endif
 
 /**
- * emergency-command parser
+ * Emergency Command Parser
  */
 #if ENABLED(EMERGENCY_PARSER) && defined(__AVR__) && defined(USBCON)
   #error "EMERGENCY_PARSER does not work on boards with AT90USB processors (USBCON)."
 #endif
 
+/**
+ * Software Reset on Kill option
+ */
+#if ENABLED(SOFT_RESET_ON_KILL) && !BUTTON_EXISTS(ENC)
+  #error "An encoder button is required or SOFT_RESET_ON_KILL will reset the printer without notice!"
+#endif
+
 /**
  * I2C bus
  */

Marlin/src/lcd/marlinui.h

@@ -39,7 +39,7 @@
   #include "tft_io/touch_calibration.h"
 #endif
 
-#if EITHER(HAS_LCD_MENU, ULTIPANEL_FEEDMULTIPLY)
+#if ANY(HAS_LCD_MENU, ULTIPANEL_FEEDMULTIPLY, SOFT_RESET_ON_KILL)
   #define HAS_ENCODER_ACTION 1
 #endif