Browse Source

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

Add Watchdog timer reset in kill()
pull/1/head
Scott Lahteine 8 years ago
parent
commit
501f63802a
  1. 6
      Marlin/Marlin_main.cpp

6
Marlin/Marlin_main.cpp

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

Loading…
Cancel
Save