Browse Source

Merge pull request #3077 from Blue-Marlin/watchdogreset-in-kill

Add Watchdog timer reset in kill()
Scott Lahteine 9 years ago
parent
commit
501f63802a
1 changed files with 5 additions and 1 deletions
  1. 5
    1
      Marlin/Marlin_main.cpp

+ 5
- 1
Marlin/Marlin_main.cpp View File

@@ -7157,7 +7157,11 @@ void kill(const char* lcd_msg) {
7157 7157
   for (int i = 5; i--; lcd_update()) delay(200); // Wait a short time
7158 7158
   cli();   // disable interrupts
7159 7159
   suicide();
7160
-  while (1) { /* Intentionally left empty */ } // Wait for reset
7160
+  while (1) {
7161
+	#if ENABLED(USE_WATCHDOG)
7162
+	  watchdog_reset();
7163
+	#endif
7164
+  } // Wait for reset
7161 7165
 }
7162 7166
 
7163 7167
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)

Loading…
Cancel
Save