CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Add Watchdog timer reset in kill()
This commit is contained in:
Scott Lahteine 2016-03-06 16:21:39 -08:00
commit 501f63802a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/Marlin_main.cpp
View File

@ -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)