From 698912633fab70b7a0fa19a84c730face41b10ff Mon Sep 17 00:00:00 2001
From: Roy Hooper <rhooper@toybox.ca>
Date: Mon, 14 May 2018 17:00:38 -0400
Subject: Rename reload_next_character to reload_requested to make it match
 it's intended use

---
 supervisor/shared/autoreload.c | 10 +++++-----
 supervisor/shared/autoreload.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'supervisor')

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);
 
-- 
cgit v1.2.3


From 06b6a10a5e54b7ba7421e2fc7ca42a2172773398 Mon Sep 17 00:00:00 2001
From: Roy Hooper <rhooper@toybox.ca>
Date: Mon, 14 May 2018 17:44:50 -0400
Subject: switch autoreload to reloadexception

---
 supervisor/shared/autoreload.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'supervisor')

diff --git a/supervisor/shared/autoreload.c b/supervisor/shared/autoreload.c
index fc70991fb..2a7fd1e9d 100644
--- a/supervisor/shared/autoreload.c
+++ b/supervisor/shared/autoreload.c
@@ -26,8 +26,8 @@
 
 #include "autoreload.h"
 
-#include "lib/utils/interrupt_char.h"
 #include "py/mphal.h"
+#include "py/reload.h"
 
 volatile uint32_t autoreload_delay_ms = 0;
 bool autoreload_enabled = false;
@@ -40,7 +40,7 @@ inline void autoreload_tick() {
     }
     if (autoreload_delay_ms == 1 && autoreload_enabled &&
         !autoreload_suspended && !reload_requested) {
-        mp_keyboard_interrupt();
+        mp_raise_reload_exception();
         reload_requested = true;
     }
     autoreload_delay_ms--;
-- 
cgit v1.2.3