merge from upstream

3 files changed, 34 insertions, 33 deletions

diff --git a/supervisor/shared/micropython.c b/supervisor/shared/micropython.c
index 245db11d4..bbc4807f9 100644
--- a/supervisor/shared/micropython.c
+++ b/supervisor/shared/micropython.c
@@ -29,14 +29,24 @@
 #include "supervisor/serial.h"
 #include "lib/oofatfs/ff.h"
 #include "py/mpconfig.h"
+#include "py/mpstate.h"
+#include "py/runtime.h"
 
 #include "supervisor/shared/status_leds.h"
 
+#if CIRCUITPY_WATCHDOG
+#include "shared-bindings/watchdog/__init__.h"
+#define WATCHDOG_EXCEPTION_CHECK() (MP_STATE_VM(mp_pending_exception) == &mp_watchdog_timeout_exception)
+#else
+#define WATCHDOG_EXCEPTION_CHECK() 0
+#endif
+
 int mp_hal_stdin_rx_chr(void) {
     for (;;) {
         #ifdef MICROPY_VM_HOOK_LOOP
             MICROPY_VM_HOOK_LOOP
         #endif
+        mp_handle_pending();
         if (serial_bytes_available()) {
             toggle_rx_led();
             return serial_read();
diff --git a/supervisor/shared/rgb_led_status.c b/supervisor/shared/rgb_led_status.c
index 2f23e3125..283b9da12 100644
--- a/supervisor/shared/rgb_led_status.c
+++ b/supervisor/shared/rgb_led_status.c
@@ -66,22 +66,22 @@ busio_spi_obj_t status_apa102 = {
 #if defined(CP_RGB_STATUS_R) || defined(CP_RGB_STATUS_G) || defined(CP_RGB_STATUS_B)
 #define CP_RGB_STATUS_LED
 
-#include "shared-bindings/pulseio/PWMOut.h"
+#include "shared-bindings/pwmio/PWMOut.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-pulseio_pwmout_obj_t rgb_status_r = {
+pwmio_pwmout_obj_t rgb_status_r = {
     .base = {
-        .type = &pulseio_pwmout_type,
+        .type = &pwmio_pwmout_type,
     },
 };
-pulseio_pwmout_obj_t rgb_status_g = {
+pwmio_pwmout_obj_t rgb_status_g = {
     .base = {
-        .type = &pulseio_pwmout_type,
+        .type = &pwmio_pwmout_type,
     },
 };
-pulseio_pwmout_obj_t rgb_status_b = {
+pwmio_pwmout_obj_t rgb_status_b = {
     .base = {
-        .type = &pulseio_pwmout_type,
+        .type = &pwmio_pwmout_type,
     },
 };
 
@@ -147,26 +147,26 @@ void rgb_led_status_init() {
 
     #if defined(CP_RGB_STATUS_LED)
     if (common_hal_mcu_pin_is_free(CP_RGB_STATUS_R)) {
-        pwmout_result_t red_result = common_hal_pulseio_pwmout_construct(&rgb_status_r, CP_RGB_STATUS_R, 0, 50000, false);
+        pwmout_result_t red_result = common_hal_pwmio_pwmout_construct(&rgb_status_r, CP_RGB_STATUS_R, 0, 50000, false);
 
         if (PWMOUT_OK == red_result) {
-            common_hal_pulseio_pwmout_never_reset(&rgb_status_r);
+            common_hal_pwmio_pwmout_never_reset(&rgb_status_r);
         }
     }
 
     if (common_hal_mcu_pin_is_free(CP_RGB_STATUS_G)) {
-        pwmout_result_t green_result = common_hal_pulseio_pwmout_construct(&rgb_status_g, CP_RGB_STATUS_G, 0, 50000, false);
+        pwmout_result_t green_result = common_hal_pwmio_pwmout_construct(&rgb_status_g, CP_RGB_STATUS_G, 0, 50000, false);
 
         if (PWMOUT_OK == green_result) {
-            common_hal_pulseio_pwmout_never_reset(&rgb_status_g);
+            common_hal_pwmio_pwmout_never_reset(&rgb_status_g);
         }
     }
 
     if (common_hal_mcu_pin_is_free(CP_RGB_STATUS_B)) {
-        pwmout_result_t blue_result = common_hal_pulseio_pwmout_construct(&rgb_status_b, CP_RGB_STATUS_B, 0, 50000, false);
+        pwmout_result_t blue_result = common_hal_pwmio_pwmout_construct(&rgb_status_b, CP_RGB_STATUS_B, 0, 50000, false);
 
         if (PWMOUT_OK == blue_result) {
-            common_hal_pulseio_pwmout_never_reset(&rgb_status_b);
+            common_hal_pwmio_pwmout_never_reset(&rgb_status_b);
         }
     }
     #endif
@@ -242,9 +242,9 @@ void new_status_color(uint32_t rgb) {
         status_rgb_color[2] = (uint16_t) (blue_u8 << 8) + blue_u8;
 	#endif
 
-        common_hal_pulseio_pwmout_set_duty_cycle(&rgb_status_r, status_rgb_color[0]);
-        common_hal_pulseio_pwmout_set_duty_cycle(&rgb_status_g, status_rgb_color[1]);
-        common_hal_pulseio_pwmout_set_duty_cycle(&rgb_status_b, status_rgb_color[2]);
+        common_hal_pwmio_pwmout_set_duty_cycle(&rgb_status_r, status_rgb_color[0]);
+        common_hal_pwmio_pwmout_set_duty_cycle(&rgb_status_g, status_rgb_color[1]);
+        common_hal_pwmio_pwmout_set_duty_cycle(&rgb_status_b, status_rgb_color[2]);
     #endif
 }
 
@@ -288,9 +288,9 @@ void temp_status_color(uint32_t rgb) {
         temp_status_color_rgb[2] = (uint16_t) (blue_u8 << 8) + blue_u8;
     #endif
 
-        common_hal_pulseio_pwmout_set_duty_cycle(&rgb_status_r, temp_status_color_rgb[0]);
-        common_hal_pulseio_pwmout_set_duty_cycle(&rgb_status_g, temp_status_color_rgb[1]);
-        common_hal_pulseio_pwmout_set_duty_cycle(&rgb_status_b, temp_status_color_rgb[2]);
+        common_hal_pwmio_pwmout_set_duty_cycle(&rgb_status_r, temp_status_color_rgb[0]);
+        common_hal_pwmio_pwmout_set_duty_cycle(&rgb_status_g, temp_status_color_rgb[1]);
+        common_hal_pwmio_pwmout_set_duty_cycle(&rgb_status_b, temp_status_color_rgb[2]);
     #endif
 }
 
@@ -327,9 +327,9 @@ void clear_temp_status() {
 		blue = status_rgb_color[2];
 	#endif
 
-        common_hal_pulseio_pwmout_set_duty_cycle(&rgb_status_r, red);
-        common_hal_pulseio_pwmout_set_duty_cycle(&rgb_status_g, green);
-        common_hal_pulseio_pwmout_set_duty_cycle(&rgb_status_b, blue);
+        common_hal_pwmio_pwmout_set_duty_cycle(&rgb_status_r, red);
+        common_hal_pwmio_pwmout_set_duty_cycle(&rgb_status_g, green);
+        common_hal_pwmio_pwmout_set_duty_cycle(&rgb_status_b, blue);
     #endif
 }
 
diff --git a/supervisor/shared/tick.c b/supervisor/shared/tick.c
index 58c9e7f64..91ffa307d 100644
--- a/supervisor/shared/tick.c
+++ b/supervisor/shared/tick.c
@@ -27,6 +27,7 @@
 #include "supervisor/shared/tick.h"
 
 #include "py/mpstate.h"
+#include "py/runtime.h"
 #include "supervisor/linker.h"
 #include "supervisor/filesystem.h"
 #include "supervisor/background_callback.h"
@@ -149,17 +150,7 @@ void mp_hal_delay_ms(mp_uint_t delay) {
     while (remaining > 0) {
         RUN_BACKGROUND_TASKS;
         // 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)))
-           {
-            // 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;
-        }
+        mp_handle_pending();
         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
         // sleep.