summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Cross <sean@xobs.io>2020-05-21 21:33:43 +0800
committerSean Cross <sean@xobs.io>2020-05-27 11:28:49 +0800
commitec99dae95384fa08e4b1bc72273f1d34c6d646bb (patch)
treefa52fd23cdcd583a1bd5ff51c7c1e6cbd218ffb0
parentae950bc050fc9c7ee675d0a4d52f352ebc24a369 (diff)
tick: break on watchdog timeout exception
Signed-off-by: Sean Cross <sean@xobs.io>
-rw-r--r--supervisor/shared/tick.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/supervisor/shared/tick.c b/supervisor/shared/tick.c
index dc38e76f6..0e2adf216 100644
--- a/supervisor/shared/tick.c
+++ b/supervisor/shared/tick.c
@@ -96,7 +96,8 @@ void mp_hal_delay_ms(mp_uint_t delay) {
RUN_BACKGROUND_TASKS;
// Check to see if we've been CTRL-Ced by autoreload or the user.
if(MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception)) ||
- MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_reload_exception))) {
+ MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_reload_exception)) ||
+ MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_watchdog_exception))) {
break;
}
remaining = end_tick - port_get_raw_ticks(NULL);