Skip to content

Issue #2865 -Clean up after ctrl-c interrupt in sleep #3043

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

Merged
merged 11 commits into from
Jun 23, 2020
Merged

Issue #2865 -Clean up after ctrl-c interrupt in sleep #3043

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6fd2472
Merge pull request #8 from adafruit/main
DavePutz Jun 15, 2020
47425f2
Handle a sleep exit with ctrl-c
DavePutz Jun 16, 2020
6a76e15
Added stack trace after a sleep ctrl-c interrupt
DavePutz Jun 19, 2020
9978928
Update __init__.c
DavePutz Jun 19, 2020
beb80e7
removed trailing whitespace
DavePutz Jun 19, 2020
e381f59
Moved changes to supervisor/shared/tick.c
DavePutz Jun 20, 2020
0b52359
Generate stacktrace and reset exception for ctrl-c interrupt
DavePutz Jun 20, 2020
182a873
Rework handling of ctrl-c interrupt
DavePutz Jun 21, 2020
65512ce
Update tick.c
DavePutz Jun 22, 2020
30a1624
Removed unneeded #includes
DavePutz Jun 23, 2020
b80abf1
Update handing of a CTRL-C exception
DavePutz Jun 23, 2020
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
2 changes: 2 additions & 0 deletions shared-module/time/__init__.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
#include "py/mphal.h"
#include "supervisor/port.h"
#include "supervisor/shared/tick.h"
#include "py/obj.h"
#include "py/mpstate.h"

uint64_t common_hal_time_monotonic(void) {
return supervisor_ticks_ms64();
Expand Down
6 changes: 6 additions & 0 deletions supervisor/shared/tick.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,12 @@ void mp_hal_delay_ms(mp_uint_t delay) {
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
MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL;
nlr_raise(mp_obj_new_exception(&mp_type_KeyboardInterrupt));
}
break;
}
remaining = end_tick - port_get_raw_ticks(NULL);
Expand Down