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

Rename reload_next_character to reload_requested to make it match it's intended use

Browse Source
This commit is contained in:
Roy Hooper 2018-05-14 17:00:38 -04:00
parent 567f3e30a7
commit 698912633f
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main.c
View File

@ -168,7 +168,7 @@ bool start_mp(safe_mode_t safe_mode) {
reset_status_led(); reset_status_led();
if (result.return_code & PYEXEC_FORCED_EXIT) { if (result.return_code & PYEXEC_FORCED_EXIT) {
return reload_next_character; return reload_requested;
} }
} }
@ -180,7 +180,7 @@ bool start_mp(safe_mode_t safe_mode) {
#ifdef MICROPY_VM_HOOK_LOOP #ifdef MICROPY_VM_HOOK_LOOP
MICROPY_VM_HOOK_LOOP MICROPY_VM_HOOK_LOOP
#endif #endif
if (reload_next_character) { if (reload_requested) {
return true; return true;
} }

2
ports/atmel-samd/mphalport.c
View File

@ -28,7 +28,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
// if (reload_next_character) { // if (reload_requested) {
// return CHAR_CTRL_D; // return CHAR_CTRL_D;
// } // }
if (usb_bytes_available()) { if (usb_bytes_available()) {

2
shared-bindings/supervisor/__init__.c
View File

@ -100,7 +100,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(supervisor_set_rgb_status_brightness_obj, supervisor_s
//| Reload the microcontroller (equivalent to hitting Ctrl-D at the REPL). //| Reload the microcontroller (equivalent to hitting Ctrl-D at the REPL).
//| //|
STATIC mp_obj_t supervisor_reload(void) { STATIC mp_obj_t supervisor_reload(void) {
reload_next_character = true; reload_requested = true;
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));
#if MICROPY_ENABLE_SCHEDULER #if MICROPY_ENABLE_SCHEDULER

10
supervisor/shared/autoreload.c
View File

@ -32,23 +32,23 @@
volatile uint32_t autoreload_delay_ms = 0; volatile uint32_t autoreload_delay_ms = 0;
bool autoreload_enabled = false; bool autoreload_enabled = false;
static bool autoreload_suspended = false; static bool autoreload_suspended = false;
volatile bool reload_next_character = false; volatile bool reload_requested = false;
inline void autoreload_tick() { inline void autoreload_tick() {
if (autoreload_delay_ms == 0) { if (autoreload_delay_ms == 0) {
return; return;
} }
if (autoreload_delay_ms == 1 && autoreload_enabled && if (autoreload_delay_ms == 1 && autoreload_enabled &&
!autoreload_suspended && !reload_next_character) { !autoreload_suspended && !reload_requested) {
mp_keyboard_interrupt(); mp_keyboard_interrupt();
reload_next_character = true; reload_requested = true;
} }
autoreload_delay_ms--; autoreload_delay_ms--;
} }
void autoreload_enable() { void autoreload_enable() {
autoreload_enabled = true; autoreload_enabled = true;
reload_next_character = false; reload_requested = false;
} }
void autoreload_disable() { void autoreload_disable() {
@ -73,5 +73,5 @@ void autoreload_start() {
void autoreload_stop() { void autoreload_stop() {
autoreload_delay_ms = 0; autoreload_delay_ms = 0;
reload_next_character = false; reload_requested = false;
} }

2
supervisor/shared/autoreload.h
View File

@ -29,7 +29,7 @@
#include <stdbool.h> #include <stdbool.h>
extern volatile bool reload_next_character; extern volatile bool reload_requested;
void autoreload_tick(void); void autoreload_tick(void);