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

supervisor: use mp_handle_pending to check for exceptions

Browse Source
This commit is contained in:
Jeff Epler 2020-08-23 09:03:34 -05:00
parent f8a9e11ff4
commit 1033e89561
2 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
supervisor/shared/micropython.c
View File

@ -30,6 +30,7 @@
#include "lib/oofatfs/ff.h" #include "lib/oofatfs/ff.h"
#include "py/mpconfig.h" #include "py/mpconfig.h"
#include "py/mpstate.h" #include "py/mpstate.h"
#include "py/runtime.h"
#include "supervisor/shared/status_leds.h" #include "supervisor/shared/status_leds.h"
@ -45,16 +46,7 @@ int mp_hal_stdin_rx_chr(void) {
#ifdef MICROPY_VM_HOOK_LOOP #ifdef MICROPY_VM_HOOK_LOOP
MICROPY_VM_HOOK_LOOP MICROPY_VM_HOOK_LOOP
#endif #endif
// Check to see if we've been CTRL-Ced by autoreload or the user. mp_handle_pending();
if (MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception))) {
// clear exception and generate stacktrace
MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL;
nlr_raise(&MP_STATE_VM(mp_kbd_exception));
}
if (MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_reload_exception)) || WATCHDOG_EXCEPTION_CHECK()) {
// stop reading immediately
return EOF;
}
if (serial_bytes_available()) { if (serial_bytes_available()) {
toggle_rx_led(); toggle_rx_led();
return serial_read(); return serial_read();

13
supervisor/shared/tick.c
View File

@ -27,6 +27,7 @@
#include "supervisor/shared/tick.h" #include "supervisor/shared/tick.h"
#include "py/mpstate.h" #include "py/mpstate.h"
#include "py/runtime.h"
#include "supervisor/linker.h" #include "supervisor/linker.h"
#include "supervisor/filesystem.h" #include "supervisor/filesystem.h"
#include "supervisor/background_callback.h" #include "supervisor/background_callback.h"
@ -149,17 +150,7 @@ 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))) mp_handle_pending();
{
// clear exception and generate stacktrace
MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL;
nlr_raise(&MP_STATE_VM(mp_kbd_exception));
}
if( MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_reload_exception)) ||
WATCHDOG_EXCEPTION_CHECK()) {
// stop sleeping immediately
break;
}
remaining = end_tick - port_get_raw_ticks(NULL); remaining = end_tick - port_get_raw_ticks(NULL);
// We break a bit early so we don't risk setting the alarm before the time when we call // We break a bit early so we don't risk setting the alarm before the time when we call
// sleep. // sleep.