Merge remote-tracking branch 'refs/remotes/origin/master' into dev

MK/Configuration_Basic.h

@@ -42,6 +42,11 @@
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
 
+// Kill Method
+// 0 - Disable heaters, wait forever
+// 1 - Reset controller. Will not reset separate communication chips!
+#define KILL_METHOD 0
+
 // If you want test the firmware uncomment below. Use Serial arduino monitor...
 // ONLY BAUDRATE 115200
 //#define FIRMWARE_TEST

MK/module/MK_Main.cpp

@@ -8022,12 +8022,14 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
 }
 
 void kill(const char* lcd_msg) {
+  #if ENABLED(KILL_METHOD) && KILL_METHOD == 1
+    HAL::resetHardware();
+  #else
+
   #if ENABLED(ULTRA_LCD)
     lcd_setalertstatuspgm(lcd_msg);
   #endif
 
-  HAL::resetHardware();
-
   cli(); // Stop interrupts
   disable_all_heaters();
   disable_all_steppers();