djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rework handling of ctrl-c interrupt

Browse Source
This commit is contained in:
DavePutz 2020-06-21 13:28:26 -05:00 committed by GitHub
parent 0b52359190
commit 182a8733a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions

10
supervisor/shared/tick.c

@ -102,15 +102,15 @@ void mp_hal_delay_ms(mp_uint_t delay) {
while (remaining > 0) { while (remaining > 0) {
RUN_BACKGROUND_TASKS; RUN_BACKGROUND_TASKS;
// Check to see if we've been CTRL-Ced by autoreload or the user. // 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)) || 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)) ||
WATCHDOG_EXCEPTION_CHECK()) {
if(MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception)))
{ {
// clear exception and generate stacktrace // clear exception and generate stacktrace
MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL; MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL;
nlr_raise(mp_obj_new_exception(&mp_type_KeyboardInterrupt)); nlr_raise(mp_obj_new_exception(&mp_type_KeyboardInterrupt));
} }
if( MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_reload_exception)) ||
WATCHDOG_EXCEPTION_CHECK()) {
// stop sleeping immediately
break; break;
} }
remaining = end_tick - port_get_raw_ticks(NULL); remaining = end_tick - port_get_raw_ticks(NULL);