[1.1] Fix watchdog in WATCHDOG_RESET_MANUAL mode AVR #8230
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AnHardt
changed the title
thinkyhead
reviewed
Nov 3, 2017
| SERIAL_ERROR_START(); | ||
| SERIAL_ERRORLNPGM("Something is wrong, please turn off the printer."); | ||
| kill(PSTR("ERR:Please Reset")); //kill blocks //16 characters so it fits on a 16x2 display | ||
| SERIAL_ERRORLNPGM("Watchdog barked, please turn off the printer."); |
There was a problem hiding this comment.
Are hosts okay with this string? i.e., Do they use the old one to detect a kill?
thinkyhead
reviewed
Nov 3, 2017
| _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(); |
There was a problem hiding this comment.
Are both calls to wdt_reset() needed here, both before cli and after sei?
|
Where is WATCHDOG_RESET_MANUAL ever enabled ? Is this just for undocumented debugging use where someone just tosses the define in Configuration.h ? |
#if ENABLED(USE_WATCHDOG)
// If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on.
// The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset.
// However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled.
//#define WATCHDOG_RESET_MANUAL
#endif |
|
Gah, bitten by my own SublimeText search exclusion: Thanks, -=dave |
|
I'm almost sorry I started using that filter field. But it's so handy when needed! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Longer watchdog timeouts broke the watchdog in WATCHDOG_RESET_MANUAL for AVRs. A register structure was not matched.
The interrupt driven serial send blocked the output of the watchdog interrupt used by WATCHDOG_RESET_MANUAL.