Skip to content

Fix hardcrash from activating watchdog in boot.py on nordic #11295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FoamyGuy wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −3
Open

Fix hardcrash from activating watchdog in boot.py on nordic #11295

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ports/nordic/common-hal/watchdog/WatchDogTimer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,6 @@ void common_hal_watchdog_feed(watchdog_watchdogtimer_obj_t *self) {

void common_hal_watchdog_deinit(watchdog_watchdogtimer_obj_t *self) {
if (self->mode == WATCHDOGMODE_RESET) {
if (gc_alloc_possible()) {
mp_raise_RuntimeError(MP_ERROR_TEXT("WatchDogTimer cannot be deinitialized once mode is set to RESET"));
}
// Don't change anything because RESET cannot be undone.
return;
}
Expand Down Expand Up @@ -164,6 +161,10 @@ void common_hal_watchdog_set_mode(watchdog_watchdogtimer_obj_t *self, watchdog_w
}
nrfx_wdt_enable(&wdt);
nrfx_wdt_feed(&wdt);
} else if (current_mode == WATCHDOGMODE_RESET) {
// raise exception on attempt to set mode back from RESET to None
mp_raise_RuntimeError(MP_ERROR_TEXT("WatchDogTimer cannot be deinitialized once mode is set to RESET"));

}

// If we just switched away from RAISE, disable the timmer.
Expand Down
Loading