Reset after kill with a button on the KILL_PIN (#13091)

MarlinFirmware · Mar 10, 2019 · e4d080e · p3p · Mar 10, 2019 · e4d080e
1 parent c36989c
commit e4d080e
Showing 1 changed file with 28 additions and 5 deletions.
diff --git a/Marlin/src/Marlin.cpp b/Marlin/src/Marlin.cpp
@@ -764,11 +764,34 @@ void minkill() {
     suicide();
   #endif
 
-  while (1) {
-    #if ENABLED(USE_WATCHDOG)
-      watchdog_reset();
-    #endif
-  } // Wait for reset
+  #if HAS_KILL
+
+    // Wait for kill to be released
+    while (!READ(KILL_PIN)) {
+      #if ENABLED(USE_WATCHDOG)
+        watchdog_reset();
+      #endif
+    }
+
+    // Wait for kill to be pressed
+    while (READ(KILL_PIN)) {
+      #if ENABLED(USE_WATCHDOG)
+        watchdog_reset();
+      #endif
+    }
+
+    void(*resetFunc)(void) = 0; // Declare resetFunc() at address 0
+    resetFunc();                // Jump to address 0
+
+  #else // !HAS_KILL
+
+    for (;;) {
+      #if ENABLED(USE_WATCHDOG)
+        watchdog_reset();
+      #endif
+    } // Wait for reset
+
+  #endif // !HAS_KILL
 }
 
 /**