summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Hooper <rhooper@toybox.ca>2018-05-14 17:00:38 -0400
committerRoy Hooper <rhooper@toybox.ca>2018-05-14 17:00:38 -0400
commit698912633fab70b7a0fa19a84c730face41b10ff (patch)
tree31d50f75a3ce3d8728b9e78d76d023d183f92bd7
parent567f3e30a77f286713b697a0f8a85e8b31a4a27a (diff)
Rename reload_next_character to reload_requested to make it match it's intended use
-rw-r--r--main.c4
-rw-r--r--ports/atmel-samd/mphalport.c2
-rw-r--r--shared-bindings/supervisor/__init__.c2
-rw-r--r--supervisor/shared/autoreload.c10
-rw-r--r--supervisor/shared/autoreload.h2
5 files changed, 10 insertions, 10 deletions
diff --git a/main.c b/main.c
index bc37fa871..24f27438c 100644
--- a/main.c
+++ b/main.c
@@ -168,7 +168,7 @@ bool start_mp(safe_mode_t safe_mode) {
reset_status_led();
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
MICROPY_VM_HOOK_LOOP
#endif
- if (reload_next_character) {
+ if (reload_requested) {
return true;
}
diff --git a/ports/atmel-samd/mphalport.c b/ports/atmel-samd/mphalport.c
index cdf27fe02..c1b8ce550 100644
--- a/ports/atmel-samd/mphalport.c
+++ b/ports/atmel-samd/mphalport.c
@@ -28,7 +28,7 @@ int mp_hal_stdin_rx_chr(void) {
#ifdef MICROPY_VM_HOOK_LOOP
MICROPY_VM_HOOK_LOOP
#endif
- // if (reload_next_character) {
+ // if (reload_requested) {
// return CHAR_CTRL_D;
// }
if (usb_bytes_available()) {
diff --git a/shared-bindings/supervisor/__init__.c b/shared-bindings/supervisor/__init__.c
index 9a3fa855a..4eae40406 100644
--- a/shared-bindings/supervisor/__init__.c
+++ b/shared-bindings/supervisor/__init__.c
@@ -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).
//|
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));
#if MICROPY_ENABLE_SCHEDULER
diff --git a/supervisor/shared/autoreload.c b/supervisor/shared/autoreload.c
index 39c33c05e..fc70991fb 100644
--- a/supervisor/shared/autoreload.c
+++ b/supervisor/shared/autoreload.c
@@ -32,23 +32,23 @@
volatile uint32_t autoreload_delay_ms = 0;
bool autoreload_enabled = false;
static bool autoreload_suspended = false;
-volatile bool reload_next_character = false;
+volatile bool reload_requested = false;
inline void autoreload_tick() {
if (autoreload_delay_ms == 0) {
return;
}
if (autoreload_delay_ms == 1 && autoreload_enabled &&
- !autoreload_suspended && !reload_next_character) {
+ !autoreload_suspended && !reload_requested) {
mp_keyboard_interrupt();
- reload_next_character = true;
+ reload_requested = true;
}
autoreload_delay_ms--;
}
void autoreload_enable() {
autoreload_enabled = true;
- reload_next_character = false;
+ reload_requested = false;
}
void autoreload_disable() {
@@ -73,5 +73,5 @@ void autoreload_start() {
void autoreload_stop() {
autoreload_delay_ms = 0;
- reload_next_character = false;
+ reload_requested = false;
}
diff --git a/supervisor/shared/autoreload.h b/supervisor/shared/autoreload.h
index 62f9fe073..bcb100151 100644
--- a/supervisor/shared/autoreload.h
+++ b/supervisor/shared/autoreload.h
@@ -29,7 +29,7 @@
#include <stdbool.h>
-extern volatile bool reload_next_character;
+extern volatile bool reload_requested;
void autoreload_tick(void);