zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8231 from AnHardt/2.0_watchdog

Browse source 
[2.0] Fix watchdog in WATCHDOG_RESET_MANUAL mode AVR
This commit is contained in:
Scott Lahteine 2017-11-03 03:06:28 -05:00 committed by GitHub
parent 676a564610 c72a0610b4
commit 3749a746f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Marlin/src/HAL/HAL_AVR/watchdog_AVR.cpp
View file

@ -42,11 +42,16 @@ void watchdog_init() {
// Take care, as this requires the correct order of operation, with interrupts disabled. // Take care, as this requires the correct order of operation, with interrupts disabled.
// See the datasheet of any AVR chip for details. // See the datasheet of any AVR chip for details.
wdt_reset(); wdt_reset();
cli();
_WD_CONTROL_REG = _BV(_WD_CHANGE_BIT) | _BV(WDE); _WD_CONTROL_REG = _BV(_WD_CHANGE_BIT) | _BV(WDE);
_WD_CONTROL_REG = _BV(WDIE) | WDTO_NS; _WD_CONTROL_REG = _BV(WDIE) | (WDTO_NS & 0x07) | ((WDTO_NS & 0x08) << 2); // WDTO_NS directly does not work. bit 0-2 are consecutive in the register but the highest value bit is at bit 5
// So worked for up to WDTO_2S
sei();
wdt_reset();
#else #else
wdt_enable(WDTO_NS); wdt_enable(WDTO_NS); // The function handles the upper bit correct.
#endif #endif
//delay(10000); // test it!
} }
//=========================================================================== //===========================================================================
@ -56,9 +61,10 @@ void watchdog_init() {
// Watchdog timer interrupt, called if main program blocks >4sec and manual reset is enabled. // Watchdog timer interrupt, called if main program blocks >4sec and manual reset is enabled.
#if ENABLED(WATCHDOG_RESET_MANUAL) #if ENABLED(WATCHDOG_RESET_MANUAL)
ISR(WDT_vect) { ISR(WDT_vect) {
sei(); // With the interrupt driven serial we need to allow interrupts.
SERIAL_ERROR_START(); SERIAL_ERROR_START();
SERIAL_ERRORLNPGM("Something is wrong, please turn off the printer."); SERIAL_ERRORLNPGM("Watchdog barked, please turn off the printer.");
kill(PSTR("ERR:Please Reset")); //kill blocks //16 characters so it fits on a 16x2 display kill(PSTR("ERR:Watchdog")); //kill blocks //up to 16 characters so it fits on a 16x2 display
while (1); //wait for user or serial reset while (1); //wait for user or serial reset
} }
#endif // WATCHDOG_RESET_MANUAL #endif // WATCHDOG_RESET_MANUAL