From 90b9ec6f2ce840885492f125f8c473df8bd67337 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Fri, 18 Sep 2020 17:40:49 +0530
Subject: [PATCH 01/16] Initial Sleep Support

---
 .../common-hal/microcontroller/__init__.c     |  6 ++++
 ports/esp32s2/common-hal/timealarm/__init__.c | 10 ++++++
 ports/esp32s2/mpconfigport.mk                 |  1 +
 py/circuitpy_defns.mk                         |  4 +++
 py/circuitpy_mpconfig.h                       |  8 +++++
 py/circuitpy_mpconfig.mk                      |  3 ++
 shared-bindings/microcontroller/__init__.c    | 17 ++++++++++
 shared-bindings/microcontroller/__init__.h    |  2 ++
 shared-bindings/timealarm/__init__.c          | 31 +++++++++++++++++++
 shared-bindings/timealarm/__init__.h          |  8 +++++
 10 files changed, 90 insertions(+)
 create mode 100644 ports/esp32s2/common-hal/timealarm/__init__.c
 create mode 100644 shared-bindings/timealarm/__init__.c
 create mode 100644 shared-bindings/timealarm/__init__.h

diff --git a/ports/esp32s2/common-hal/microcontroller/__init__.c b/ports/esp32s2/common-hal/microcontroller/__init__.c
index 6b2e18673d..2fcc2ceda1 100644
--- a/ports/esp32s2/common-hal/microcontroller/__init__.c
+++ b/ports/esp32s2/common-hal/microcontroller/__init__.c
@@ -41,6 +41,8 @@
 
 #include "freertos/FreeRTOS.h"
 
+#include "esp_sleep.h"
+
 void common_hal_mcu_delay_us(uint32_t delay) {
 
 }
@@ -77,6 +79,10 @@ void common_hal_mcu_reset(void) {
     while(1);
 }
 
+void common_hal_mcu_sleep(void) {
+    esp_deep_sleep_start(); 
+}
+
 // The singleton microcontroller.Processor object, bound to microcontroller.cpu
 // It currently only has properties, and no state.
 const mcu_processor_obj_t common_hal_mcu_processor_obj = {
diff --git a/ports/esp32s2/common-hal/timealarm/__init__.c b/ports/esp32s2/common-hal/timealarm/__init__.c
new file mode 100644
index 0000000000..e404f801a6
--- /dev/null
+++ b/ports/esp32s2/common-hal/timealarm/__init__.c
@@ -0,0 +1,10 @@
+#include "esp_sleep.h"
+
+#include "shared-bindings/timealarm/__init__.h"
+
+void common_hal_timealarm_duration (uint32_t ms) {
+    if (esp_sleep_enable_timer_wakeup((ms) * 1000) == ESP_ERR_INVALID_ARG) {
+        mp_raise_ValueError(translate("time out of range"));
+    }   
+}  
+
diff --git a/ports/esp32s2/mpconfigport.mk b/ports/esp32s2/mpconfigport.mk
index c06c89c909..125d078e8a 100644
--- a/ports/esp32s2/mpconfigport.mk
+++ b/ports/esp32s2/mpconfigport.mk
@@ -22,6 +22,7 @@ CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_NVM = 0
+CIRCUITPY_TIMEALARM = 1
 # We don't have enough endpoints to include MIDI.
 CIRCUITPY_USB_MIDI = 0
 CIRCUITPY_WIFI = 1
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index ccdf973e9f..91af6ffc15 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -259,6 +259,9 @@ endif
 ifeq ($(CIRCUITPY_TIME),1)
 SRC_PATTERNS += time/%
 endif
+ifeq ($(CIRCUITPY_TIMEALARM),1)
+SRC_PATTERNS += timealarm/%
+endif
 ifeq ($(CIRCUITPY_TOUCHIO),1)
 SRC_PATTERNS += touchio/%
 endif
@@ -360,6 +363,7 @@ SRC_COMMON_HAL_ALL = \
 	ssl/SSLContext.c \
 	supervisor/Runtime.c \
 	supervisor/__init__.c \
+	timealarm/__init__.c \
 	watchdog/WatchDogMode.c \
 	watchdog/WatchDogTimer.c \
 	watchdog/__init__.c \
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index 1e01bd9c5e..8efd439212 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -663,6 +663,13 @@ extern const struct _mp_obj_module_t time_module;
 #define TIME_MODULE_ALT_NAME
 #endif
 
+#if CIRCUITPY_TIMEALARM
+extern const struct _mp_obj_module_t timealarm_module;
+#define TIMEALARM_MODULE             { MP_OBJ_NEW_QSTR(MP_QSTR_timealarm), (mp_obj_t)&timealarm_module },
+#else
+#define TIMEALARM_MODULE
+#endif
+
 #if CIRCUITPY_TOUCHIO
 extern const struct _mp_obj_module_t touchio_module;
 #define TOUCHIO_MODULE         { MP_OBJ_NEW_QSTR(MP_QSTR_touchio), (mp_obj_t)&touchio_module },
@@ -821,6 +828,7 @@ extern const struct _mp_obj_module_t wifi_module;
     STRUCT_MODULE \
     SUPERVISOR_MODULE \
     TOUCHIO_MODULE \
+    TIMEALARM_MODULE \
     UHEAP_MODULE \
     USB_HID_MODULE \
     USB_MIDI_MODULE \
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index a6aabec33d..bb70daccc7 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -234,6 +234,9 @@ CFLAGS += -DCIRCUITPY_TERMINALIO=$(CIRCUITPY_TERMINALIO)
 CIRCUITPY_TIME ?= 1
 CFLAGS += -DCIRCUITPY_TIME=$(CIRCUITPY_TIME)
 
+CIRCUITPY_TIMEALARM ?= 0
+CFLAGS += -DCIRCUITPY_TIMEALARM=$(CIRCUITPY_TIMEALARM)
+
 # touchio might be native or generic. See circuitpy_defns.mk.
 CIRCUITPY_TOUCHIO_USE_NATIVE ?= 0
 CFLAGS += -DCIRCUITPY_TOUCHIO_USE_NATIVE=$(CIRCUITPY_TOUCHIO_USE_NATIVE)
diff --git a/shared-bindings/microcontroller/__init__.c b/shared-bindings/microcontroller/__init__.c
index 2e58bdcc29..b8ca8f18ba 100644
--- a/shared-bindings/microcontroller/__init__.c
+++ b/shared-bindings/microcontroller/__init__.c
@@ -136,6 +136,22 @@ STATIC mp_obj_t mcu_reset(void) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(mcu_reset_obj, mcu_reset);
 
+//| def sleep() -> None:
+//|     """Microcontroller will go into deep sleep. 
+//|     cpy will restart when wakeup func. is triggered`.
+//|
+//|     .. warning:: This may result in file system corruption when connected to a
+//|       host computer. Be very careful when calling this! Make sure the device
+//|       "Safely removed" on Windows or "ejected" on Mac OSX and Linux."""
+//|     ...
+//|
+STATIC mp_obj_t mcu_sleep(void) {
+    common_hal_mcu_sleep();
+    // We won't actually get here because mcu is going into sleep.
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(mcu_sleep_obj, mcu_sleep);
+
 //| nvm: Optional[ByteArray]
 //| """Available non-volatile memory.
 //| This object is the sole instance of `nvm.ByteArray` when available or ``None`` otherwise.
@@ -171,6 +187,7 @@ STATIC const mp_rom_map_elem_t mcu_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_enable_interrupts), MP_ROM_PTR(&mcu_enable_interrupts_obj) },
     { MP_ROM_QSTR(MP_QSTR_on_next_reset), MP_ROM_PTR(&mcu_on_next_reset_obj) },
     { MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&mcu_reset_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&mcu_sleep_obj) },
     #if CIRCUITPY_INTERNAL_NVM_SIZE > 0
     { MP_ROM_QSTR(MP_QSTR_nvm),  MP_ROM_PTR(&common_hal_mcu_nvm_obj) },
     #else
diff --git a/shared-bindings/microcontroller/__init__.h b/shared-bindings/microcontroller/__init__.h
index 8abdff763c..b0f61e64b9 100644
--- a/shared-bindings/microcontroller/__init__.h
+++ b/shared-bindings/microcontroller/__init__.h
@@ -43,6 +43,8 @@ extern void common_hal_mcu_enable_interrupts(void);
 extern void common_hal_mcu_on_next_reset(mcu_runmode_t runmode);
 extern void common_hal_mcu_reset(void);
 
+extern void common_hal_mcu_sleep(void);
+
 extern const mp_obj_dict_t mcu_pin_globals;
 
 extern const mcu_processor_obj_t common_hal_mcu_processor_obj;
diff --git a/shared-bindings/timealarm/__init__.c b/shared-bindings/timealarm/__init__.c
new file mode 100644
index 0000000000..19fb4f093a
--- /dev/null
+++ b/shared-bindings/timealarm/__init__.c
@@ -0,0 +1,31 @@
+#include "py/obj.h"
+#include "shared-bindings/timealarm/__init__.h"
+
+//| Set Timer Wakeup 
+//|
+STATIC mp_obj_t timealarm_duration(mp_obj_t seconds_o) { 
+    #if MICROPY_PY_BUILTINS_FLOAT
+    mp_float_t seconds = mp_obj_get_float(seconds_o);
+    mp_float_t msecs = 1000.0f * seconds + 0.5f;
+    #else
+    mp_int_t seconds = mp_obj_get_int(seconds_o);
+    mp_int_t msecs = 1000 * seconds;
+    #endif
+    if (seconds < 0) {
+        mp_raise_ValueError(translate("sleep length must be non-negative"));
+    }
+    common_hal_timealarm_duration(msecs);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(timealarm_duration_obj, timealarm_duration);
+
+STATIC const mp_rom_map_elem_t timealarm_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_timealarm) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_duration), MP_ROM_PTR(&timealarm_duration_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(timealarm_module_globals, timealarm_module_globals_table);
+
+const mp_obj_module_t timealarm_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t*)&timealarm_module_globals,
+};
diff --git a/shared-bindings/timealarm/__init__.h b/shared-bindings/timealarm/__init__.h
new file mode 100644
index 0000000000..b70cbda1f2
--- /dev/null
+++ b/shared-bindings/timealarm/__init__.h
@@ -0,0 +1,8 @@
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_ulp___INIT___H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_ulp___INIT___H
+
+#include "py/runtime.h"
+
+extern void common_hal_timealarm_duration(uint32_t);
+
+#endif
\ No newline at end of file

From 3a30887b444c6c17f116abd85308251486c9dfe9 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Fri, 18 Sep 2020 17:59:18 +0530
Subject: [PATCH 02/16] Update soft reboot message

---
 main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.c b/main.c
index b43b3b8c80..ebce8cd403 100755
--- a/main.c
+++ b/main.c
@@ -509,7 +509,7 @@ int __attribute__((used)) main(void) {
         }
         if (exit_code == PYEXEC_FORCED_EXIT) {
             if (!first_run) {
-                serial_write_compressed(translate("soft reboot\n"));
+                serial_write_compressed(translate("\n\n ----- soft reboot -----\n"));
             }
             first_run = false;
             skip_repl = run_code_py(safe_mode);

From e310b871c8eb8cf924e6937edc7cd51a2be1a6b7 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Sat, 19 Sep 2020 17:48:36 +0530
Subject: [PATCH 03/16] Get io wake working

---
 main.c                                        |  2 +-
 ports/esp32s2/common-hal/io_alarm/__init__.c  | 27 +++++++++++++++
 .../{timealarm => time_alarm}/__init__.c      |  4 +--
 ports/esp32s2/mpconfigport.mk                 |  3 +-
 py/circuitpy_defns.mk                         | 10 ++++--
 py/circuitpy_mpconfig.h                       | 18 +++++++---
 py/circuitpy_mpconfig.mk                      |  7 ++--
 shared-bindings/io_alarm/__init__.c           | 34 +++++++++++++++++++
 shared-bindings/io_alarm/__init__.h           |  8 +++++
 shared-bindings/time_alarm/__init__.c         | 31 +++++++++++++++++
 shared-bindings/time_alarm/__init__.h         |  8 +++++
 shared-bindings/timealarm/__init__.c          | 31 -----------------
 shared-bindings/timealarm/__init__.h          |  8 -----
 13 files changed, 138 insertions(+), 53 deletions(-)
 create mode 100644 ports/esp32s2/common-hal/io_alarm/__init__.c
 rename ports/esp32s2/common-hal/{timealarm => time_alarm}/__init__.c (63%)
 create mode 100644 shared-bindings/io_alarm/__init__.c
 create mode 100644 shared-bindings/io_alarm/__init__.h
 create mode 100644 shared-bindings/time_alarm/__init__.c
 create mode 100644 shared-bindings/time_alarm/__init__.h
 delete mode 100644 shared-bindings/timealarm/__init__.c
 delete mode 100644 shared-bindings/timealarm/__init__.h

diff --git a/main.c b/main.c
index ebce8cd403..5a30f4bb26 100755
--- a/main.c
+++ b/main.c
@@ -509,7 +509,7 @@ int __attribute__((used)) main(void) {
         }
         if (exit_code == PYEXEC_FORCED_EXIT) {
             if (!first_run) {
-                serial_write_compressed(translate("\n\n ----- soft reboot -----\n"));
+                serial_write_compressed(translate("\n\n------ soft reboot ------\n"));
             }
             first_run = false;
             skip_repl = run_code_py(safe_mode);
diff --git a/ports/esp32s2/common-hal/io_alarm/__init__.c b/ports/esp32s2/common-hal/io_alarm/__init__.c
new file mode 100644
index 0000000000..d88c147fe0
--- /dev/null
+++ b/ports/esp32s2/common-hal/io_alarm/__init__.c
@@ -0,0 +1,27 @@
+#include "shared-bindings/io_alarm/__init__.h"
+
+#include "esp_sleep.h"
+#include "driver/rtc_io.h"
+
+void common_hal_io_alarm_pin_state (uint8_t gpio, uint8_t level, bool pull) {
+    if (!rtc_gpio_is_valid_gpio(gpio))  {
+        mp_raise_ValueError(translate("io must be rtc io"));
+        return;        
+    }   
+
+    switch(esp_sleep_enable_ext0_wakeup(gpio, level)) {
+        case ESP_ERR_INVALID_ARG:
+            mp_raise_ValueError(translate("trigger level must be 0 or 1"));
+            return;
+        case ESP_ERR_INVALID_STATE:
+            mp_raise_RuntimeError(translate("wakeup conflict"));
+            return;
+        default: 
+            break;   
+    }
+
+    if (pull) {
+        (level) ? rtc_gpio_pulldown_en(gpio) : rtc_gpio_pullup_en(gpio);
+    }     
+}  
+
diff --git a/ports/esp32s2/common-hal/timealarm/__init__.c b/ports/esp32s2/common-hal/time_alarm/__init__.c
similarity index 63%
rename from ports/esp32s2/common-hal/timealarm/__init__.c
rename to ports/esp32s2/common-hal/time_alarm/__init__.c
index e404f801a6..342ca9d154 100644
--- a/ports/esp32s2/common-hal/timealarm/__init__.c
+++ b/ports/esp32s2/common-hal/time_alarm/__init__.c
@@ -1,8 +1,8 @@
 #include "esp_sleep.h"
 
-#include "shared-bindings/timealarm/__init__.h"
+#include "shared-bindings/time_alarm/__init__.h"
 
-void common_hal_timealarm_duration (uint32_t ms) {
+void common_hal_time_alarm_duration (uint32_t ms) {
     if (esp_sleep_enable_timer_wakeup((ms) * 1000) == ESP_ERR_INVALID_ARG) {
         mp_raise_ValueError(translate("time out of range"));
     }   
diff --git a/ports/esp32s2/mpconfigport.mk b/ports/esp32s2/mpconfigport.mk
index 125d078e8a..0f8f3ada53 100644
--- a/ports/esp32s2/mpconfigport.mk
+++ b/ports/esp32s2/mpconfigport.mk
@@ -22,7 +22,8 @@ CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_NVM = 0
-CIRCUITPY_TIMEALARM = 1
+CIRCUITPY_TIME_ALARM = 1
+CIRCUITPY_IO_ALARM = 1
 # We don't have enough endpoints to include MIDI.
 CIRCUITPY_USB_MIDI = 0
 CIRCUITPY_WIFI = 1
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index 91af6ffc15..672eeda40c 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -259,8 +259,11 @@ endif
 ifeq ($(CIRCUITPY_TIME),1)
 SRC_PATTERNS += time/%
 endif
-ifeq ($(CIRCUITPY_TIMEALARM),1)
-SRC_PATTERNS += timealarm/%
+ifeq ($(CIRCUITPY_TIME_ALARM),1)
+SRC_PATTERNS += time_alarm/%
+endif
+ifeq ($(CIRCUITPY_IO_ALARM),1)
+SRC_PATTERNS += io_alarm/%
 endif
 ifeq ($(CIRCUITPY_TOUCHIO),1)
 SRC_PATTERNS += touchio/%
@@ -363,7 +366,8 @@ SRC_COMMON_HAL_ALL = \
 	ssl/SSLContext.c \
 	supervisor/Runtime.c \
 	supervisor/__init__.c \
-	timealarm/__init__.c \
+	time_alarm/__init__.c \
+	io_alarm/__init__.c \
 	watchdog/WatchDogMode.c \
 	watchdog/WatchDogTimer.c \
 	watchdog/__init__.c \
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index 8efd439212..d899ecacb6 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -663,11 +663,18 @@ extern const struct _mp_obj_module_t time_module;
 #define TIME_MODULE_ALT_NAME
 #endif
 
-#if CIRCUITPY_TIMEALARM
-extern const struct _mp_obj_module_t timealarm_module;
-#define TIMEALARM_MODULE             { MP_OBJ_NEW_QSTR(MP_QSTR_timealarm), (mp_obj_t)&timealarm_module },
+#if CIRCUITPY_TIME_ALARM
+extern const struct _mp_obj_module_t time_alarm_module;
+#define TIME_ALARM_MODULE             { MP_OBJ_NEW_QSTR(MP_QSTR_time_alarm), (mp_obj_t)&time_alarm_module },
 #else
-#define TIMEALARM_MODULE
+#define TIME_ALARM_MODULE
+#endif
+
+#if CIRCUITPY_IO_ALARM
+extern const struct _mp_obj_module_t io_alarm_module;
+#define IO_ALARM_MODULE             { MP_OBJ_NEW_QSTR(MP_QSTR_io_alarm), (mp_obj_t)&io_alarm_module },
+#else
+#define IO_ALARM_MODULE
 #endif
 
 #if CIRCUITPY_TOUCHIO
@@ -828,7 +835,8 @@ extern const struct _mp_obj_module_t wifi_module;
     STRUCT_MODULE \
     SUPERVISOR_MODULE \
     TOUCHIO_MODULE \
-    TIMEALARM_MODULE \
+    TIME_ALARM_MODULE \
+    IO_ALARM_MODULE \
     UHEAP_MODULE \
     USB_HID_MODULE \
     USB_MIDI_MODULE \
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index bb70daccc7..4cce2a0a1a 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -234,8 +234,11 @@ CFLAGS += -DCIRCUITPY_TERMINALIO=$(CIRCUITPY_TERMINALIO)
 CIRCUITPY_TIME ?= 1
 CFLAGS += -DCIRCUITPY_TIME=$(CIRCUITPY_TIME)
 
-CIRCUITPY_TIMEALARM ?= 0
-CFLAGS += -DCIRCUITPY_TIMEALARM=$(CIRCUITPY_TIMEALARM)
+CIRCUITPY_TIME_ALARM ?= 0
+CFLAGS += -DCIRCUITPY_TIME_ALARM=$(CIRCUITPY_TIME_ALARM)
+
+CIRCUITPY_IO_ALARM ?= 0
+CFLAGS += -DCIRCUITPY_IO_ALARM=$(CIRCUITPY_IO_ALARM)
 
 # touchio might be native or generic. See circuitpy_defns.mk.
 CIRCUITPY_TOUCHIO_USE_NATIVE ?= 0
diff --git a/shared-bindings/io_alarm/__init__.c b/shared-bindings/io_alarm/__init__.c
new file mode 100644
index 0000000000..534b7e66f5
--- /dev/null
+++ b/shared-bindings/io_alarm/__init__.c
@@ -0,0 +1,34 @@
+#include "py/obj.h"
+
+#include "shared-bindings/io_alarm/__init__.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+//| Set Timer Wakeup 
+//|
+STATIC mp_obj_t io_alarm_pin_state(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {  
+    enum { ARG_level, ARG_pull };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_level, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
+        { MP_QSTR_pull, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_bool = false} },
+    }; 
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);  
+
+    mcu_pin_obj_t *pin = validate_obj_is_pin(pos_args[0]);
+    common_hal_io_alarm_pin_state(pin->number, args[ARG_level].u_int, args[ARG_pull].u_bool);
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(io_alarm_pin_state_obj, 1, io_alarm_pin_state);
+
+STATIC const mp_rom_map_elem_t io_alarm_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_io_alarm) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_PinState), MP_ROM_PTR(&io_alarm_pin_state_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(io_alarm_module_globals, io_alarm_module_globals_table);
+
+const mp_obj_module_t io_alarm_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t*)&io_alarm_module_globals,
+};
diff --git a/shared-bindings/io_alarm/__init__.h b/shared-bindings/io_alarm/__init__.h
new file mode 100644
index 0000000000..dd4b881657
--- /dev/null
+++ b/shared-bindings/io_alarm/__init__.h
@@ -0,0 +1,8 @@
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_IO_ALARM___INIT___H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_IO_ALARM___INIT___H
+
+#include "py/runtime.h"
+
+extern void common_hal_io_alarm_pin_state(uint8_t gpio, uint8_t level, bool pull);
+
+#endif //MICROPY_INCLUDED_SHARED_BINDINGS_IO_ALARM___INIT___H
diff --git a/shared-bindings/time_alarm/__init__.c b/shared-bindings/time_alarm/__init__.c
new file mode 100644
index 0000000000..bfbece83c0
--- /dev/null
+++ b/shared-bindings/time_alarm/__init__.c
@@ -0,0 +1,31 @@
+#include "py/obj.h"
+#include "shared-bindings/time_alarm/__init__.h"
+
+//| Set Timer Wakeup 
+//|
+STATIC mp_obj_t time_alarm_duration(mp_obj_t seconds_o) { 
+    #if MICROPY_PY_BUILTINS_FLOAT
+    mp_float_t seconds = mp_obj_get_float(seconds_o);
+    mp_float_t msecs = 1000.0f * seconds + 0.5f;
+    #else
+    mp_int_t seconds = mp_obj_get_int(seconds_o);
+    mp_int_t msecs = 1000 * seconds;
+    #endif
+    if (seconds < 0) {
+        mp_raise_ValueError(translate("sleep length must be non-negative"));
+    }
+    common_hal_time_alarm_duration(msecs);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(time_alarm_duration_obj, time_alarm_duration);
+
+STATIC const mp_rom_map_elem_t time_alarm_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_time_alarm) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_Duration), MP_ROM_PTR(&time_alarm_duration_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(time_alarm_module_globals, time_alarm_module_globals_table);
+
+const mp_obj_module_t time_alarm_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t*)&time_alarm_module_globals,
+};
diff --git a/shared-bindings/time_alarm/__init__.h b/shared-bindings/time_alarm/__init__.h
new file mode 100644
index 0000000000..0913f7fded
--- /dev/null
+++ b/shared-bindings/time_alarm/__init__.h
@@ -0,0 +1,8 @@
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_TIME_ALARM___INIT___H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_TIME_ALARM___INIT___H
+
+#include "py/runtime.h"
+
+extern void common_hal_time_alarm_duration(uint32_t);
+
+#endif //MICROPY_INCLUDED_SHARED_BINDINGS_TIME_ALARM___INIT___H
diff --git a/shared-bindings/timealarm/__init__.c b/shared-bindings/timealarm/__init__.c
deleted file mode 100644
index 19fb4f093a..0000000000
--- a/shared-bindings/timealarm/__init__.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "py/obj.h"
-#include "shared-bindings/timealarm/__init__.h"
-
-//| Set Timer Wakeup 
-//|
-STATIC mp_obj_t timealarm_duration(mp_obj_t seconds_o) { 
-    #if MICROPY_PY_BUILTINS_FLOAT
-    mp_float_t seconds = mp_obj_get_float(seconds_o);
-    mp_float_t msecs = 1000.0f * seconds + 0.5f;
-    #else
-    mp_int_t seconds = mp_obj_get_int(seconds_o);
-    mp_int_t msecs = 1000 * seconds;
-    #endif
-    if (seconds < 0) {
-        mp_raise_ValueError(translate("sleep length must be non-negative"));
-    }
-    common_hal_timealarm_duration(msecs);
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(timealarm_duration_obj, timealarm_duration);
-
-STATIC const mp_rom_map_elem_t timealarm_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_timealarm) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_duration), MP_ROM_PTR(&timealarm_duration_obj) },
-};
-STATIC MP_DEFINE_CONST_DICT(timealarm_module_globals, timealarm_module_globals_table);
-
-const mp_obj_module_t timealarm_module = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&timealarm_module_globals,
-};
diff --git a/shared-bindings/timealarm/__init__.h b/shared-bindings/timealarm/__init__.h
deleted file mode 100644
index b70cbda1f2..0000000000
--- a/shared-bindings/timealarm/__init__.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_ulp___INIT___H
-#define MICROPY_INCLUDED_SHARED_BINDINGS_ulp___INIT___H
-
-#include "py/runtime.h"
-
-extern void common_hal_timealarm_duration(uint32_t);
-
-#endif
\ No newline at end of file

From 05a3f203dbaf53fbccd97395a90d025f2d3b9dc2 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Tue, 22 Sep 2020 23:45:38 +0530
Subject: [PATCH 04/16] Add function to get time elapsed during sleep

---
 .../common-hal/microcontroller/__init__.c     | 46 +++++++++++++++++++
 shared-bindings/microcontroller/__init__.c    | 20 ++++++++
 shared-bindings/microcontroller/__init__.h    |  5 ++
 3 files changed, 71 insertions(+)

diff --git a/ports/esp32s2/common-hal/microcontroller/__init__.c b/ports/esp32s2/common-hal/microcontroller/__init__.c
index 2fcc2ceda1..8b9fef2f98 100644
--- a/ports/esp32s2/common-hal/microcontroller/__init__.c
+++ b/ports/esp32s2/common-hal/microcontroller/__init__.c
@@ -25,6 +25,8 @@
  * THE SOFTWARE.
  */
 
+#include <sys/time.h>
+
 #include "py/mphal.h"
 #include "py/obj.h"
 #include "py/runtime.h"
@@ -42,6 +44,9 @@
 #include "freertos/FreeRTOS.h"
 
 #include "esp_sleep.h"
+#include "soc/rtc_periph.h"
+
+static RTC_DATA_ATTR struct timeval sleep_enter_time;
 
 void common_hal_mcu_delay_us(uint32_t delay) {
 
@@ -80,9 +85,50 @@ void common_hal_mcu_reset(void) {
 }
 
 void common_hal_mcu_sleep(void) {
+    gettimeofday(&sleep_enter_time, NULL);
     esp_deep_sleep_start(); 
 }
 
+int common_hal_mcu_get_sleep_time(void) {
+    struct timeval now;
+    gettimeofday(&now, NULL);
+    return (now.tv_sec - sleep_enter_time.tv_sec) * 1000 + (now.tv_usec - sleep_enter_time.tv_usec) / 1000;
+}
+
+mp_obj_t common_hal_mcu_get_wake_alarm(void) {
+    switch (esp_sleep_get_wakeup_cause()) {
+        case ESP_SLEEP_WAKEUP_TIMER: ;
+            //Wake up from timer.
+            time_alarm_obj_t *timer = m_new_obj(time_alarm_obj_t);
+            timer->base.type = &time_alarm_type;           
+            return timer;
+        case ESP_SLEEP_WAKEUP_EXT0: ;
+            //Wake up from GPIO
+            io_alarm_obj_t *ext0 = m_new_obj(io_alarm_obj_t);
+            ext0->base.type = &io_alarm_type;  
+            return ext0;
+        case ESP_SLEEP_WAKEUP_EXT1: 
+            //Wake up from GPIO, returns -> esp_sleep_get_ext1_wakeup_status()  
+            /*uint64_t wakeup_pin_mask = esp_sleep_get_ext1_wakeup_status();
+            if (wakeup_pin_mask != 0) {
+                int pin = __builtin_ffsll(wakeup_pin_mask) - 1;
+                printf("Wake up from GPIO %d\n", pin);
+            } else {
+                printf("Wake up from GPIO\n");
+            }*/
+            break;       
+        case ESP_SLEEP_WAKEUP_TOUCHPAD: 
+            //TODO: implement TouchIO
+            //Wake up from touch on pad, returns -> esp_sleep_get_touchpad_wakeup_status()
+            break;        
+        case ESP_SLEEP_WAKEUP_UNDEFINED:
+        default:
+            //Not a deep sleep reset
+            break;
+    }
+    return mp_const_none;
+}
+
 // The singleton microcontroller.Processor object, bound to microcontroller.cpu
 // It currently only has properties, and no state.
 const mcu_processor_obj_t common_hal_mcu_processor_obj = {
diff --git a/shared-bindings/microcontroller/__init__.c b/shared-bindings/microcontroller/__init__.c
index b8ca8f18ba..7b896d99b2 100644
--- a/shared-bindings/microcontroller/__init__.c
+++ b/shared-bindings/microcontroller/__init__.c
@@ -152,6 +152,24 @@ STATIC mp_obj_t mcu_sleep(void) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(mcu_sleep_obj, mcu_sleep);
 
+//| def getWakeAlarm() -> None:
+//|     """This returns the alarm that triggered wakeup, 
+//|     also returns alarm specific parameters`.
+//|
+STATIC mp_obj_t mcu_get_wake_alarm(void) {
+    return common_hal_mcu_get_wake_alarm();
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(mcu_get_wake_alarm_obj, mcu_get_wake_alarm);
+
+//| def getSleepTime() -> None:
+//|     """This returns the period of time in ms, 
+//|     in which the board was in deep sleep`.
+//|
+STATIC mp_obj_t mcu_get_sleep_time(void) {
+    return mp_obj_new_int(common_hal_mcu_get_sleep_time());
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(mcu_get_sleep_time_obj, mcu_get_sleep_time);
+
 //| nvm: Optional[ByteArray]
 //| """Available non-volatile memory.
 //| This object is the sole instance of `nvm.ByteArray` when available or ``None`` otherwise.
@@ -188,6 +206,8 @@ STATIC const mp_rom_map_elem_t mcu_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_on_next_reset), MP_ROM_PTR(&mcu_on_next_reset_obj) },
     { MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&mcu_reset_obj) },
     { MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&mcu_sleep_obj) },
+    { MP_ROM_QSTR(MP_QSTR_getSleepTime), MP_ROM_PTR(&mcu_get_sleep_time_obj) },
+    { MP_ROM_QSTR(MP_QSTR_getWakeAlarm), MP_ROM_PTR(&mcu_get_wake_alarm_obj) },
     #if CIRCUITPY_INTERNAL_NVM_SIZE > 0
     { MP_ROM_QSTR(MP_QSTR_nvm),  MP_ROM_PTR(&common_hal_mcu_nvm_obj) },
     #else
diff --git a/shared-bindings/microcontroller/__init__.h b/shared-bindings/microcontroller/__init__.h
index b0f61e64b9..f0a3cee2df 100644
--- a/shared-bindings/microcontroller/__init__.h
+++ b/shared-bindings/microcontroller/__init__.h
@@ -35,6 +35,9 @@
 
 #include "shared-bindings/microcontroller/RunMode.h"
 
+#include "shared-bindings/io_alarm/__init__.h"
+#include "shared-bindings/time_alarm/__init__.h"
+
 extern void common_hal_mcu_delay_us(uint32_t);
 
 extern void common_hal_mcu_disable_interrupts(void);
@@ -44,6 +47,8 @@ extern void common_hal_mcu_on_next_reset(mcu_runmode_t runmode);
 extern void common_hal_mcu_reset(void);
 
 extern void common_hal_mcu_sleep(void);
+extern int common_hal_mcu_get_sleep_time(void);
+extern mp_obj_t common_hal_mcu_get_wake_alarm(void);
 
 extern const mp_obj_dict_t mcu_pin_globals;
 

From 21ba61afbbdfbf1a693e9e136c645d970c0a7e9c Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Tue, 22 Sep 2020 23:47:10 +0530
Subject: [PATCH 05/16] Add function to disable alarm

---
 ports/esp32s2/common-hal/io_alarm/__init__.c  | 20 +++++++-------
 .../esp32s2/common-hal/time_alarm/__init__.c  |  3 +++
 shared-bindings/io_alarm/__init__.c           | 26 ++++++++++++++++---
 shared-bindings/io_alarm/__init__.h           | 11 +++++++-
 shared-bindings/time_alarm/__init__.c         | 21 ++++++++++++++-
 shared-bindings/time_alarm/__init__.h         |  7 +++++
 6 files changed, 73 insertions(+), 15 deletions(-)

diff --git a/ports/esp32s2/common-hal/io_alarm/__init__.c b/ports/esp32s2/common-hal/io_alarm/__init__.c
index d88c147fe0..5d926d4e93 100644
--- a/ports/esp32s2/common-hal/io_alarm/__init__.c
+++ b/ports/esp32s2/common-hal/io_alarm/__init__.c
@@ -3,25 +3,25 @@
 #include "esp_sleep.h"
 #include "driver/rtc_io.h"
 
-void common_hal_io_alarm_pin_state (uint8_t gpio, uint8_t level, bool pull) {
-    if (!rtc_gpio_is_valid_gpio(gpio))  {
-        mp_raise_ValueError(translate("io must be rtc io"));
-        return;        
+mp_obj_t common_hal_io_alarm_pin_state (io_alarm_obj_t *self_in) {
+    if (!rtc_gpio_is_valid_gpio(self_in->gpio)) {
+        mp_raise_ValueError(translate("io must be rtc io"));       
     }   
 
-    switch(esp_sleep_enable_ext0_wakeup(gpio, level)) {
+    switch(esp_sleep_enable_ext0_wakeup(self_in->gpio, self_in->level)) {
         case ESP_ERR_INVALID_ARG:
             mp_raise_ValueError(translate("trigger level must be 0 or 1"));
-            return;
         case ESP_ERR_INVALID_STATE:
             mp_raise_RuntimeError(translate("wakeup conflict"));
-            return;
         default: 
             break;   
     }
 
-    if (pull) {
-        (level) ? rtc_gpio_pulldown_en(gpio) : rtc_gpio_pullup_en(gpio);
-    }     
+    if (self_in->pull) { (self_in->level) ? rtc_gpio_pulldown_en(self_in->gpio) : rtc_gpio_pullup_en(self_in->gpio); }
+
+    return self_in;     
 }  
 
+void common_hal_io_alarm_disable (void) {
+    esp_sleep_disable_wakeup_source(ESP_SLEEP_WAKEUP_EXT0 | ESP_SLEEP_WAKEUP_EXT1);
+}
diff --git a/ports/esp32s2/common-hal/time_alarm/__init__.c b/ports/esp32s2/common-hal/time_alarm/__init__.c
index 342ca9d154..a33376bb09 100644
--- a/ports/esp32s2/common-hal/time_alarm/__init__.c
+++ b/ports/esp32s2/common-hal/time_alarm/__init__.c
@@ -8,3 +8,6 @@ void common_hal_time_alarm_duration (uint32_t ms) {
     }   
 }  
 
+void common_hal_time_alarm_disable (void) {
+    esp_sleep_disable_wakeup_source(ESP_SLEEP_WAKEUP_TIMER);
+}
diff --git a/shared-bindings/io_alarm/__init__.c b/shared-bindings/io_alarm/__init__.c
index 534b7e66f5..934b34e49d 100644
--- a/shared-bindings/io_alarm/__init__.c
+++ b/shared-bindings/io_alarm/__init__.c
@@ -3,7 +3,7 @@
 #include "shared-bindings/io_alarm/__init__.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-//| Set Timer Wakeup 
+//| Set Pin Wakeup 
 //|
 STATIC mp_obj_t io_alarm_pin_state(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {  
     enum { ARG_level, ARG_pull };
@@ -16,15 +16,30 @@ STATIC mp_obj_t io_alarm_pin_state(size_t n_args, const mp_obj_t *pos_args, mp_m
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);  
 
     mcu_pin_obj_t *pin = validate_obj_is_pin(pos_args[0]);
-    common_hal_io_alarm_pin_state(pin->number, args[ARG_level].u_int, args[ARG_pull].u_bool);
+    io_alarm_obj_t *self = m_new_obj(io_alarm_obj_t);
 
-    return mp_const_none;
+    self->base.type = &io_alarm_type;
+    self->gpio = pin->number;
+    self->level = args[ARG_level].u_int;
+    self->pull = args[ARG_pull].u_bool;
+    
+    return common_hal_io_alarm_pin_state(self);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(io_alarm_pin_state_obj, 1, io_alarm_pin_state);
 
+
+//| Disable Pin Wakeup 
+//|
+STATIC mp_obj_t io_alarm_disable(void) {      
+    common_hal_io_alarm_disable();
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(io_alarm_disable_obj, io_alarm_disable);
+
 STATIC const mp_rom_map_elem_t io_alarm_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_io_alarm) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_PinState), MP_ROM_PTR(&io_alarm_pin_state_obj) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_Disable), MP_ROM_PTR(&io_alarm_disable_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(io_alarm_module_globals, io_alarm_module_globals_table);
 
@@ -32,3 +47,8 @@ const mp_obj_module_t io_alarm_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&io_alarm_module_globals,
 };
+
+const mp_obj_type_t io_alarm_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_ioAlarm,
+};
diff --git a/shared-bindings/io_alarm/__init__.h b/shared-bindings/io_alarm/__init__.h
index dd4b881657..2b91f781d5 100644
--- a/shared-bindings/io_alarm/__init__.h
+++ b/shared-bindings/io_alarm/__init__.h
@@ -3,6 +3,15 @@
 
 #include "py/runtime.h"
 
-extern void common_hal_io_alarm_pin_state(uint8_t gpio, uint8_t level, bool pull);
+typedef struct {
+    mp_obj_base_t base;
+    uint8_t gpio, level;
+    bool pull;
+} io_alarm_obj_t;
+
+extern const mp_obj_type_t io_alarm_type;
+
+extern mp_obj_t common_hal_io_alarm_pin_state (io_alarm_obj_t *self_in);
+extern void common_hal_io_alarm_disable (void);
 
 #endif //MICROPY_INCLUDED_SHARED_BINDINGS_IO_ALARM___INIT___H
diff --git a/shared-bindings/time_alarm/__init__.c b/shared-bindings/time_alarm/__init__.c
index bfbece83c0..e45c5239f1 100644
--- a/shared-bindings/time_alarm/__init__.c
+++ b/shared-bindings/time_alarm/__init__.c
@@ -11,17 +11,31 @@ STATIC mp_obj_t time_alarm_duration(mp_obj_t seconds_o) {
     mp_int_t seconds = mp_obj_get_int(seconds_o);
     mp_int_t msecs = 1000 * seconds;
     #endif
+
     if (seconds < 0) {
         mp_raise_ValueError(translate("sleep length must be non-negative"));
     }
     common_hal_time_alarm_duration(msecs);
-    return mp_const_none;
+
+    time_alarm_obj_t *self = m_new_obj(time_alarm_obj_t);
+    self->base.type = &time_alarm_type;
+
+    return self;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(time_alarm_duration_obj, time_alarm_duration);
 
+//| Disable Timer Wakeup 
+//|
+STATIC mp_obj_t time_alarm_disable(void) {      
+    common_hal_time_alarm_disable();
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(time_alarm_disable_obj, time_alarm_disable);
+
 STATIC const mp_rom_map_elem_t time_alarm_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_time_alarm) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_Duration), MP_ROM_PTR(&time_alarm_duration_obj) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_Disable), MP_ROM_PTR(&time_alarm_disable_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(time_alarm_module_globals, time_alarm_module_globals_table);
 
@@ -29,3 +43,8 @@ const mp_obj_module_t time_alarm_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&time_alarm_module_globals,
 };
+
+const mp_obj_type_t time_alarm_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_timeAlarm,
+};
diff --git a/shared-bindings/time_alarm/__init__.h b/shared-bindings/time_alarm/__init__.h
index 0913f7fded..52b6e89ee2 100644
--- a/shared-bindings/time_alarm/__init__.h
+++ b/shared-bindings/time_alarm/__init__.h
@@ -3,6 +3,13 @@
 
 #include "py/runtime.h"
 
+typedef struct {
+    mp_obj_base_t base;
+} time_alarm_obj_t;
+
+extern const mp_obj_type_t time_alarm_type;
+
 extern void common_hal_time_alarm_duration(uint32_t);
+extern void common_hal_time_alarm_disable (void);
 
 #endif //MICROPY_INCLUDED_SHARED_BINDINGS_TIME_ALARM___INIT___H

From e5ff55b15c8cc67c2ece3b8857b5805109b858b3 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Wed, 23 Sep 2020 12:54:07 +0530
Subject: [PATCH 06/16] Renamed alarm modules

---
 .../{io_alarm => alarm_io}/__init__.c         |  6 +--
 .../{time_alarm => alarm_time}/__init__.c     |  6 +--
 .../common-hal/microcontroller/__init__.c     |  8 +--
 ports/esp32s2/mpconfigport.mk                 |  4 +-
 py/circuitpy_defns.mk                         | 12 ++---
 py/circuitpy_mpconfig.h                       | 20 +++----
 py/circuitpy_mpconfig.mk                      |  8 +--
 shared-bindings/alarm_io/__init__.c           | 54 +++++++++++++++++++
 shared-bindings/alarm_io/__init__.h           | 17 ++++++
 shared-bindings/alarm_time/__init__.c         | 50 +++++++++++++++++
 shared-bindings/alarm_time/__init__.h         | 15 ++++++
 shared-bindings/io_alarm/__init__.c           | 54 -------------------
 shared-bindings/io_alarm/__init__.h           | 17 ------
 shared-bindings/microcontroller/__init__.h    |  4 +-
 shared-bindings/time_alarm/__init__.c         | 50 -----------------
 shared-bindings/time_alarm/__init__.h         | 15 ------
 16 files changed, 170 insertions(+), 170 deletions(-)
 rename ports/esp32s2/common-hal/{io_alarm => alarm_io}/__init__.c (83%)
 rename ports/esp32s2/common-hal/{time_alarm => alarm_time}/__init__.c (62%)
 create mode 100644 shared-bindings/alarm_io/__init__.c
 create mode 100644 shared-bindings/alarm_io/__init__.h
 create mode 100644 shared-bindings/alarm_time/__init__.c
 create mode 100644 shared-bindings/alarm_time/__init__.h
 delete mode 100644 shared-bindings/io_alarm/__init__.c
 delete mode 100644 shared-bindings/io_alarm/__init__.h
 delete mode 100644 shared-bindings/time_alarm/__init__.c
 delete mode 100644 shared-bindings/time_alarm/__init__.h

diff --git a/ports/esp32s2/common-hal/io_alarm/__init__.c b/ports/esp32s2/common-hal/alarm_io/__init__.c
similarity index 83%
rename from ports/esp32s2/common-hal/io_alarm/__init__.c
rename to ports/esp32s2/common-hal/alarm_io/__init__.c
index 5d926d4e93..9aa28f4156 100644
--- a/ports/esp32s2/common-hal/io_alarm/__init__.c
+++ b/ports/esp32s2/common-hal/alarm_io/__init__.c
@@ -1,9 +1,9 @@
-#include "shared-bindings/io_alarm/__init__.h"
+#include "shared-bindings/alarm_io/__init__.h"
 
 #include "esp_sleep.h"
 #include "driver/rtc_io.h"
 
-mp_obj_t common_hal_io_alarm_pin_state (io_alarm_obj_t *self_in) {
+mp_obj_t common_hal_alarm_io_pin_state (alarm_io_obj_t *self_in) {
     if (!rtc_gpio_is_valid_gpio(self_in->gpio)) {
         mp_raise_ValueError(translate("io must be rtc io"));       
     }   
@@ -22,6 +22,6 @@ mp_obj_t common_hal_io_alarm_pin_state (io_alarm_obj_t *self_in) {
     return self_in;     
 }  
 
-void common_hal_io_alarm_disable (void) {
+void common_hal_alarm_io_disable (void) {
     esp_sleep_disable_wakeup_source(ESP_SLEEP_WAKEUP_EXT0 | ESP_SLEEP_WAKEUP_EXT1);
 }
diff --git a/ports/esp32s2/common-hal/time_alarm/__init__.c b/ports/esp32s2/common-hal/alarm_time/__init__.c
similarity index 62%
rename from ports/esp32s2/common-hal/time_alarm/__init__.c
rename to ports/esp32s2/common-hal/alarm_time/__init__.c
index a33376bb09..fb601e6be0 100644
--- a/ports/esp32s2/common-hal/time_alarm/__init__.c
+++ b/ports/esp32s2/common-hal/alarm_time/__init__.c
@@ -1,13 +1,13 @@
 #include "esp_sleep.h"
 
-#include "shared-bindings/time_alarm/__init__.h"
+#include "shared-bindings/alarm_time/__init__.h"
 
-void common_hal_time_alarm_duration (uint32_t ms) {
+void common_hal_alarm_time_duration (uint32_t ms) {
     if (esp_sleep_enable_timer_wakeup((ms) * 1000) == ESP_ERR_INVALID_ARG) {
         mp_raise_ValueError(translate("time out of range"));
     }   
 }  
 
-void common_hal_time_alarm_disable (void) {
+void common_hal_alarm_time_disable (void) {
     esp_sleep_disable_wakeup_source(ESP_SLEEP_WAKEUP_TIMER);
 }
diff --git a/ports/esp32s2/common-hal/microcontroller/__init__.c b/ports/esp32s2/common-hal/microcontroller/__init__.c
index 8b9fef2f98..e79c602020 100644
--- a/ports/esp32s2/common-hal/microcontroller/__init__.c
+++ b/ports/esp32s2/common-hal/microcontroller/__init__.c
@@ -99,13 +99,13 @@ mp_obj_t common_hal_mcu_get_wake_alarm(void) {
     switch (esp_sleep_get_wakeup_cause()) {
         case ESP_SLEEP_WAKEUP_TIMER: ;
             //Wake up from timer.
-            time_alarm_obj_t *timer = m_new_obj(time_alarm_obj_t);
-            timer->base.type = &time_alarm_type;           
+            alarm_time_obj_t *timer = m_new_obj(alarm_time_obj_t);
+            timer->base.type = &alarm_time_type;           
             return timer;
         case ESP_SLEEP_WAKEUP_EXT0: ;
             //Wake up from GPIO
-            io_alarm_obj_t *ext0 = m_new_obj(io_alarm_obj_t);
-            ext0->base.type = &io_alarm_type;  
+            alarm_io_obj_t *ext0 = m_new_obj(alarm_io_obj_t);
+            ext0->base.type = &alarm_io_type;  
             return ext0;
         case ESP_SLEEP_WAKEUP_EXT1: 
             //Wake up from GPIO, returns -> esp_sleep_get_ext1_wakeup_status()  
diff --git a/ports/esp32s2/mpconfigport.mk b/ports/esp32s2/mpconfigport.mk
index 0f8f3ada53..4aaf1d00c7 100644
--- a/ports/esp32s2/mpconfigport.mk
+++ b/ports/esp32s2/mpconfigport.mk
@@ -22,8 +22,8 @@ CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_NVM = 0
-CIRCUITPY_TIME_ALARM = 1
-CIRCUITPY_IO_ALARM = 1
+CIRCUITPY_ALARM_TIME = 1
+CIRCUITPY_ALARM_IO = 1
 # We don't have enough endpoints to include MIDI.
 CIRCUITPY_USB_MIDI = 0
 CIRCUITPY_WIFI = 1
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index 672eeda40c..4c57165936 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -259,11 +259,11 @@ endif
 ifeq ($(CIRCUITPY_TIME),1)
 SRC_PATTERNS += time/%
 endif
-ifeq ($(CIRCUITPY_TIME_ALARM),1)
-SRC_PATTERNS += time_alarm/%
+ifeq ($(CIRCUITPY_ALARM_TIME),1)
+SRC_PATTERNS += alarm_time/%
 endif
-ifeq ($(CIRCUITPY_IO_ALARM),1)
-SRC_PATTERNS += io_alarm/%
+ifeq ($(CIRCUITPY_ALARM_IO),1)
+SRC_PATTERNS += alarm_io/%
 endif
 ifeq ($(CIRCUITPY_TOUCHIO),1)
 SRC_PATTERNS += touchio/%
@@ -366,8 +366,8 @@ SRC_COMMON_HAL_ALL = \
 	ssl/SSLContext.c \
 	supervisor/Runtime.c \
 	supervisor/__init__.c \
-	time_alarm/__init__.c \
-	io_alarm/__init__.c \
+	alarm_time/__init__.c \
+	alarm_io/__init__.c \
 	watchdog/WatchDogMode.c \
 	watchdog/WatchDogTimer.c \
 	watchdog/__init__.c \
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index d899ecacb6..94072f580b 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -663,18 +663,18 @@ extern const struct _mp_obj_module_t time_module;
 #define TIME_MODULE_ALT_NAME
 #endif
 
-#if CIRCUITPY_TIME_ALARM
-extern const struct _mp_obj_module_t time_alarm_module;
-#define TIME_ALARM_MODULE             { MP_OBJ_NEW_QSTR(MP_QSTR_time_alarm), (mp_obj_t)&time_alarm_module },
+#if CIRCUITPY_ALARM_TIME
+extern const struct _mp_obj_module_t alarm_time_module;
+#define ALARM_TIME_MODULE             { MP_OBJ_NEW_QSTR(MP_QSTR_alarm_time), (mp_obj_t)&alarm_time_module },
 #else
-#define TIME_ALARM_MODULE
+#define ALARM_TIME_MODULE
 #endif
 
-#if CIRCUITPY_IO_ALARM
-extern const struct _mp_obj_module_t io_alarm_module;
-#define IO_ALARM_MODULE             { MP_OBJ_NEW_QSTR(MP_QSTR_io_alarm), (mp_obj_t)&io_alarm_module },
+#if CIRCUITPY_ALARM_IO
+extern const struct _mp_obj_module_t alarm_io_module;
+#define ALARM_IO_MODULE             { MP_OBJ_NEW_QSTR(MP_QSTR_alarm_io), (mp_obj_t)&alarm_io_module },
 #else
-#define IO_ALARM_MODULE
+#define ALARM_IO_MODULE
 #endif
 
 #if CIRCUITPY_TOUCHIO
@@ -835,8 +835,8 @@ extern const struct _mp_obj_module_t wifi_module;
     STRUCT_MODULE \
     SUPERVISOR_MODULE \
     TOUCHIO_MODULE \
-    TIME_ALARM_MODULE \
-    IO_ALARM_MODULE \
+    ALARM_TIME_MODULE \
+    ALARM_IO_MODULE \
     UHEAP_MODULE \
     USB_HID_MODULE \
     USB_MIDI_MODULE \
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 4cce2a0a1a..e8619347dd 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -234,11 +234,11 @@ CFLAGS += -DCIRCUITPY_TERMINALIO=$(CIRCUITPY_TERMINALIO)
 CIRCUITPY_TIME ?= 1
 CFLAGS += -DCIRCUITPY_TIME=$(CIRCUITPY_TIME)
 
-CIRCUITPY_TIME_ALARM ?= 0
-CFLAGS += -DCIRCUITPY_TIME_ALARM=$(CIRCUITPY_TIME_ALARM)
+CIRCUITPY_ALARM_TIME ?= 0
+CFLAGS += -DCIRCUITPY_ALARM_TIME=$(CIRCUITPY_ALARM_TIME)
 
-CIRCUITPY_IO_ALARM ?= 0
-CFLAGS += -DCIRCUITPY_IO_ALARM=$(CIRCUITPY_IO_ALARM)
+CIRCUITPY_ALARM_IO ?= 0
+CFLAGS += -DCIRCUITPY_ALARM_IO=$(CIRCUITPY_ALARM_IO)
 
 # touchio might be native or generic. See circuitpy_defns.mk.
 CIRCUITPY_TOUCHIO_USE_NATIVE ?= 0
diff --git a/shared-bindings/alarm_io/__init__.c b/shared-bindings/alarm_io/__init__.c
new file mode 100644
index 0000000000..09783d0d08
--- /dev/null
+++ b/shared-bindings/alarm_io/__init__.c
@@ -0,0 +1,54 @@
+#include "py/obj.h"
+
+#include "shared-bindings/alarm_io/__init__.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+//| Set Pin Wakeup 
+//|
+STATIC mp_obj_t alarm_io_pin_state(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {  
+    enum { ARG_level, ARG_pull };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_level, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
+        { MP_QSTR_pull, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_bool = false} },
+    }; 
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);  
+
+    mcu_pin_obj_t *pin = validate_obj_is_pin(pos_args[0]);
+    alarm_io_obj_t *self = m_new_obj(alarm_io_obj_t);
+
+    self->base.type = &alarm_io_type;
+    self->gpio = pin->number;
+    self->level = args[ARG_level].u_int;
+    self->pull = args[ARG_pull].u_bool;
+    
+    return common_hal_alarm_io_pin_state(self);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(alarm_io_pin_state_obj, 1, alarm_io_pin_state);
+
+
+//| Disable Pin Wakeup 
+//|
+STATIC mp_obj_t alarm_io_disable(void) {      
+    common_hal_alarm_io_disable();
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(alarm_io_disable_obj, alarm_io_disable);
+
+STATIC const mp_rom_map_elem_t alarm_io_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_alarm_io) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_PinState), MP_ROM_PTR(&alarm_io_pin_state_obj) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_Disable), MP_ROM_PTR(&alarm_io_disable_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(alarm_io_module_globals, alarm_io_module_globals_table);
+
+const mp_obj_module_t alarm_io_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t*)&alarm_io_module_globals,
+};
+
+const mp_obj_type_t alarm_io_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_ioAlarm,
+};
diff --git a/shared-bindings/alarm_io/__init__.h b/shared-bindings/alarm_io/__init__.h
new file mode 100644
index 0000000000..0a53497c01
--- /dev/null
+++ b/shared-bindings/alarm_io/__init__.h
@@ -0,0 +1,17 @@
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_ALARM_IO___INIT___H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_ALARM_IO___INIT___H
+
+#include "py/runtime.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    uint8_t gpio, level;
+    bool pull;
+} alarm_io_obj_t;
+
+extern const mp_obj_type_t alarm_io_type;
+
+extern mp_obj_t common_hal_alarm_io_pin_state (alarm_io_obj_t *self_in);
+extern void common_hal_alarm_io_disable (void);
+
+#endif //MICROPY_INCLUDED_SHARED_BINDINGS_ALARM_IO___INIT___H
diff --git a/shared-bindings/alarm_time/__init__.c b/shared-bindings/alarm_time/__init__.c
new file mode 100644
index 0000000000..22fb935064
--- /dev/null
+++ b/shared-bindings/alarm_time/__init__.c
@@ -0,0 +1,50 @@
+#include "py/obj.h"
+#include "shared-bindings/alarm_time/__init__.h"
+
+//| Set Timer Wakeup 
+//|
+STATIC mp_obj_t alarm_time_duration(mp_obj_t seconds_o) { 
+    #if MICROPY_PY_BUILTINS_FLOAT
+    mp_float_t seconds = mp_obj_get_float(seconds_o);
+    mp_float_t msecs = 1000.0f * seconds + 0.5f;
+    #else
+    mp_int_t seconds = mp_obj_get_int(seconds_o);
+    mp_int_t msecs = 1000 * seconds;
+    #endif
+
+    if (seconds < 0) {
+        mp_raise_ValueError(translate("sleep length must be non-negative"));
+    }
+    common_hal_alarm_time_duration(msecs);
+
+    alarm_time_obj_t *self = m_new_obj(alarm_time_obj_t);
+    self->base.type = &alarm_time_type;
+
+    return self;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(alarm_time_duration_obj, alarm_time_duration);
+
+//| Disable Timer Wakeup 
+//|
+STATIC mp_obj_t alarm_time_disable(void) {      
+    common_hal_alarm_time_disable();
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(alarm_time_disable_obj, alarm_time_disable);
+
+STATIC const mp_rom_map_elem_t alarm_time_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_alarm_time) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_Duration), MP_ROM_PTR(&alarm_time_duration_obj) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_Disable), MP_ROM_PTR(&alarm_time_disable_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(alarm_time_module_globals, alarm_time_module_globals_table);
+
+const mp_obj_module_t alarm_time_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t*)&alarm_time_module_globals,
+};
+
+const mp_obj_type_t alarm_time_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_timeAlarm,
+};
diff --git a/shared-bindings/alarm_time/__init__.h b/shared-bindings/alarm_time/__init__.h
new file mode 100644
index 0000000000..d69aa5a443
--- /dev/null
+++ b/shared-bindings/alarm_time/__init__.h
@@ -0,0 +1,15 @@
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_ALARM_TIME___INIT___H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_ALARM_TIME___INIT___H
+
+#include "py/runtime.h"
+
+typedef struct {
+    mp_obj_base_t base;
+} alarm_time_obj_t;
+
+extern const mp_obj_type_t alarm_time_type;
+
+extern void common_hal_alarm_time_duration(uint32_t);
+extern void common_hal_alarm_time_disable (void);
+
+#endif //MICROPY_INCLUDED_SHARED_BINDINGS_ALARM_TIME___INIT___H
diff --git a/shared-bindings/io_alarm/__init__.c b/shared-bindings/io_alarm/__init__.c
deleted file mode 100644
index 934b34e49d..0000000000
--- a/shared-bindings/io_alarm/__init__.c
+++ /dev/null
@@ -1,54 +0,0 @@
-#include "py/obj.h"
-
-#include "shared-bindings/io_alarm/__init__.h"
-#include "shared-bindings/microcontroller/Pin.h"
-
-//| Set Pin Wakeup 
-//|
-STATIC mp_obj_t io_alarm_pin_state(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {  
-    enum { ARG_level, ARG_pull };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_level, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
-        { MP_QSTR_pull, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_bool = false} },
-    }; 
-
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);  
-
-    mcu_pin_obj_t *pin = validate_obj_is_pin(pos_args[0]);
-    io_alarm_obj_t *self = m_new_obj(io_alarm_obj_t);
-
-    self->base.type = &io_alarm_type;
-    self->gpio = pin->number;
-    self->level = args[ARG_level].u_int;
-    self->pull = args[ARG_pull].u_bool;
-    
-    return common_hal_io_alarm_pin_state(self);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(io_alarm_pin_state_obj, 1, io_alarm_pin_state);
-
-
-//| Disable Pin Wakeup 
-//|
-STATIC mp_obj_t io_alarm_disable(void) {      
-    common_hal_io_alarm_disable();
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(io_alarm_disable_obj, io_alarm_disable);
-
-STATIC const mp_rom_map_elem_t io_alarm_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_io_alarm) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_PinState), MP_ROM_PTR(&io_alarm_pin_state_obj) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_Disable), MP_ROM_PTR(&io_alarm_disable_obj) },
-};
-STATIC MP_DEFINE_CONST_DICT(io_alarm_module_globals, io_alarm_module_globals_table);
-
-const mp_obj_module_t io_alarm_module = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&io_alarm_module_globals,
-};
-
-const mp_obj_type_t io_alarm_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_ioAlarm,
-};
diff --git a/shared-bindings/io_alarm/__init__.h b/shared-bindings/io_alarm/__init__.h
deleted file mode 100644
index 2b91f781d5..0000000000
--- a/shared-bindings/io_alarm/__init__.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_IO_ALARM___INIT___H
-#define MICROPY_INCLUDED_SHARED_BINDINGS_IO_ALARM___INIT___H
-
-#include "py/runtime.h"
-
-typedef struct {
-    mp_obj_base_t base;
-    uint8_t gpio, level;
-    bool pull;
-} io_alarm_obj_t;
-
-extern const mp_obj_type_t io_alarm_type;
-
-extern mp_obj_t common_hal_io_alarm_pin_state (io_alarm_obj_t *self_in);
-extern void common_hal_io_alarm_disable (void);
-
-#endif //MICROPY_INCLUDED_SHARED_BINDINGS_IO_ALARM___INIT___H
diff --git a/shared-bindings/microcontroller/__init__.h b/shared-bindings/microcontroller/__init__.h
index f0a3cee2df..cd234fb033 100644
--- a/shared-bindings/microcontroller/__init__.h
+++ b/shared-bindings/microcontroller/__init__.h
@@ -35,8 +35,8 @@
 
 #include "shared-bindings/microcontroller/RunMode.h"
 
-#include "shared-bindings/io_alarm/__init__.h"
-#include "shared-bindings/time_alarm/__init__.h"
+#include "shared-bindings/alarm_io/__init__.h"
+#include "shared-bindings/alarm_time/__init__.h"
 
 extern void common_hal_mcu_delay_us(uint32_t);
 
diff --git a/shared-bindings/time_alarm/__init__.c b/shared-bindings/time_alarm/__init__.c
deleted file mode 100644
index e45c5239f1..0000000000
--- a/shared-bindings/time_alarm/__init__.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#include "py/obj.h"
-#include "shared-bindings/time_alarm/__init__.h"
-
-//| Set Timer Wakeup 
-//|
-STATIC mp_obj_t time_alarm_duration(mp_obj_t seconds_o) { 
-    #if MICROPY_PY_BUILTINS_FLOAT
-    mp_float_t seconds = mp_obj_get_float(seconds_o);
-    mp_float_t msecs = 1000.0f * seconds + 0.5f;
-    #else
-    mp_int_t seconds = mp_obj_get_int(seconds_o);
-    mp_int_t msecs = 1000 * seconds;
-    #endif
-
-    if (seconds < 0) {
-        mp_raise_ValueError(translate("sleep length must be non-negative"));
-    }
-    common_hal_time_alarm_duration(msecs);
-
-    time_alarm_obj_t *self = m_new_obj(time_alarm_obj_t);
-    self->base.type = &time_alarm_type;
-
-    return self;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(time_alarm_duration_obj, time_alarm_duration);
-
-//| Disable Timer Wakeup 
-//|
-STATIC mp_obj_t time_alarm_disable(void) {      
-    common_hal_time_alarm_disable();
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(time_alarm_disable_obj, time_alarm_disable);
-
-STATIC const mp_rom_map_elem_t time_alarm_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_time_alarm) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_Duration), MP_ROM_PTR(&time_alarm_duration_obj) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_Disable), MP_ROM_PTR(&time_alarm_disable_obj) },
-};
-STATIC MP_DEFINE_CONST_DICT(time_alarm_module_globals, time_alarm_module_globals_table);
-
-const mp_obj_module_t time_alarm_module = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&time_alarm_module_globals,
-};
-
-const mp_obj_type_t time_alarm_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_timeAlarm,
-};
diff --git a/shared-bindings/time_alarm/__init__.h b/shared-bindings/time_alarm/__init__.h
deleted file mode 100644
index 52b6e89ee2..0000000000
--- a/shared-bindings/time_alarm/__init__.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_TIME_ALARM___INIT___H
-#define MICROPY_INCLUDED_SHARED_BINDINGS_TIME_ALARM___INIT___H
-
-#include "py/runtime.h"
-
-typedef struct {
-    mp_obj_base_t base;
-} time_alarm_obj_t;
-
-extern const mp_obj_type_t time_alarm_type;
-
-extern void common_hal_time_alarm_duration(uint32_t);
-extern void common_hal_time_alarm_disable (void);
-
-#endif //MICROPY_INCLUDED_SHARED_BINDINGS_TIME_ALARM___INIT___H

From 4d8ffdca8dc570f63c34b8f02856feae2d880688 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Thu, 24 Sep 2020 10:59:04 +0530
Subject: [PATCH 07/16] restructure alarm modules

---
 ports/esp32s2/common-hal/alarm/__init__.c     | 84 +++++++++++++++++++
 ports/esp32s2/common-hal/alarm/__init__.h     |  6 ++
 .../common-hal/microcontroller/__init__.c     | 48 +----------
 ports/esp32s2/mpconfigport.mk                 |  6 +-
 ports/esp32s2/supervisor/port.c               |  7 +-
 py/circuitpy_defns.mk                         | 20 +++--
 py/circuitpy_mpconfig.h                       | 40 +++++----
 py/circuitpy_mpconfig.mk                      | 15 ++--
 shared-bindings/alarm/__init__.c              | 32 +++++++
 shared-bindings/alarm/__init__.h              | 12 +++
 shared-bindings/alarm_time/__init__.h         |  2 +-
 shared-bindings/microcontroller/__init__.c    | 21 -----
 shared-bindings/microcontroller/__init__.h    |  7 +-
 13 files changed, 191 insertions(+), 109 deletions(-)
 create mode 100644 ports/esp32s2/common-hal/alarm/__init__.c
 create mode 100644 ports/esp32s2/common-hal/alarm/__init__.h
 create mode 100644 shared-bindings/alarm/__init__.c
 create mode 100644 shared-bindings/alarm/__init__.h

diff --git a/ports/esp32s2/common-hal/alarm/__init__.c b/ports/esp32s2/common-hal/alarm/__init__.c
new file mode 100644
index 0000000000..90e8e9ecc8
--- /dev/null
+++ b/ports/esp32s2/common-hal/alarm/__init__.c
@@ -0,0 +1,84 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <sys/time.h>
+
+#include "common-hal/alarm/__init__.h"
+#include "shared-bindings/alarm/__init__.h"
+
+#include "esp_sleep.h"
+#include "soc/rtc_periph.h"
+#include "driver/rtc_io.h"
+
+static RTC_DATA_ATTR struct timeval sleep_enter_time;
+static RTC_DATA_ATTR struct timeval sleep_exit_time;
+static RTC_DATA_ATTR uint8_t wake_io;
+
+int common_hal_alarm_get_sleep_time(void) {
+    return (sleep_exit_time.tv_sec - sleep_enter_time.tv_sec) * 1000 + (sleep_exit_time.tv_usec - sleep_enter_time.tv_usec) / 1000;
+}
+
+void RTC_IRAM_ATTR esp_wake_deep_sleep(void) {
+    esp_default_wake_deep_sleep();
+    wake_io = rtc_gpio_get_level(6);
+    gettimeofday(&sleep_exit_time, NULL);
+}
+
+mp_obj_t common_hal_alarm_get_wake_alarm(void) {
+    switch (esp_sleep_get_wakeup_cause()) {
+        case ESP_SLEEP_WAKEUP_TIMER: ;
+            //Wake up from timer.
+            alarm_time_obj_t *timer = m_new_obj(alarm_time_obj_t);
+            timer->base.type = &alarm_time_type;           
+            return timer;
+        case ESP_SLEEP_WAKEUP_EXT0: ;
+            //Wake up from GPIO
+            /*alarm_io_obj_t *ext0 = m_new_obj(alarm_io_obj_t);
+            ext0->base.type = &alarm_io_type;  
+            return ext0;*/
+            return mp_obj_new_int(wake_io);
+        case ESP_SLEEP_WAKEUP_EXT1: 
+            //Wake up from GPIO, returns -> esp_sleep_get_ext1_wakeup_status()  
+            /*uint64_t wakeup_pin_mask = esp_sleep_get_ext1_wakeup_status();
+            if (wakeup_pin_mask != 0) {
+                int pin = __builtin_ffsll(wakeup_pin_mask) - 1;
+                printf("Wake up from GPIO %d\n", pin);
+            } else {
+                printf("Wake up from GPIO\n");
+            }*/
+            break;       
+        case ESP_SLEEP_WAKEUP_TOUCHPAD: 
+            //TODO: implement TouchIO
+            //Wake up from touch on pad, returns -> esp_sleep_get_touchpad_wakeup_status()
+            break;        
+        case ESP_SLEEP_WAKEUP_UNDEFINED:
+        default:
+            //Not a deep sleep reset
+            break;
+    }
+    return mp_const_none;
+}
diff --git a/ports/esp32s2/common-hal/alarm/__init__.h b/ports/esp32s2/common-hal/alarm/__init__.h
new file mode 100644
index 0000000000..8ba5e2b04a
--- /dev/null
+++ b/ports/esp32s2/common-hal/alarm/__init__.h
@@ -0,0 +1,6 @@
+#ifndef MICROPY_INCLUDED_ESP32S2_COMMON_HAL_MICROCONTROLLER_ALARM_H
+#define MICROPY_INCLUDED_ESP32S2_COMMON_HAL_MICROCONTROLLER_ALARM_H
+
+extern void esp_wake_deep_sleep(void);
+
+#endif // MICROPY_INCLUDED_ESP32S2_COMMON_HAL_MICROCONTROLLER_ALARM_H
\ No newline at end of file
diff --git a/ports/esp32s2/common-hal/microcontroller/__init__.c b/ports/esp32s2/common-hal/microcontroller/__init__.c
index e79c602020..ba24e1c48d 100644
--- a/ports/esp32s2/common-hal/microcontroller/__init__.c
+++ b/ports/esp32s2/common-hal/microcontroller/__init__.c
@@ -25,10 +25,8 @@
  * THE SOFTWARE.
  */
 
-#include <sys/time.h>
-
-#include "py/mphal.h"
 #include "py/obj.h"
+#include "py/mphal.h"
 #include "py/runtime.h"
 
 #include "common-hal/microcontroller/Pin.h"
@@ -44,9 +42,6 @@
 #include "freertos/FreeRTOS.h"
 
 #include "esp_sleep.h"
-#include "soc/rtc_periph.h"
-
-static RTC_DATA_ATTR struct timeval sleep_enter_time;
 
 void common_hal_mcu_delay_us(uint32_t delay) {
 
@@ -85,50 +80,9 @@ void common_hal_mcu_reset(void) {
 }
 
 void common_hal_mcu_sleep(void) {
-    gettimeofday(&sleep_enter_time, NULL);
     esp_deep_sleep_start(); 
 }
 
-int common_hal_mcu_get_sleep_time(void) {
-    struct timeval now;
-    gettimeofday(&now, NULL);
-    return (now.tv_sec - sleep_enter_time.tv_sec) * 1000 + (now.tv_usec - sleep_enter_time.tv_usec) / 1000;
-}
-
-mp_obj_t common_hal_mcu_get_wake_alarm(void) {
-    switch (esp_sleep_get_wakeup_cause()) {
-        case ESP_SLEEP_WAKEUP_TIMER: ;
-            //Wake up from timer.
-            alarm_time_obj_t *timer = m_new_obj(alarm_time_obj_t);
-            timer->base.type = &alarm_time_type;           
-            return timer;
-        case ESP_SLEEP_WAKEUP_EXT0: ;
-            //Wake up from GPIO
-            alarm_io_obj_t *ext0 = m_new_obj(alarm_io_obj_t);
-            ext0->base.type = &alarm_io_type;  
-            return ext0;
-        case ESP_SLEEP_WAKEUP_EXT1: 
-            //Wake up from GPIO, returns -> esp_sleep_get_ext1_wakeup_status()  
-            /*uint64_t wakeup_pin_mask = esp_sleep_get_ext1_wakeup_status();
-            if (wakeup_pin_mask != 0) {
-                int pin = __builtin_ffsll(wakeup_pin_mask) - 1;
-                printf("Wake up from GPIO %d\n", pin);
-            } else {
-                printf("Wake up from GPIO\n");
-            }*/
-            break;       
-        case ESP_SLEEP_WAKEUP_TOUCHPAD: 
-            //TODO: implement TouchIO
-            //Wake up from touch on pad, returns -> esp_sleep_get_touchpad_wakeup_status()
-            break;        
-        case ESP_SLEEP_WAKEUP_UNDEFINED:
-        default:
-            //Not a deep sleep reset
-            break;
-    }
-    return mp_const_none;
-}
-
 // The singleton microcontroller.Processor object, bound to microcontroller.cpu
 // It currently only has properties, and no state.
 const mcu_processor_obj_t common_hal_mcu_processor_obj = {
diff --git a/ports/esp32s2/mpconfigport.mk b/ports/esp32s2/mpconfigport.mk
index 4aaf1d00c7..1a78821d32 100644
--- a/ports/esp32s2/mpconfigport.mk
+++ b/ports/esp32s2/mpconfigport.mk
@@ -14,6 +14,9 @@ LONGINT_IMPL = MPZ
 
 # These modules are implemented in ports/<port>/common-hal:
 CIRCUITPY_FULL_BUILD = 1
+CIRCUITPY_ALARM = 1
+CIRCUITPY_ALARM_IO = 1
+CIRCUITPY_ALARM_TIME = 1
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_AUDIOIO = 0
 CIRCUITPY_CANIO = 1
@@ -22,8 +25,7 @@ CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_NVM = 0
-CIRCUITPY_ALARM_TIME = 1
-CIRCUITPY_ALARM_IO = 1
+
 # We don't have enough endpoints to include MIDI.
 CIRCUITPY_USB_MIDI = 0
 CIRCUITPY_WIFI = 1
diff --git a/ports/esp32s2/supervisor/port.c b/ports/esp32s2/supervisor/port.c
index 0b9c03f747..98c064a8b7 100644
--- a/ports/esp32s2/supervisor/port.c
+++ b/ports/esp32s2/supervisor/port.c
@@ -34,13 +34,14 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 
-#include "common-hal/microcontroller/Pin.h"
+#include "common-hal/alarm/__init__.h"
 #include "common-hal/analogio/AnalogOut.h"
 #include "common-hal/busio/I2C.h"
 #include "common-hal/busio/SPI.h"
 #include "common-hal/busio/UART.h"
-#include "common-hal/pulseio/PulseIn.h"
 #include "common-hal/pwmio/PWMOut.h"
+#include "common-hal/pulseio/PulseIn.h"
+#include "common-hal/microcontroller/Pin.h"
 #include "common-hal/wifi/__init__.h"
 #include "supervisor/memory.h"
 #include "supervisor/shared/tick.h"
@@ -87,6 +88,8 @@ safe_mode_t port_init(void) {
         return NO_HEAP;
     }
 
+    esp_wake_deep_sleep();
+
     return NO_SAFE_MODE;
 }
 
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index 4c57165936..cd25c01f23 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -99,6 +99,15 @@ endif
 ifeq ($(CIRCUITPY_AESIO),1)
 SRC_PATTERNS += aesio/%
 endif
+ifeq ($(CIRCUITPY_ALARM),1)
+SRC_PATTERNS += alarm/%
+endif
+ifeq ($(CIRCUITPY_ALARM_IO),1)
+SRC_PATTERNS += alarm_io/%
+endif
+ifeq ($(CIRCUITPY_ALARM_TIME),1)
+SRC_PATTERNS += alarm_time/%
+endif
 ifeq ($(CIRCUITPY_ANALOGIO),1)
 SRC_PATTERNS += analogio/%
 endif
@@ -259,12 +268,6 @@ endif
 ifeq ($(CIRCUITPY_TIME),1)
 SRC_PATTERNS += time/%
 endif
-ifeq ($(CIRCUITPY_ALARM_TIME),1)
-SRC_PATTERNS += alarm_time/%
-endif
-ifeq ($(CIRCUITPY_ALARM_IO),1)
-SRC_PATTERNS += alarm_io/%
-endif
 ifeq ($(CIRCUITPY_TOUCHIO),1)
 SRC_PATTERNS += touchio/%
 endif
@@ -304,6 +307,9 @@ SRC_COMMON_HAL_ALL = \
 	_bleio/__init__.c \
 	_pew/PewPew.c \
 	_pew/__init__.c \
+	alarm/__init__.c \
+	alarm_io/__init__.c \
+	alarm_time/__init__.c \	
 	analogio/AnalogIn.c \
 	analogio/AnalogOut.c \
 	analogio/__init__.c \
@@ -366,8 +372,6 @@ SRC_COMMON_HAL_ALL = \
 	ssl/SSLContext.c \
 	supervisor/Runtime.c \
 	supervisor/__init__.c \
-	alarm_time/__init__.c \
-	alarm_io/__init__.c \
 	watchdog/WatchDogMode.c \
 	watchdog/WatchDogTimer.c \
 	watchdog/__init__.c \
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index 94072f580b..778c3131b6 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -240,6 +240,27 @@ extern const struct _mp_obj_module_t aesio_module;
 #define AESIO_MODULE
 #endif
 
+#if CIRCUITPY_ALARM
+extern const struct _mp_obj_module_t alarm_module;
+#define ALARM_MODULE           { MP_OBJ_NEW_QSTR(MP_QSTR_alarm), (mp_obj_t)&alarm_module },
+#else
+#define ALARM_MODULE
+#endif
+
+#if CIRCUITPY_ALARM_IO
+extern const struct _mp_obj_module_t alarm_io_module;
+#define ALARM_IO_MODULE        { MP_OBJ_NEW_QSTR(MP_QSTR_alarm_io), (mp_obj_t)&alarm_io_module },
+#else
+#define ALARM_IO_MODULE
+#endif
+
+#if CIRCUITPY_ALARM_TIME
+extern const struct _mp_obj_module_t alarm_time_module;
+#define ALARM_TIME_MODULE      { MP_OBJ_NEW_QSTR(MP_QSTR_alarm_time), (mp_obj_t)&alarm_time_module },
+#else
+#define ALARM_TIME_MODULE
+#endif
+
 #if CIRCUITPY_ANALOGIO
 #define ANALOGIO_MODULE        { MP_OBJ_NEW_QSTR(MP_QSTR_analogio), (mp_obj_t)&analogio_module },
 extern const struct _mp_obj_module_t analogio_module;
@@ -663,20 +684,6 @@ extern const struct _mp_obj_module_t time_module;
 #define TIME_MODULE_ALT_NAME
 #endif
 
-#if CIRCUITPY_ALARM_TIME
-extern const struct _mp_obj_module_t alarm_time_module;
-#define ALARM_TIME_MODULE             { MP_OBJ_NEW_QSTR(MP_QSTR_alarm_time), (mp_obj_t)&alarm_time_module },
-#else
-#define ALARM_TIME_MODULE
-#endif
-
-#if CIRCUITPY_ALARM_IO
-extern const struct _mp_obj_module_t alarm_io_module;
-#define ALARM_IO_MODULE             { MP_OBJ_NEW_QSTR(MP_QSTR_alarm_io), (mp_obj_t)&alarm_io_module },
-#else
-#define ALARM_IO_MODULE
-#endif
-
 #if CIRCUITPY_TOUCHIO
 extern const struct _mp_obj_module_t touchio_module;
 #define TOUCHIO_MODULE         { MP_OBJ_NEW_QSTR(MP_QSTR_touchio), (mp_obj_t)&touchio_module },
@@ -777,6 +784,9 @@ extern const struct _mp_obj_module_t wifi_module;
 // Some are omitted because they're in MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS above.
 #define MICROPY_PORT_BUILTIN_MODULES_STRONG_LINKS \
     AESIO_MODULE \
+    ALARM_MODULE \
+    ALARM_IO_MODULE \
+    ALARM_TIME_MODULE \
     ANALOGIO_MODULE \
     AUDIOBUSIO_MODULE \
     AUDIOCORE_MODULE \
@@ -835,8 +845,6 @@ extern const struct _mp_obj_module_t wifi_module;
     STRUCT_MODULE \
     SUPERVISOR_MODULE \
     TOUCHIO_MODULE \
-    ALARM_TIME_MODULE \
-    ALARM_IO_MODULE \
     UHEAP_MODULE \
     USB_HID_MODULE \
     USB_MIDI_MODULE \
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index e8619347dd..c1790e5e35 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -39,6 +39,15 @@ CFLAGS += -DMICROPY_PY_ASYNC_AWAIT=$(MICROPY_PY_ASYNC_AWAIT)
 CIRCUITPY_AESIO ?= 0
 CFLAGS += -DCIRCUITPY_AESIO=$(CIRCUITPY_AESIO)
 
+CIRCUITPY_ALARM ?= 0
+CFLAGS += -DCIRCUITPY_ALARM=$(CIRCUITPY_ALARM)
+
+CIRCUITPY_ALARM_IO ?= 0
+CFLAGS += -DCIRCUITPY_ALARM_IO=$(CIRCUITPY_ALARM_IO)
+
+CIRCUITPY_ALARM_TIME ?= 0
+CFLAGS += -DCIRCUITPY_ALARM_TIME=$(CIRCUITPY_ALARM_TIME)
+
 CIRCUITPY_ANALOGIO ?= 1
 CFLAGS += -DCIRCUITPY_ANALOGIO=$(CIRCUITPY_ANALOGIO)
 
@@ -234,12 +243,6 @@ CFLAGS += -DCIRCUITPY_TERMINALIO=$(CIRCUITPY_TERMINALIO)
 CIRCUITPY_TIME ?= 1
 CFLAGS += -DCIRCUITPY_TIME=$(CIRCUITPY_TIME)
 
-CIRCUITPY_ALARM_TIME ?= 0
-CFLAGS += -DCIRCUITPY_ALARM_TIME=$(CIRCUITPY_ALARM_TIME)
-
-CIRCUITPY_ALARM_IO ?= 0
-CFLAGS += -DCIRCUITPY_ALARM_IO=$(CIRCUITPY_ALARM_IO)
-
 # touchio might be native or generic. See circuitpy_defns.mk.
 CIRCUITPY_TOUCHIO_USE_NATIVE ?= 0
 CFLAGS += -DCIRCUITPY_TOUCHIO_USE_NATIVE=$(CIRCUITPY_TOUCHIO_USE_NATIVE)
diff --git a/shared-bindings/alarm/__init__.c b/shared-bindings/alarm/__init__.c
new file mode 100644
index 0000000000..51a3776934
--- /dev/null
+++ b/shared-bindings/alarm/__init__.c
@@ -0,0 +1,32 @@
+#include "shared-bindings/alarm/__init__.h"
+
+//| def getWakeAlarm() -> None:
+//|     """This returns the alarm that triggered wakeup, 
+//|     also returns alarm specific parameters`.
+//|
+STATIC mp_obj_t alarm_get_wake_alarm(void) {
+    return common_hal_alarm_get_wake_alarm();
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(alarm_get_wake_alarm_obj, alarm_get_wake_alarm);
+
+//| def getSleepTime() -> None:
+//|     """This returns the period of time in ms, 
+//|     in which the board was in deep sleep`.
+//|
+STATIC mp_obj_t alarm_get_sleep_time(void) {
+    return mp_obj_new_int(common_hal_alarm_get_sleep_time());
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(alarm_get_sleep_time_obj, alarm_get_sleep_time);
+
+STATIC const mp_rom_map_elem_t alarm_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_alarm) },
+    { MP_ROM_QSTR(MP_QSTR_getSleepTime), MP_ROM_PTR(&alarm_get_sleep_time_obj) },
+    { MP_ROM_QSTR(MP_QSTR_getWakeAlarm), MP_ROM_PTR(&alarm_get_wake_alarm_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(alarm_module_globals, alarm_module_globals_table);
+
+const mp_obj_module_t alarm_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t*)&alarm_module_globals,
+};
diff --git a/shared-bindings/alarm/__init__.h b/shared-bindings/alarm/__init__.h
new file mode 100644
index 0000000000..2289028eff
--- /dev/null
+++ b/shared-bindings/alarm/__init__.h
@@ -0,0 +1,12 @@
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_ALARM___INIT___H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_ALARM___INIT___H
+
+#include "py/obj.h"
+
+#include "shared-bindings/alarm_io/__init__.h"
+#include "shared-bindings/alarm_time/__init__.h"
+
+extern int common_hal_alarm_get_sleep_time(void);
+extern mp_obj_t common_hal_alarm_get_wake_alarm(void);
+
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_ALARM___INIT___H
diff --git a/shared-bindings/alarm_time/__init__.h b/shared-bindings/alarm_time/__init__.h
index d69aa5a443..a963830693 100644
--- a/shared-bindings/alarm_time/__init__.h
+++ b/shared-bindings/alarm_time/__init__.h
@@ -9,7 +9,7 @@ typedef struct {
 
 extern const mp_obj_type_t alarm_time_type;
 
-extern void common_hal_alarm_time_duration(uint32_t);
+extern void common_hal_alarm_time_duration (uint32_t);
 extern void common_hal_alarm_time_disable (void);
 
 #endif //MICROPY_INCLUDED_SHARED_BINDINGS_ALARM_TIME___INIT___H
diff --git a/shared-bindings/microcontroller/__init__.c b/shared-bindings/microcontroller/__init__.c
index 7b896d99b2..eb58a40982 100644
--- a/shared-bindings/microcontroller/__init__.c
+++ b/shared-bindings/microcontroller/__init__.c
@@ -39,7 +39,6 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/microcontroller/Processor.h"
 
-#include "py/runtime.h"
 #include "supervisor/shared/translate.h"
 
 //| """Pin references and cpu functionality
@@ -152,24 +151,6 @@ STATIC mp_obj_t mcu_sleep(void) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(mcu_sleep_obj, mcu_sleep);
 
-//| def getWakeAlarm() -> None:
-//|     """This returns the alarm that triggered wakeup, 
-//|     also returns alarm specific parameters`.
-//|
-STATIC mp_obj_t mcu_get_wake_alarm(void) {
-    return common_hal_mcu_get_wake_alarm();
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mcu_get_wake_alarm_obj, mcu_get_wake_alarm);
-
-//| def getSleepTime() -> None:
-//|     """This returns the period of time in ms, 
-//|     in which the board was in deep sleep`.
-//|
-STATIC mp_obj_t mcu_get_sleep_time(void) {
-    return mp_obj_new_int(common_hal_mcu_get_sleep_time());
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mcu_get_sleep_time_obj, mcu_get_sleep_time);
-
 //| nvm: Optional[ByteArray]
 //| """Available non-volatile memory.
 //| This object is the sole instance of `nvm.ByteArray` when available or ``None`` otherwise.
@@ -206,8 +187,6 @@ STATIC const mp_rom_map_elem_t mcu_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_on_next_reset), MP_ROM_PTR(&mcu_on_next_reset_obj) },
     { MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&mcu_reset_obj) },
     { MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&mcu_sleep_obj) },
-    { MP_ROM_QSTR(MP_QSTR_getSleepTime), MP_ROM_PTR(&mcu_get_sleep_time_obj) },
-    { MP_ROM_QSTR(MP_QSTR_getWakeAlarm), MP_ROM_PTR(&mcu_get_wake_alarm_obj) },
     #if CIRCUITPY_INTERNAL_NVM_SIZE > 0
     { MP_ROM_QSTR(MP_QSTR_nvm),  MP_ROM_PTR(&common_hal_mcu_nvm_obj) },
     #else
diff --git a/shared-bindings/microcontroller/__init__.h b/shared-bindings/microcontroller/__init__.h
index cd234fb033..95f1cf8fc7 100644
--- a/shared-bindings/microcontroller/__init__.h
+++ b/shared-bindings/microcontroller/__init__.h
@@ -28,16 +28,13 @@
 #ifndef MICROPY_INCLUDED_SHARED_BINDINGS_MICROCONTROLLER___INIT___H
 #define MICROPY_INCLUDED_SHARED_BINDINGS_MICROCONTROLLER___INIT___H
 
-#include "py/mpconfig.h"
 #include "py/obj.h"
+#include "py/mpconfig.h"
 
 #include "common-hal/microcontroller/Processor.h"
 
 #include "shared-bindings/microcontroller/RunMode.h"
 
-#include "shared-bindings/alarm_io/__init__.h"
-#include "shared-bindings/alarm_time/__init__.h"
-
 extern void common_hal_mcu_delay_us(uint32_t);
 
 extern void common_hal_mcu_disable_interrupts(void);
@@ -47,8 +44,6 @@ extern void common_hal_mcu_on_next_reset(mcu_runmode_t runmode);
 extern void common_hal_mcu_reset(void);
 
 extern void common_hal_mcu_sleep(void);
-extern int common_hal_mcu_get_sleep_time(void);
-extern mp_obj_t common_hal_mcu_get_wake_alarm(void);
 
 extern const mp_obj_dict_t mcu_pin_globals;
 

From da449723df14623647729954dd5427101070d01c Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Thu, 24 Sep 2020 15:01:36 +0530
Subject: [PATCH 08/16] Fix build error

---
 locale/circuitpython.pot                  | 13 +++++---
 ports/esp32s2/common-hal/alarm/__init__.c | 38 +++--------------------
 ports/esp32s2/common-hal/alarm/__init__.h |  6 ----
 ports/esp32s2/supervisor/port.c           |  5 +--
 py/circuitpy_defns.mk                     |  2 +-
 shared-bindings/alarm/__init__.c          | 14 ---------
 shared-bindings/alarm/__init__.h          |  4 ---
 shared-bindings/alarm_io/__init__.c       |  5 ---
 shared-bindings/alarm_time/__init__.c     |  4 ---
 9 files changed, 15 insertions(+), 76 deletions(-)
 delete mode 100644 ports/esp32s2/common-hal/alarm/__init__.h

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 16c3dd973a..e344f4dd81 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -17,6 +17,13 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: main.c
+msgid ""
+"\n"
+"\n"
+"------ soft reboot ------\n"
+msgstr ""
+
 #: main.c
 msgid ""
 "\n"
@@ -3303,7 +3310,7 @@ msgstr ""
 msgid "size is defined for ndarrays only"
 msgstr ""
 
-#: shared-bindings/time/__init__.c
+#: shared-bindings/alarm_time/__init__.c shared-bindings/time/__init__.c
 msgid "sleep length must be non-negative"
 msgstr ""
 
@@ -3319,10 +3326,6 @@ msgstr ""
 msgid "small int overflow"
 msgstr ""
 
-#: main.c
-msgid "soft reboot\n"
-msgstr ""
-
 #: extmod/ulab/code/numerical/numerical.c
 msgid "sort argument must be an ndarray"
 msgstr ""
diff --git a/ports/esp32s2/common-hal/alarm/__init__.c b/ports/esp32s2/common-hal/alarm/__init__.c
index 90e8e9ecc8..89ff6865de 100644
--- a/ports/esp32s2/common-hal/alarm/__init__.c
+++ b/ports/esp32s2/common-hal/alarm/__init__.c
@@ -25,28 +25,11 @@
  * THE SOFTWARE.
  */
 
-#include <sys/time.h>
-
-#include "common-hal/alarm/__init__.h"
 #include "shared-bindings/alarm/__init__.h"
+#include "shared-bindings/alarm_io/__init__.h"
+#include "shared-bindings/alarm_time/__init__.h"
 
 #include "esp_sleep.h"
-#include "soc/rtc_periph.h"
-#include "driver/rtc_io.h"
-
-static RTC_DATA_ATTR struct timeval sleep_enter_time;
-static RTC_DATA_ATTR struct timeval sleep_exit_time;
-static RTC_DATA_ATTR uint8_t wake_io;
-
-int common_hal_alarm_get_sleep_time(void) {
-    return (sleep_exit_time.tv_sec - sleep_enter_time.tv_sec) * 1000 + (sleep_exit_time.tv_usec - sleep_enter_time.tv_usec) / 1000;
-}
-
-void RTC_IRAM_ATTR esp_wake_deep_sleep(void) {
-    esp_default_wake_deep_sleep();
-    wake_io = rtc_gpio_get_level(6);
-    gettimeofday(&sleep_exit_time, NULL);
-}
 
 mp_obj_t common_hal_alarm_get_wake_alarm(void) {
     switch (esp_sleep_get_wakeup_cause()) {
@@ -57,23 +40,12 @@ mp_obj_t common_hal_alarm_get_wake_alarm(void) {
             return timer;
         case ESP_SLEEP_WAKEUP_EXT0: ;
             //Wake up from GPIO
-            /*alarm_io_obj_t *ext0 = m_new_obj(alarm_io_obj_t);
+            alarm_io_obj_t *ext0 = m_new_obj(alarm_io_obj_t);
             ext0->base.type = &alarm_io_type;  
-            return ext0;*/
-            return mp_obj_new_int(wake_io);
-        case ESP_SLEEP_WAKEUP_EXT1: 
-            //Wake up from GPIO, returns -> esp_sleep_get_ext1_wakeup_status()  
-            /*uint64_t wakeup_pin_mask = esp_sleep_get_ext1_wakeup_status();
-            if (wakeup_pin_mask != 0) {
-                int pin = __builtin_ffsll(wakeup_pin_mask) - 1;
-                printf("Wake up from GPIO %d\n", pin);
-            } else {
-                printf("Wake up from GPIO\n");
-            }*/
-            break;       
+            return ext0;   
         case ESP_SLEEP_WAKEUP_TOUCHPAD: 
             //TODO: implement TouchIO
-            //Wake up from touch on pad, returns -> esp_sleep_get_touchpad_wakeup_status()
+            //Wake up from touch on pad, esp_sleep_get_touchpad_wakeup_status()
             break;        
         case ESP_SLEEP_WAKEUP_UNDEFINED:
         default:
diff --git a/ports/esp32s2/common-hal/alarm/__init__.h b/ports/esp32s2/common-hal/alarm/__init__.h
deleted file mode 100644
index 8ba5e2b04a..0000000000
--- a/ports/esp32s2/common-hal/alarm/__init__.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MICROPY_INCLUDED_ESP32S2_COMMON_HAL_MICROCONTROLLER_ALARM_H
-#define MICROPY_INCLUDED_ESP32S2_COMMON_HAL_MICROCONTROLLER_ALARM_H
-
-extern void esp_wake_deep_sleep(void);
-
-#endif // MICROPY_INCLUDED_ESP32S2_COMMON_HAL_MICROCONTROLLER_ALARM_H
\ No newline at end of file
diff --git a/ports/esp32s2/supervisor/port.c b/ports/esp32s2/supervisor/port.c
index 98c064a8b7..840b979632 100644
--- a/ports/esp32s2/supervisor/port.c
+++ b/ports/esp32s2/supervisor/port.c
@@ -34,7 +34,6 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 
-#include "common-hal/alarm/__init__.h"
 #include "common-hal/analogio/AnalogOut.h"
 #include "common-hal/busio/I2C.h"
 #include "common-hal/busio/SPI.h"
@@ -87,9 +86,7 @@ safe_mode_t port_init(void) {
     if (heap == NULL) {
         return NO_HEAP;
     }
-
-    esp_wake_deep_sleep();
-
+    
     return NO_SAFE_MODE;
 }
 
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index cd25c01f23..473536d530 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -309,7 +309,7 @@ SRC_COMMON_HAL_ALL = \
 	_pew/__init__.c \
 	alarm/__init__.c \
 	alarm_io/__init__.c \
-	alarm_time/__init__.c \	
+	alarm_time/__init__.c \
 	analogio/AnalogIn.c \
 	analogio/AnalogOut.c \
 	analogio/__init__.c \
diff --git a/shared-bindings/alarm/__init__.c b/shared-bindings/alarm/__init__.c
index 51a3776934..37462d88cc 100644
--- a/shared-bindings/alarm/__init__.c
+++ b/shared-bindings/alarm/__init__.c
@@ -1,26 +1,12 @@
 #include "shared-bindings/alarm/__init__.h"
 
-//| def getWakeAlarm() -> None:
-//|     """This returns the alarm that triggered wakeup, 
-//|     also returns alarm specific parameters`.
-//|
 STATIC mp_obj_t alarm_get_wake_alarm(void) {
     return common_hal_alarm_get_wake_alarm();
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(alarm_get_wake_alarm_obj, alarm_get_wake_alarm);
 
-//| def getSleepTime() -> None:
-//|     """This returns the period of time in ms, 
-//|     in which the board was in deep sleep`.
-//|
-STATIC mp_obj_t alarm_get_sleep_time(void) {
-    return mp_obj_new_int(common_hal_alarm_get_sleep_time());
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(alarm_get_sleep_time_obj, alarm_get_sleep_time);
-
 STATIC const mp_rom_map_elem_t alarm_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_alarm) },
-    { MP_ROM_QSTR(MP_QSTR_getSleepTime), MP_ROM_PTR(&alarm_get_sleep_time_obj) },
     { MP_ROM_QSTR(MP_QSTR_getWakeAlarm), MP_ROM_PTR(&alarm_get_wake_alarm_obj) },
 };
 
diff --git a/shared-bindings/alarm/__init__.h b/shared-bindings/alarm/__init__.h
index 2289028eff..8b2cd9f770 100644
--- a/shared-bindings/alarm/__init__.h
+++ b/shared-bindings/alarm/__init__.h
@@ -3,10 +3,6 @@
 
 #include "py/obj.h"
 
-#include "shared-bindings/alarm_io/__init__.h"
-#include "shared-bindings/alarm_time/__init__.h"
-
-extern int common_hal_alarm_get_sleep_time(void);
 extern mp_obj_t common_hal_alarm_get_wake_alarm(void);
 
 #endif  // MICROPY_INCLUDED_SHARED_BINDINGS_ALARM___INIT___H
diff --git a/shared-bindings/alarm_io/__init__.c b/shared-bindings/alarm_io/__init__.c
index 09783d0d08..d772ccb796 100644
--- a/shared-bindings/alarm_io/__init__.c
+++ b/shared-bindings/alarm_io/__init__.c
@@ -3,8 +3,6 @@
 #include "shared-bindings/alarm_io/__init__.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-//| Set Pin Wakeup 
-//|
 STATIC mp_obj_t alarm_io_pin_state(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {  
     enum { ARG_level, ARG_pull };
     static const mp_arg_t allowed_args[] = {
@@ -27,9 +25,6 @@ STATIC mp_obj_t alarm_io_pin_state(size_t n_args, const mp_obj_t *pos_args, mp_m
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(alarm_io_pin_state_obj, 1, alarm_io_pin_state);
 
-
-//| Disable Pin Wakeup 
-//|
 STATIC mp_obj_t alarm_io_disable(void) {      
     common_hal_alarm_io_disable();
     return mp_const_none;
diff --git a/shared-bindings/alarm_time/__init__.c b/shared-bindings/alarm_time/__init__.c
index 22fb935064..d4474ea2de 100644
--- a/shared-bindings/alarm_time/__init__.c
+++ b/shared-bindings/alarm_time/__init__.c
@@ -1,8 +1,6 @@
 #include "py/obj.h"
 #include "shared-bindings/alarm_time/__init__.h"
 
-//| Set Timer Wakeup 
-//|
 STATIC mp_obj_t alarm_time_duration(mp_obj_t seconds_o) { 
     #if MICROPY_PY_BUILTINS_FLOAT
     mp_float_t seconds = mp_obj_get_float(seconds_o);
@@ -24,8 +22,6 @@ STATIC mp_obj_t alarm_time_duration(mp_obj_t seconds_o) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(alarm_time_duration_obj, alarm_time_duration);
 
-//| Disable Timer Wakeup 
-//|
 STATIC mp_obj_t alarm_time_disable(void) {      
     common_hal_alarm_time_disable();
     return mp_const_none;

From 59df1a11ade4a39d079c9f418740b45b4d6121ce Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Fri, 25 Sep 2020 00:28:50 +0530
Subject: [PATCH 09/16] Add alarm_touch module

---
 ports/esp32s2/common-hal/alarm/__init__.c     | 10 ++++----
 ports/esp32s2/common-hal/alarm_io/__init__.c  | 12 +++++-----
 .../esp32s2/common-hal/alarm_time/__init__.c  |  4 ++--
 .../esp32s2/common-hal/alarm_touch/__init__.c |  7 ++++++
 .../common-hal/microcontroller/__init__.c     |  2 +-
 ports/esp32s2/mpconfigport.mk                 |  1 +
 ports/esp32s2/supervisor/port.c               |  2 +-
 py/circuitpy_defns.mk                         |  4 ++++
 py/circuitpy_mpconfig.h                       |  8 +++++++
 py/circuitpy_mpconfig.mk                      |  3 +++
 shared-bindings/alarm_io/__init__.c           | 10 ++++----
 shared-bindings/alarm_time/__init__.c         |  4 ++--
 shared-bindings/alarm_touch/__init__.c        | 24 +++++++++++++++++++
 shared-bindings/alarm_touch/__init__.h        | 14 +++++++++++
 shared-bindings/microcontroller/__init__.c    |  9 -------
 15 files changed, 83 insertions(+), 31 deletions(-)
 create mode 100644 ports/esp32s2/common-hal/alarm_touch/__init__.c
 create mode 100644 shared-bindings/alarm_touch/__init__.c
 create mode 100644 shared-bindings/alarm_touch/__init__.h

diff --git a/ports/esp32s2/common-hal/alarm/__init__.c b/ports/esp32s2/common-hal/alarm/__init__.c
index 89ff6865de..46715d9bf6 100644
--- a/ports/esp32s2/common-hal/alarm/__init__.c
+++ b/ports/esp32s2/common-hal/alarm/__init__.c
@@ -36,17 +36,17 @@ mp_obj_t common_hal_alarm_get_wake_alarm(void) {
         case ESP_SLEEP_WAKEUP_TIMER: ;
             //Wake up from timer.
             alarm_time_obj_t *timer = m_new_obj(alarm_time_obj_t);
-            timer->base.type = &alarm_time_type;           
+            timer->base.type = &alarm_time_type;
             return timer;
         case ESP_SLEEP_WAKEUP_EXT0: ;
             //Wake up from GPIO
             alarm_io_obj_t *ext0 = m_new_obj(alarm_io_obj_t);
-            ext0->base.type = &alarm_io_type;  
-            return ext0;   
-        case ESP_SLEEP_WAKEUP_TOUCHPAD: 
+            ext0->base.type = &alarm_io_type;
+            return ext0;
+        case ESP_SLEEP_WAKEUP_TOUCHPAD:
             //TODO: implement TouchIO
             //Wake up from touch on pad, esp_sleep_get_touchpad_wakeup_status()
-            break;        
+            break;
         case ESP_SLEEP_WAKEUP_UNDEFINED:
         default:
             //Not a deep sleep reset
diff --git a/ports/esp32s2/common-hal/alarm_io/__init__.c b/ports/esp32s2/common-hal/alarm_io/__init__.c
index 9aa28f4156..a98b933246 100644
--- a/ports/esp32s2/common-hal/alarm_io/__init__.c
+++ b/ports/esp32s2/common-hal/alarm_io/__init__.c
@@ -5,22 +5,22 @@
 
 mp_obj_t common_hal_alarm_io_pin_state (alarm_io_obj_t *self_in) {
     if (!rtc_gpio_is_valid_gpio(self_in->gpio)) {
-        mp_raise_ValueError(translate("io must be rtc io"));       
-    }   
+        mp_raise_ValueError(translate("io must be rtc io"));
+    }
 
     switch(esp_sleep_enable_ext0_wakeup(self_in->gpio, self_in->level)) {
         case ESP_ERR_INVALID_ARG:
             mp_raise_ValueError(translate("trigger level must be 0 or 1"));
         case ESP_ERR_INVALID_STATE:
             mp_raise_RuntimeError(translate("wakeup conflict"));
-        default: 
-            break;   
+        default:
+            break;
     }
 
     if (self_in->pull) { (self_in->level) ? rtc_gpio_pulldown_en(self_in->gpio) : rtc_gpio_pullup_en(self_in->gpio); }
 
-    return self_in;     
-}  
+    return self_in;
+}
 
 void common_hal_alarm_io_disable (void) {
     esp_sleep_disable_wakeup_source(ESP_SLEEP_WAKEUP_EXT0 | ESP_SLEEP_WAKEUP_EXT1);
diff --git a/ports/esp32s2/common-hal/alarm_time/__init__.c b/ports/esp32s2/common-hal/alarm_time/__init__.c
index fb601e6be0..252b6e107c 100644
--- a/ports/esp32s2/common-hal/alarm_time/__init__.c
+++ b/ports/esp32s2/common-hal/alarm_time/__init__.c
@@ -5,8 +5,8 @@
 void common_hal_alarm_time_duration (uint32_t ms) {
     if (esp_sleep_enable_timer_wakeup((ms) * 1000) == ESP_ERR_INVALID_ARG) {
         mp_raise_ValueError(translate("time out of range"));
-    }   
-}  
+    }
+}
 
 void common_hal_alarm_time_disable (void) {
     esp_sleep_disable_wakeup_source(ESP_SLEEP_WAKEUP_TIMER);
diff --git a/ports/esp32s2/common-hal/alarm_touch/__init__.c b/ports/esp32s2/common-hal/alarm_touch/__init__.c
new file mode 100644
index 0000000000..df32b26930
--- /dev/null
+++ b/ports/esp32s2/common-hal/alarm_touch/__init__.c
@@ -0,0 +1,7 @@
+#include "esp_sleep.h"
+
+#include "shared-bindings/alarm_touch/__init__.h"
+
+void common_hal_alarm_touch_disable (void) {
+    esp_sleep_disable_wakeup_source(ESP_SLEEP_WAKEUP_TOUCHPAD);
+}
diff --git a/ports/esp32s2/common-hal/microcontroller/__init__.c b/ports/esp32s2/common-hal/microcontroller/__init__.c
index ba24e1c48d..f1dc24bb89 100644
--- a/ports/esp32s2/common-hal/microcontroller/__init__.c
+++ b/ports/esp32s2/common-hal/microcontroller/__init__.c
@@ -80,7 +80,7 @@ void common_hal_mcu_reset(void) {
 }
 
 void common_hal_mcu_sleep(void) {
-    esp_deep_sleep_start(); 
+    esp_deep_sleep_start();
 }
 
 // The singleton microcontroller.Processor object, bound to microcontroller.cpu
diff --git a/ports/esp32s2/mpconfigport.mk b/ports/esp32s2/mpconfigport.mk
index 1a78821d32..7024ceb630 100644
--- a/ports/esp32s2/mpconfigport.mk
+++ b/ports/esp32s2/mpconfigport.mk
@@ -17,6 +17,7 @@ CIRCUITPY_FULL_BUILD = 1
 CIRCUITPY_ALARM = 1
 CIRCUITPY_ALARM_IO = 1
 CIRCUITPY_ALARM_TIME = 1
+CIRCUITPY_ALARM_TOUCH = 1
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_AUDIOIO = 0
 CIRCUITPY_CANIO = 1
diff --git a/ports/esp32s2/supervisor/port.c b/ports/esp32s2/supervisor/port.c
index 840b979632..df6755783d 100644
--- a/ports/esp32s2/supervisor/port.c
+++ b/ports/esp32s2/supervisor/port.c
@@ -86,7 +86,7 @@ safe_mode_t port_init(void) {
     if (heap == NULL) {
         return NO_HEAP;
     }
-    
+
     return NO_SAFE_MODE;
 }
 
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index 473536d530..72091decbf 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -108,6 +108,9 @@ endif
 ifeq ($(CIRCUITPY_ALARM_TIME),1)
 SRC_PATTERNS += alarm_time/%
 endif
+ifeq ($(CIRCUITPY_ALARM_TIME),1)
+SRC_PATTERNS += alarm_touch/%
+endif
 ifeq ($(CIRCUITPY_ANALOGIO),1)
 SRC_PATTERNS += analogio/%
 endif
@@ -310,6 +313,7 @@ SRC_COMMON_HAL_ALL = \
 	alarm/__init__.c \
 	alarm_io/__init__.c \
 	alarm_time/__init__.c \
+	alarm_touch/__init__.c \
 	analogio/AnalogIn.c \
 	analogio/AnalogOut.c \
 	analogio/__init__.c \
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index 778c3131b6..c8141a99a6 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -261,6 +261,13 @@ extern const struct _mp_obj_module_t alarm_time_module;
 #define ALARM_TIME_MODULE
 #endif
 
+#if CIRCUITPY_ALARM_TOUCH
+extern const struct _mp_obj_module_t alarm_touch_module;
+#define ALARM_TOUCH_MODULE      { MP_OBJ_NEW_QSTR(MP_QSTR_alarm_touch), (mp_obj_t)&alarm_touch_module },
+#else
+#define ALARM_TOUCH_MODULE
+#endif
+
 #if CIRCUITPY_ANALOGIO
 #define ANALOGIO_MODULE        { MP_OBJ_NEW_QSTR(MP_QSTR_analogio), (mp_obj_t)&analogio_module },
 extern const struct _mp_obj_module_t analogio_module;
@@ -787,6 +794,7 @@ extern const struct _mp_obj_module_t wifi_module;
     ALARM_MODULE \
     ALARM_IO_MODULE \
     ALARM_TIME_MODULE \
+    ALARM_TOUCH_MODULE \
     ANALOGIO_MODULE \
     AUDIOBUSIO_MODULE \
     AUDIOCORE_MODULE \
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index c1790e5e35..59d23e4667 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -48,6 +48,9 @@ CFLAGS += -DCIRCUITPY_ALARM_IO=$(CIRCUITPY_ALARM_IO)
 CIRCUITPY_ALARM_TIME ?= 0
 CFLAGS += -DCIRCUITPY_ALARM_TIME=$(CIRCUITPY_ALARM_TIME)
 
+CIRCUITPY_ALARM_TOUCH ?= 0
+CFLAGS += -DCIRCUITPY_ALARM_TOUCH=$(CIRCUITPY_ALARM_TOUCH)
+
 CIRCUITPY_ANALOGIO ?= 1
 CFLAGS += -DCIRCUITPY_ANALOGIO=$(CIRCUITPY_ANALOGIO)
 
diff --git a/shared-bindings/alarm_io/__init__.c b/shared-bindings/alarm_io/__init__.c
index d772ccb796..dbe4671763 100644
--- a/shared-bindings/alarm_io/__init__.c
+++ b/shared-bindings/alarm_io/__init__.c
@@ -3,15 +3,15 @@
 #include "shared-bindings/alarm_io/__init__.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-STATIC mp_obj_t alarm_io_pin_state(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {  
+STATIC mp_obj_t alarm_io_pin_state(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_level, ARG_pull };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_level, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
         { MP_QSTR_pull, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_bool = false} },
-    }; 
+    };
 
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);  
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     mcu_pin_obj_t *pin = validate_obj_is_pin(pos_args[0]);
     alarm_io_obj_t *self = m_new_obj(alarm_io_obj_t);
@@ -20,12 +20,12 @@ STATIC mp_obj_t alarm_io_pin_state(size_t n_args, const mp_obj_t *pos_args, mp_m
     self->gpio = pin->number;
     self->level = args[ARG_level].u_int;
     self->pull = args[ARG_pull].u_bool;
-    
+
     return common_hal_alarm_io_pin_state(self);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(alarm_io_pin_state_obj, 1, alarm_io_pin_state);
 
-STATIC mp_obj_t alarm_io_disable(void) {      
+STATIC mp_obj_t alarm_io_disable(void) {
     common_hal_alarm_io_disable();
     return mp_const_none;
 }
diff --git a/shared-bindings/alarm_time/__init__.c b/shared-bindings/alarm_time/__init__.c
index d4474ea2de..218ac68575 100644
--- a/shared-bindings/alarm_time/__init__.c
+++ b/shared-bindings/alarm_time/__init__.c
@@ -1,7 +1,7 @@
 #include "py/obj.h"
 #include "shared-bindings/alarm_time/__init__.h"
 
-STATIC mp_obj_t alarm_time_duration(mp_obj_t seconds_o) { 
+STATIC mp_obj_t alarm_time_duration(mp_obj_t seconds_o) {
     #if MICROPY_PY_BUILTINS_FLOAT
     mp_float_t seconds = mp_obj_get_float(seconds_o);
     mp_float_t msecs = 1000.0f * seconds + 0.5f;
@@ -22,7 +22,7 @@ STATIC mp_obj_t alarm_time_duration(mp_obj_t seconds_o) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(alarm_time_duration_obj, alarm_time_duration);
 
-STATIC mp_obj_t alarm_time_disable(void) {      
+STATIC mp_obj_t alarm_time_disable(void) {
     common_hal_alarm_time_disable();
     return mp_const_none;
 }
diff --git a/shared-bindings/alarm_touch/__init__.c b/shared-bindings/alarm_touch/__init__.c
new file mode 100644
index 0000000000..e36fa73cb8
--- /dev/null
+++ b/shared-bindings/alarm_touch/__init__.c
@@ -0,0 +1,24 @@
+#include "py/obj.h"
+#include "shared-bindings/alarm_touch/__init__.h"
+
+STATIC mp_obj_t alarm_touch_disable(void) {
+    common_hal_alarm_touch_disable();
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(alarm_touch_disable_obj, alarm_touch_disable);
+
+STATIC const mp_rom_map_elem_t alarm_touch_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_alarm_touch) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_Disable), MP_ROM_PTR(&alarm_touch_disable_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(alarm_touch_module_globals, alarm_touch_module_globals_table);
+
+const mp_obj_module_t alarm_touch_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t*)&alarm_touch_module_globals,
+};
+
+const mp_obj_type_t alarm_touch_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_touchAlarm,
+};
diff --git a/shared-bindings/alarm_touch/__init__.h b/shared-bindings/alarm_touch/__init__.h
new file mode 100644
index 0000000000..600587d247
--- /dev/null
+++ b/shared-bindings/alarm_touch/__init__.h
@@ -0,0 +1,14 @@
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_ALARM_TOUCH___INIT___H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_ALARM_TOUCH___INIT___H
+
+#include "py/runtime.h"
+
+typedef struct {
+    mp_obj_base_t base;
+} alarm_touch_obj_t;
+
+extern const mp_obj_type_t alarm_touch_type;
+
+extern void common_hal_alarm_touch_disable (void);
+
+#endif //MICROPY_INCLUDED_SHARED_BINDINGS_ALARM_TOUCH___INIT___H
diff --git a/shared-bindings/microcontroller/__init__.c b/shared-bindings/microcontroller/__init__.c
index eb58a40982..88dc4179d6 100644
--- a/shared-bindings/microcontroller/__init__.c
+++ b/shared-bindings/microcontroller/__init__.c
@@ -135,15 +135,6 @@ STATIC mp_obj_t mcu_reset(void) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(mcu_reset_obj, mcu_reset);
 
-//| def sleep() -> None:
-//|     """Microcontroller will go into deep sleep. 
-//|     cpy will restart when wakeup func. is triggered`.
-//|
-//|     .. warning:: This may result in file system corruption when connected to a
-//|       host computer. Be very careful when calling this! Make sure the device
-//|       "Safely removed" on Windows or "ejected" on Mac OSX and Linux."""
-//|     ...
-//|
 STATIC mp_obj_t mcu_sleep(void) {
     common_hal_mcu_sleep();
     // We won't actually get here because mcu is going into sleep.

From e35938971a4e9c0177e68163e1baab3b25c17ca8 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Fri, 25 Sep 2020 03:32:31 +0530
Subject: [PATCH 10/16] Add description of alarm modules

---
 ports/atmel-samd/common-hal/microcontroller/__init__.c | 4 ++++
 ports/cxd56/common-hal/microcontroller/__init__.c      | 4 ++++
 ports/litex/common-hal/microcontroller/__init__.c      | 4 ++++
 ports/mimxrt10xx/common-hal/microcontroller/__init__.c | 4 ++++
 ports/nrf/common-hal/microcontroller/__init__.c        | 4 ++++
 ports/stm/common-hal/microcontroller/__init__.c        | 4 ++++
 shared-bindings/alarm/__init__.c                       | 4 ++++
 shared-bindings/alarm_io/__init__.c                    | 4 ++++
 shared-bindings/alarm_time/__init__.c                  | 4 ++++
 shared-bindings/alarm_touch/__init__.c                 | 4 ++++
 10 files changed, 40 insertions(+)

diff --git a/ports/atmel-samd/common-hal/microcontroller/__init__.c b/ports/atmel-samd/common-hal/microcontroller/__init__.c
index 50a1ec038e..b3ff06b62f 100644
--- a/ports/atmel-samd/common-hal/microcontroller/__init__.c
+++ b/ports/atmel-samd/common-hal/microcontroller/__init__.c
@@ -84,6 +84,10 @@ void common_hal_mcu_reset(void) {
     reset();
 }
 
+void common_hal_mcu_sleep(void) {
+    //deep sleep call here
+}
+
 // The singleton microcontroller.Processor object, bound to microcontroller.cpu
 // It currently only has properties, and no state.
 const mcu_processor_obj_t common_hal_mcu_processor_obj = {
diff --git a/ports/cxd56/common-hal/microcontroller/__init__.c b/ports/cxd56/common-hal/microcontroller/__init__.c
index 7aa3b839d7..4379f9be66 100644
--- a/ports/cxd56/common-hal/microcontroller/__init__.c
+++ b/ports/cxd56/common-hal/microcontroller/__init__.c
@@ -81,6 +81,10 @@ void common_hal_mcu_reset(void) {
     boardctl(BOARDIOC_RESET, 0);
 }
 
+void common_hal_mcu_sleep(void) {
+    //deep sleep call here
+}
+
 STATIC const mp_rom_map_elem_t mcu_pin_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_UART2_RXD), MP_ROM_PTR(&pin_UART2_RXD) },
     { MP_ROM_QSTR(MP_QSTR_UART2_TXD), MP_ROM_PTR(&pin_UART2_TXD) },
diff --git a/ports/litex/common-hal/microcontroller/__init__.c b/ports/litex/common-hal/microcontroller/__init__.c
index 3c91661144..3b1628c39a 100644
--- a/ports/litex/common-hal/microcontroller/__init__.c
+++ b/ports/litex/common-hal/microcontroller/__init__.c
@@ -89,6 +89,10 @@ void common_hal_mcu_reset(void) {
     while(1);
 }
 
+void common_hal_mcu_sleep(void) {
+    //deep sleep call here
+}
+
 // The singleton microcontroller.Processor object, bound to microcontroller.cpu
 // It currently only has properties, and no state.
 const mcu_processor_obj_t common_hal_mcu_processor_obj = {
diff --git a/ports/mimxrt10xx/common-hal/microcontroller/__init__.c b/ports/mimxrt10xx/common-hal/microcontroller/__init__.c
index 6a8537e2da..c7bc7eb9e8 100644
--- a/ports/mimxrt10xx/common-hal/microcontroller/__init__.c
+++ b/ports/mimxrt10xx/common-hal/microcontroller/__init__.c
@@ -86,6 +86,10 @@ void common_hal_mcu_reset(void) {
     NVIC_SystemReset();
 }
 
+void common_hal_mcu_sleep(void) {
+    //deep sleep call here
+}
+
 // The singleton microcontroller.Processor object, bound to microcontroller.cpu
 // It currently only has properties, and no state.
 const mcu_processor_obj_t common_hal_mcu_processor_obj = {
diff --git a/ports/nrf/common-hal/microcontroller/__init__.c b/ports/nrf/common-hal/microcontroller/__init__.c
index 06aac9409d..ff6c658b8b 100644
--- a/ports/nrf/common-hal/microcontroller/__init__.c
+++ b/ports/nrf/common-hal/microcontroller/__init__.c
@@ -95,6 +95,10 @@ void common_hal_mcu_reset(void) {
     reset_cpu();
 }
 
+void common_hal_mcu_sleep(void) {
+    //deep sleep call here
+}
+
 // The singleton microcontroller.Processor object, bound to microcontroller.cpu
 // It currently only has properties, and no state.
 const mcu_processor_obj_t common_hal_mcu_processor_obj = {
diff --git a/ports/stm/common-hal/microcontroller/__init__.c b/ports/stm/common-hal/microcontroller/__init__.c
index a827399ccb..2a60c53426 100644
--- a/ports/stm/common-hal/microcontroller/__init__.c
+++ b/ports/stm/common-hal/microcontroller/__init__.c
@@ -81,6 +81,10 @@ void common_hal_mcu_reset(void) {
     NVIC_SystemReset();
 }
 
+void common_hal_mcu_sleep(void) {
+    //deep sleep call here
+}
+
 // The singleton microcontroller.Processor object, bound to microcontroller.cpu
 // It currently only has properties, and no state.
 const mcu_processor_obj_t common_hal_mcu_processor_obj = {
diff --git a/shared-bindings/alarm/__init__.c b/shared-bindings/alarm/__init__.c
index 37462d88cc..88c4bc8878 100644
--- a/shared-bindings/alarm/__init__.c
+++ b/shared-bindings/alarm/__init__.c
@@ -1,5 +1,9 @@
 #include "shared-bindings/alarm/__init__.h"
 
+//| """alarm module
+//|
+//| The `alarm` module implements deep sleep."""
+
 STATIC mp_obj_t alarm_get_wake_alarm(void) {
     return common_hal_alarm_get_wake_alarm();
 }
diff --git a/shared-bindings/alarm_io/__init__.c b/shared-bindings/alarm_io/__init__.c
index dbe4671763..4e42f9a2e1 100644
--- a/shared-bindings/alarm_io/__init__.c
+++ b/shared-bindings/alarm_io/__init__.c
@@ -3,6 +3,10 @@
 #include "shared-bindings/alarm_io/__init__.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
+//| """alarm_io module
+//|
+//| The `alarm_io` module implements deep sleep."""
+
 STATIC mp_obj_t alarm_io_pin_state(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_level, ARG_pull };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/alarm_time/__init__.c b/shared-bindings/alarm_time/__init__.c
index 218ac68575..1707f7488f 100644
--- a/shared-bindings/alarm_time/__init__.c
+++ b/shared-bindings/alarm_time/__init__.c
@@ -1,6 +1,10 @@
 #include "py/obj.h"
 #include "shared-bindings/alarm_time/__init__.h"
 
+//| """alarm_time module
+//|
+//| The `alarm_time` module implements deep sleep."""
+
 STATIC mp_obj_t alarm_time_duration(mp_obj_t seconds_o) {
     #if MICROPY_PY_BUILTINS_FLOAT
     mp_float_t seconds = mp_obj_get_float(seconds_o);
diff --git a/shared-bindings/alarm_touch/__init__.c b/shared-bindings/alarm_touch/__init__.c
index e36fa73cb8..5f5a156d80 100644
--- a/shared-bindings/alarm_touch/__init__.c
+++ b/shared-bindings/alarm_touch/__init__.c
@@ -1,6 +1,10 @@
 #include "py/obj.h"
 #include "shared-bindings/alarm_touch/__init__.h"
 
+//| """alarm_touch module
+//|
+//| The `alarm_touch` module implements deep sleep."""
+
 STATIC mp_obj_t alarm_touch_disable(void) {
     common_hal_alarm_touch_disable();
     return mp_const_none;

From 930cf14dcef3e3552a0e7d7476fd89b873738c2d Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Sat, 26 Sep 2020 11:15:50 +0530
Subject: [PATCH 11/16] Add check for invalid io, function to disable all
 alarms

---
 ports/atmel-samd/common-hal/microcontroller/__init__.c | 2 +-
 ports/cxd56/common-hal/microcontroller/__init__.c      | 2 +-
 ports/esp32s2/common-hal/alarm/__init__.c              | 4 ++++
 ports/esp32s2/common-hal/alarm_io/__init__.c           | 8 ++++++++
 ports/esp32s2/common-hal/microcontroller/__init__.c    | 2 +-
 ports/litex/common-hal/microcontroller/__init__.c      | 2 +-
 ports/mimxrt10xx/common-hal/microcontroller/__init__.c | 2 +-
 ports/nrf/common-hal/microcontroller/__init__.c        | 2 +-
 ports/stm/common-hal/microcontroller/__init__.c        | 2 +-
 py/circuitpy_defns.mk                                  | 2 +-
 shared-bindings/alarm/__init__.c                       | 9 ++++++++-
 shared-bindings/alarm/__init__.h                       | 1 +
 shared-bindings/microcontroller/__init__.c             | 3 ++-
 shared-bindings/microcontroller/__init__.h             | 2 +-
 14 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/ports/atmel-samd/common-hal/microcontroller/__init__.c b/ports/atmel-samd/common-hal/microcontroller/__init__.c
index b3ff06b62f..ca39f28386 100644
--- a/ports/atmel-samd/common-hal/microcontroller/__init__.c
+++ b/ports/atmel-samd/common-hal/microcontroller/__init__.c
@@ -84,7 +84,7 @@ void common_hal_mcu_reset(void) {
     reset();
 }
 
-void common_hal_mcu_sleep(void) {
+void common_hal_mcu_deep_sleep(void) {
     //deep sleep call here
 }
 
diff --git a/ports/cxd56/common-hal/microcontroller/__init__.c b/ports/cxd56/common-hal/microcontroller/__init__.c
index 4379f9be66..57140dec70 100644
--- a/ports/cxd56/common-hal/microcontroller/__init__.c
+++ b/ports/cxd56/common-hal/microcontroller/__init__.c
@@ -81,7 +81,7 @@ void common_hal_mcu_reset(void) {
     boardctl(BOARDIOC_RESET, 0);
 }
 
-void common_hal_mcu_sleep(void) {
+void common_hal_mcu_deep_sleep(void) {
     //deep sleep call here
 }
 
diff --git a/ports/esp32s2/common-hal/alarm/__init__.c b/ports/esp32s2/common-hal/alarm/__init__.c
index 46715d9bf6..552ad4452b 100644
--- a/ports/esp32s2/common-hal/alarm/__init__.c
+++ b/ports/esp32s2/common-hal/alarm/__init__.c
@@ -31,6 +31,10 @@
 
 #include "esp_sleep.h"
 
+void common_hal_alarm_disable_all(void) {
+    esp_sleep_disable_wakeup_source(ESP_SLEEP_WAKEUP_ALL);
+}
+
 mp_obj_t common_hal_alarm_get_wake_alarm(void) {
     switch (esp_sleep_get_wakeup_cause()) {
         case ESP_SLEEP_WAKEUP_TIMER: ;
diff --git a/ports/esp32s2/common-hal/alarm_io/__init__.c b/ports/esp32s2/common-hal/alarm_io/__init__.c
index a98b933246..b39693c6af 100644
--- a/ports/esp32s2/common-hal/alarm_io/__init__.c
+++ b/ports/esp32s2/common-hal/alarm_io/__init__.c
@@ -8,6 +8,14 @@ mp_obj_t common_hal_alarm_io_pin_state (alarm_io_obj_t *self_in) {
         mp_raise_ValueError(translate("io must be rtc io"));
     }
 
+    if (self_in->pull && !self_in->level) {
+        for (uint8_t i = 0; i<=4; i+=2) {
+            if (self_in->gpio == i) {
+                mp_raise_ValueError(translate("IOs 0, 2 & 4 do not support internal pullup in sleep"));
+            }
+        }
+    }
+
     switch(esp_sleep_enable_ext0_wakeup(self_in->gpio, self_in->level)) {
         case ESP_ERR_INVALID_ARG:
             mp_raise_ValueError(translate("trigger level must be 0 or 1"));
diff --git a/ports/esp32s2/common-hal/microcontroller/__init__.c b/ports/esp32s2/common-hal/microcontroller/__init__.c
index f1dc24bb89..ab0e1bfaa4 100644
--- a/ports/esp32s2/common-hal/microcontroller/__init__.c
+++ b/ports/esp32s2/common-hal/microcontroller/__init__.c
@@ -79,7 +79,7 @@ void common_hal_mcu_reset(void) {
     while(1);
 }
 
-void common_hal_mcu_sleep(void) {
+void common_hal_mcu_deep_sleep(void) {
     esp_deep_sleep_start();
 }
 
diff --git a/ports/litex/common-hal/microcontroller/__init__.c b/ports/litex/common-hal/microcontroller/__init__.c
index 3b1628c39a..e6f50ed5a6 100644
--- a/ports/litex/common-hal/microcontroller/__init__.c
+++ b/ports/litex/common-hal/microcontroller/__init__.c
@@ -89,7 +89,7 @@ void common_hal_mcu_reset(void) {
     while(1);
 }
 
-void common_hal_mcu_sleep(void) {
+void common_hal_mcu_deep_sleep(void) {
     //deep sleep call here
 }
 
diff --git a/ports/mimxrt10xx/common-hal/microcontroller/__init__.c b/ports/mimxrt10xx/common-hal/microcontroller/__init__.c
index c7bc7eb9e8..0329ced69b 100644
--- a/ports/mimxrt10xx/common-hal/microcontroller/__init__.c
+++ b/ports/mimxrt10xx/common-hal/microcontroller/__init__.c
@@ -86,7 +86,7 @@ void common_hal_mcu_reset(void) {
     NVIC_SystemReset();
 }
 
-void common_hal_mcu_sleep(void) {
+void common_hal_mcu_deep_sleep(void) {
     //deep sleep call here
 }
 
diff --git a/ports/nrf/common-hal/microcontroller/__init__.c b/ports/nrf/common-hal/microcontroller/__init__.c
index ff6c658b8b..9911896bff 100644
--- a/ports/nrf/common-hal/microcontroller/__init__.c
+++ b/ports/nrf/common-hal/microcontroller/__init__.c
@@ -95,7 +95,7 @@ void common_hal_mcu_reset(void) {
     reset_cpu();
 }
 
-void common_hal_mcu_sleep(void) {
+void common_hal_mcu_deep_sleep(void) {
     //deep sleep call here
 }
 
diff --git a/ports/stm/common-hal/microcontroller/__init__.c b/ports/stm/common-hal/microcontroller/__init__.c
index 2a60c53426..bc81b0e4f5 100644
--- a/ports/stm/common-hal/microcontroller/__init__.c
+++ b/ports/stm/common-hal/microcontroller/__init__.c
@@ -81,7 +81,7 @@ void common_hal_mcu_reset(void) {
     NVIC_SystemReset();
 }
 
-void common_hal_mcu_sleep(void) {
+void common_hal_mcu_deep_sleep(void) {
     //deep sleep call here
 }
 
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index 72091decbf..7e17934a56 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -108,7 +108,7 @@ endif
 ifeq ($(CIRCUITPY_ALARM_TIME),1)
 SRC_PATTERNS += alarm_time/%
 endif
-ifeq ($(CIRCUITPY_ALARM_TIME),1)
+ifeq ($(CIRCUITPY_ALARM_TOUCH),1)
 SRC_PATTERNS += alarm_touch/%
 endif
 ifeq ($(CIRCUITPY_ANALOGIO),1)
diff --git a/shared-bindings/alarm/__init__.c b/shared-bindings/alarm/__init__.c
index 88c4bc8878..f43c2ea12d 100644
--- a/shared-bindings/alarm/__init__.c
+++ b/shared-bindings/alarm/__init__.c
@@ -4,6 +4,12 @@
 //|
 //| The `alarm` module implements deep sleep."""
 
+STATIC mp_obj_t alarm_disable_all(void) {
+    common_hal_alarm_disable_all();
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(alarm_disable_all_obj, alarm_disable_all);
+
 STATIC mp_obj_t alarm_get_wake_alarm(void) {
     return common_hal_alarm_get_wake_alarm();
 }
@@ -11,7 +17,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(alarm_get_wake_alarm_obj, alarm_get_wake_alarm)
 
 STATIC const mp_rom_map_elem_t alarm_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_alarm) },
-    { MP_ROM_QSTR(MP_QSTR_getWakeAlarm), MP_ROM_PTR(&alarm_get_wake_alarm_obj) },
+    { MP_ROM_QSTR(MP_QSTR_Disable), MP_ROM_PTR(&alarm_disable_all_obj) },
+    { MP_ROM_QSTR(MP_QSTR_get_wake_alarm), MP_ROM_PTR(&alarm_get_wake_alarm_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(alarm_module_globals, alarm_module_globals_table);
diff --git a/shared-bindings/alarm/__init__.h b/shared-bindings/alarm/__init__.h
index 8b2cd9f770..db3966ac5d 100644
--- a/shared-bindings/alarm/__init__.h
+++ b/shared-bindings/alarm/__init__.h
@@ -3,6 +3,7 @@
 
 #include "py/obj.h"
 
+extern void common_hal_alarm_disable_all(void);
 extern mp_obj_t common_hal_alarm_get_wake_alarm(void);
 
 #endif  // MICROPY_INCLUDED_SHARED_BINDINGS_ALARM___INIT___H
diff --git a/shared-bindings/microcontroller/__init__.c b/shared-bindings/microcontroller/__init__.c
index 88dc4179d6..bbc1640f76 100644
--- a/shared-bindings/microcontroller/__init__.c
+++ b/shared-bindings/microcontroller/__init__.c
@@ -136,7 +136,7 @@ STATIC mp_obj_t mcu_reset(void) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(mcu_reset_obj, mcu_reset);
 
 STATIC mp_obj_t mcu_sleep(void) {
-    common_hal_mcu_sleep();
+    common_hal_mcu_deep_sleep();
     // We won't actually get here because mcu is going into sleep.
     return mp_const_none;
 }
@@ -177,6 +177,7 @@ STATIC const mp_rom_map_elem_t mcu_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_enable_interrupts), MP_ROM_PTR(&mcu_enable_interrupts_obj) },
     { MP_ROM_QSTR(MP_QSTR_on_next_reset), MP_ROM_PTR(&mcu_on_next_reset_obj) },
     { MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&mcu_reset_obj) },
+    //ToDo: Remove MP_QSTR_sleep when sleep on code.py exit implemented.
     { MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&mcu_sleep_obj) },
     #if CIRCUITPY_INTERNAL_NVM_SIZE > 0
     { MP_ROM_QSTR(MP_QSTR_nvm),  MP_ROM_PTR(&common_hal_mcu_nvm_obj) },
diff --git a/shared-bindings/microcontroller/__init__.h b/shared-bindings/microcontroller/__init__.h
index 95f1cf8fc7..f5bcfaa08a 100644
--- a/shared-bindings/microcontroller/__init__.h
+++ b/shared-bindings/microcontroller/__init__.h
@@ -43,7 +43,7 @@ extern void common_hal_mcu_enable_interrupts(void);
 extern void common_hal_mcu_on_next_reset(mcu_runmode_t runmode);
 extern void common_hal_mcu_reset(void);
 
-extern void common_hal_mcu_sleep(void);
+extern void common_hal_mcu_deep_sleep(void);
 
 extern const mp_obj_dict_t mcu_pin_globals;
 

From 0e444f0de8dd4db8b5be1c41b4c8062364e4fd94 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Wed, 30 Sep 2020 11:15:02 +0530
Subject: [PATCH 12/16] Implement sleep on code.py exit

---
 main.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/main.c b/main.c
index 5a30f4bb26..328c3bbcba 100755
--- a/main.c
+++ b/main.c
@@ -57,6 +57,9 @@
 #include "supervisor/shared/status_leds.h"
 #include "supervisor/shared/stack.h"
 #include "supervisor/serial.h"
+#include "supervisor/usb.h"
+
+#include "shared-bindings/microcontroller/__init__.h"
 
 #include "boards/board.h"
 
@@ -300,6 +303,19 @@ bool run_code_py(safe_mode_t safe_mode) {
         }
     }
 
+    for (uint8_t i = 0; i<=100; i++) {
+        if (!usb_msc_ejected()) {
+            //Go into light sleep
+            break;
+        }
+        mp_hal_delay_ms(10);
+    }
+
+    if (usb_msc_ejected()) {
+        //Go into deep sleep
+        common_hal_mcu_deep_sleep();
+    }
+
     // Display a different completion message if the user has no USB attached (cannot save files)
     if (!serial_connected_at_start) {
         serial_write_compressed(translate("\nCode done running. Waiting for reload.\n"));

From 354536c09fca3cecca6e6e5605710436501fccac Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Wed, 7 Oct 2020 09:55:48 +0530
Subject: [PATCH 13/16] Update translation

---
 locale/circuitpython.pot | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index e344f4dd81..eb958a5999 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -980,6 +980,10 @@ msgstr ""
 msgid "I2SOut not available"
 msgstr ""
 
+#: ports/esp32s2/common-hal/alarm_io/__init__.c
+msgid "IOs 0, 2 & 4 do not support internal pullup in sleep"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 #, c-format
 msgid "IV must be %d bytes long"
@@ -2790,6 +2794,10 @@ msgstr ""
 msgid "invalid syntax for number"
 msgstr ""
 
+#: ports/esp32s2/common-hal/alarm_io/__init__.c
+msgid "io must be rtc io"
+msgstr ""
+
 #: py/objtype.c
 msgid "issubclass() arg 1 must be a class"
 msgstr ""
@@ -3410,6 +3418,10 @@ msgstr ""
 msgid "threshold must be in the range 0-65536"
 msgstr ""
 
+#: ports/esp32s2/common-hal/alarm_time/__init__.c
+msgid "time out of range"
+msgstr ""
+
 #: shared-bindings/time/__init__.c
 msgid "time.struct_time() takes a 9-sequence"
 msgstr ""
@@ -3455,6 +3467,10 @@ msgstr ""
 msgid "trapz is defined for 1D arrays of equal length"
 msgstr ""
 
+#: ports/esp32s2/common-hal/alarm_io/__init__.c
+msgid "trigger level must be 0 or 1"
+msgstr ""
+
 #: extmod/ulab/code/linalg/linalg.c
 msgid "tuple index out of range"
 msgstr ""
@@ -3597,6 +3613,10 @@ msgstr ""
 msgid "vectors must have same lengths"
 msgstr ""
 
+#: ports/esp32s2/common-hal/alarm_io/__init__.c
+msgid "wakeup conflict"
+msgstr ""
+
 #: shared-bindings/watchdog/WatchDogTimer.c
 msgid "watchdog timeout must be greater than 0"
 msgstr ""

From 1196d4bcf62884a18316bf44258a8d9b838f7273 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Wed, 14 Oct 2020 14:09:41 -0700
Subject: [PATCH 14/16] move to new module

---
 shared-bindings/alarm/__init__.c   |  29 ---------
 shared-bindings/alarm/__init__.h   |   9 ---
 shared-bindings/sleepio/__init__.c | 101 +++++++++++++++++++++++++++++
 shared-bindings/sleepio/__init__.h |  10 +++
 4 files changed, 111 insertions(+), 38 deletions(-)
 delete mode 100644 shared-bindings/alarm/__init__.c
 delete mode 100644 shared-bindings/alarm/__init__.h
 create mode 100644 shared-bindings/sleepio/__init__.c
 create mode 100644 shared-bindings/sleepio/__init__.h

diff --git a/shared-bindings/alarm/__init__.c b/shared-bindings/alarm/__init__.c
deleted file mode 100644
index f43c2ea12d..0000000000
--- a/shared-bindings/alarm/__init__.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "shared-bindings/alarm/__init__.h"
-
-//| """alarm module
-//|
-//| The `alarm` module implements deep sleep."""
-
-STATIC mp_obj_t alarm_disable_all(void) {
-    common_hal_alarm_disable_all();
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(alarm_disable_all_obj, alarm_disable_all);
-
-STATIC mp_obj_t alarm_get_wake_alarm(void) {
-    return common_hal_alarm_get_wake_alarm();
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(alarm_get_wake_alarm_obj, alarm_get_wake_alarm);
-
-STATIC const mp_rom_map_elem_t alarm_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_alarm) },
-    { MP_ROM_QSTR(MP_QSTR_Disable), MP_ROM_PTR(&alarm_disable_all_obj) },
-    { MP_ROM_QSTR(MP_QSTR_get_wake_alarm), MP_ROM_PTR(&alarm_get_wake_alarm_obj) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(alarm_module_globals, alarm_module_globals_table);
-
-const mp_obj_module_t alarm_module = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&alarm_module_globals,
-};
diff --git a/shared-bindings/alarm/__init__.h b/shared-bindings/alarm/__init__.h
deleted file mode 100644
index db3966ac5d..0000000000
--- a/shared-bindings/alarm/__init__.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_ALARM___INIT___H
-#define MICROPY_INCLUDED_SHARED_BINDINGS_ALARM___INIT___H
-
-#include "py/obj.h"
-
-extern void common_hal_alarm_disable_all(void);
-extern mp_obj_t common_hal_alarm_get_wake_alarm(void);
-
-#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_ALARM___INIT___H
diff --git a/shared-bindings/sleepio/__init__.c b/shared-bindings/sleepio/__init__.c
new file mode 100644
index 0000000000..2f7a8c6c7b
--- /dev/null
+++ b/shared-bindings/sleepio/__init__.c
@@ -0,0 +1,101 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "shared-bindings/alarm/__init__.h"
+
+//| """Light and deep sleep used to save power
+//|
+//| The `sleepio` module provides sleep related functionality. There are two supported levels of
+//| sleep, light and deep.
+//|
+//| Light sleep leaves the CPU and RAM powered so that CircuitPython can resume where it left off
+//| after being woken up. Light sleep is automatically done by CircuitPython when `time.sleep()` is
+//| called. To light sleep until a non-time alarm use `sleepio.sleep_until_alarm()`.
+//|
+//| Deep sleep shuts down power to nearly all of the chip including the CPU and RAM. This can save
+//| a more significant amount of power at the cost of starting CircuitPython from scratch when woken
+//| up. CircuitPython will enter deep sleep automatically when code exits without error. If an
+//| error causes CircuitPython to exit, error LED error flashes will be done periodically. To set
+//| alarms for deep sleep use `sleepio.set_alarms` they will apply to next deep sleep only."""
+
+
+//| wake_alarm: Alarm
+//| """The most recent alarm to wake us up from a sleep (light or deep.)"""
+//|
+
+//| def sleep_until_alarm(alarm: Alarm, ...) -> Alarm:
+//|     """Performs a light sleep until woken by one of the alarms. The alarm that woke us up is
+//|        returned."""
+//|     ...
+//|
+
+STATIC mp_obj_t sleepio_sleep_until_alarm(size_t n_args, const mp_obj_t *args) {
+    // mp_int_t size = MP_OBJ_SMALL_INT_VALUE(struct_calcsize(args[0]));
+    // vstr_t vstr;
+    // vstr_init_len(&vstr, size);
+    // byte *p = (byte*)vstr.buf;
+    // memset(p, 0, size);
+    // byte *end_p = &p[size];
+    // shared_modules_struct_pack_into(args[0], p, end_p, n_args - 1, &args[1]);
+    // return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(sleepio_sleep_until_alarm_obj, 1, MP_OBJ_FUN_ARGS_MAX, sleepio_sleep_until_alarm);
+
+//| def set_alarms(alarm: Alarm, ...) -> None:
+//|     """Set one or more alarms to wake up from a deep sleep. The last alarm to wake us up is
+//|        available as `wake_alarm`."""
+//|     ...
+//|
+STATIC mp_obj_t sleepio_set_alarms(size_t n_args, const mp_obj_t *args) {
+    // mp_int_t size = MP_OBJ_SMALL_INT_VALUE(struct_calcsize(args[0]));
+    // vstr_t vstr;
+    // vstr_init_len(&vstr, size);
+    // byte *p = (byte*)vstr.buf;
+    // memset(p, 0, size);
+    // byte *end_p = &p[size];
+    // shared_modules_struct_pack_into(args[0], p, end_p, n_args - 1, &args[1]);
+    // return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(sleepio_set_alarms_obj, 1, MP_OBJ_FUN_ARGS_MAX, sleepio_set_alarms);
+
+
+mp_map_elem_t sleepio_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_sleepio) },
+
+    { MP_ROM_QSTR(MP_QSTR_wake_alarm), mp_const_none },
+    { MP_ROM_QSTR(MP_QSTR_sleep_until_alarm), mp_const_none },
+    { MP_ROM_QSTR(MP_QSTR_set_alarms), mp_const_none },
+};
+STATIC MP_DEFINE_CONST_DICT(sleepio_module_globals, sleepio_module_globals_table);
+
+void common_hal_sleepio_set_wake_alarm(mp_obj_t alarm) {
+    // sleepio_module_globals_table[1].value = alarm;
+}
+
+const mp_obj_module_t sleepio_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t*)&sleepio_module_globals,
+};
diff --git a/shared-bindings/sleepio/__init__.h b/shared-bindings/sleepio/__init__.h
new file mode 100644
index 0000000000..ccd3bf4a02
--- /dev/null
+++ b/shared-bindings/sleepio/__init__.h
@@ -0,0 +1,10 @@
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_SLEEPIO___INIT___H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_SLEEPIO___INIT___H
+
+#include "py/obj.h"
+
+// This is implemented by shared-bindings so that implementations can set the
+// newest alarm source.
+extern void common_hal_sleepio_set_wake_alarm(mp_obj_t alarm);
+
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_SLEEPIO___INIT___H

From 85dadf3a561c21e284d5daf42b1b3e367ce7ebc6 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Thu, 15 Oct 2020 16:59:29 -0700
Subject: [PATCH 15/16] More API changes

---
 shared-bindings/_typing/__init__.pyi   | 12 ++++
 shared-bindings/alarm_time/Time.c      | 76 ++++++++++++++++++++++++++
 shared-bindings/alarm_time/Time.h      | 42 ++++++++++++++
 shared-bindings/alarm_time/__init__.c  | 26 +++++++++
 shared-bindings/canio/BusState.c       | 70 ++++++++++++++++++++++++
 shared-bindings/canio/BusState.h       | 33 +++++++++++
 shared-bindings/canio/__init__.c       | 60 ++++----------------
 shared-bindings/canio/__init__.h       |  6 --
 shared-bindings/sleepio/__init__.c     | 10 ++--
 shared-bindings/supervisor/RunReason.c | 62 +++++++++++++++++++++
 shared-bindings/supervisor/RunReason.h | 36 ++++++++++++
 shared-bindings/supervisor/Runtime.c   | 22 ++++++++
 12 files changed, 395 insertions(+), 60 deletions(-)
 create mode 100644 shared-bindings/alarm_time/Time.c
 create mode 100644 shared-bindings/alarm_time/Time.h
 create mode 100644 shared-bindings/canio/BusState.c
 create mode 100644 shared-bindings/canio/BusState.h
 create mode 100644 shared-bindings/supervisor/RunReason.c
 create mode 100644 shared-bindings/supervisor/RunReason.h

diff --git a/shared-bindings/_typing/__init__.pyi b/shared-bindings/_typing/__init__.pyi
index 48e68a8d57..3b3f18cb9b 100644
--- a/shared-bindings/_typing/__init__.pyi
+++ b/shared-bindings/_typing/__init__.pyi
@@ -52,3 +52,15 @@ FrameBuffer = Union[rgbmatrix.RGBMatrix]
 
   - `rgbmatrix.RGBMatrix`
 """
+
+Alarm = Union[
+    alarm_time.Time, alarm_pin.PinLevel, alarm_touch.PinTouch
+]
+"""Classes that implement the audiosample protocol
+
+  - `alarm_time.Time`
+  - `alarm_pin.PinLevel`
+  - `alarm_touch.PinTouch`
+
+  You can play use these alarms to wake from light or deep sleep.
+"""
diff --git a/shared-bindings/alarm_time/Time.c b/shared-bindings/alarm_time/Time.c
new file mode 100644
index 0000000000..904bf522e2
--- /dev/null
+++ b/shared-bindings/alarm_time/Time.c
@@ -0,0 +1,76 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/obj.h"
+#include "shared-bindings/alarm_time/__init__.h"
+
+//| """alarm_time module
+//|
+//| The `alarm_time` module implements deep sleep."""
+
+STATIC mp_obj_t alarm_time_duration(mp_obj_t seconds_o) {
+    #if MICROPY_PY_BUILTINS_FLOAT
+    mp_float_t seconds = mp_obj_get_float(seconds_o);
+    mp_float_t msecs = 1000.0f * seconds + 0.5f;
+    #else
+    mp_int_t seconds = mp_obj_get_int(seconds_o);
+    mp_int_t msecs = 1000 * seconds;
+    #endif
+
+    if (seconds < 0) {
+        mp_raise_ValueError(translate("sleep length must be non-negative"));
+    }
+    common_hal_alarm_time_duration(msecs);
+
+    alarm_time_obj_t *self = m_new_obj(alarm_time_obj_t);
+    self->base.type = &alarm_time_type;
+
+    return self;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(alarm_time_duration_obj, alarm_time_duration);
+
+STATIC mp_obj_t alarm_time_disable(void) {
+    common_hal_alarm_time_disable();
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(alarm_time_disable_obj, alarm_time_disable);
+
+STATIC const mp_rom_map_elem_t alarm_time_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_alarm_time) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_Duration), MP_ROM_PTR(&alarm_time_duration_obj) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_Disable), MP_ROM_PTR(&alarm_time_disable_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(alarm_time_module_globals, alarm_time_module_globals_table);
+
+const mp_obj_module_t alarm_time_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t*)&alarm_time_module_globals,
+};
+
+const mp_obj_type_t alarm_time_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_timeAlarm,
+};
diff --git a/shared-bindings/alarm_time/Time.h b/shared-bindings/alarm_time/Time.h
new file mode 100644
index 0000000000..9962c26f25
--- /dev/null
+++ b/shared-bindings/alarm_time/Time.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_ALARM_TIME_TIME_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_ALARM_TIME_TIME_H
+
+#include "py/runtime.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    uint64_t time_to_alarm;
+} alarm_time_time_obj_t;
+
+extern const mp_obj_type_t alarm_time_time_type;
+
+void common_hal_alarm_time_time_construct(alarm_time_time_obj_t* self,
+                                          uint64_t ticks_ms);
+
+#endif //MICROPY_INCLUDED_SHARED_BINDINGS_ALARM_TIME_TIME_H
diff --git a/shared-bindings/alarm_time/__init__.c b/shared-bindings/alarm_time/__init__.c
index 1707f7488f..904bf522e2 100644
--- a/shared-bindings/alarm_time/__init__.c
+++ b/shared-bindings/alarm_time/__init__.c
@@ -1,3 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 #include "py/obj.h"
 #include "shared-bindings/alarm_time/__init__.h"
 
diff --git a/shared-bindings/canio/BusState.c b/shared-bindings/canio/BusState.c
new file mode 100644
index 0000000000..e0501b8d83
--- /dev/null
+++ b/shared-bindings/canio/BusState.c
@@ -0,0 +1,70 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/enum.h"
+
+#include "shared-bindings/canio/BusState.h"
+
+MAKE_ENUM_VALUE(canio_bus_state_type, bus_state, ERROR_ACTIVE, BUS_STATE_ERROR_ACTIVE);
+MAKE_ENUM_VALUE(canio_bus_state_type, bus_state, ERROR_PASSIVE, BUS_STATE_ERROR_PASSIVE);
+MAKE_ENUM_VALUE(canio_bus_state_type, bus_state, ERROR_WARNING, BUS_STATE_ERROR_WARNING);
+MAKE_ENUM_VALUE(canio_bus_state_type, bus_state, BUS_OFF, BUS_STATE_OFF);
+
+//| class BusState:
+//|     """The state of the CAN bus"""
+//|
+//|     ERROR_ACTIVE: object
+//|     """The bus is in the normal (active) state"""
+//|
+//|     ERROR_WARNING: object
+//|     """The bus is in the normal (active) state, but a moderate number of errors have occurred recently.
+//|
+//|     NOTE: Not all implementations may use ERROR_WARNING.  Do not rely on seeing ERROR_WARNING before ERROR_PASSIVE."""
+//|
+//|     ERROR_PASSIVE: object
+//|     """The bus is in the passive state due to the number of errors that have occurred recently.
+//|
+//|     This device will acknowledge packets it receives, but cannot transmit messages.
+//|     If additional errors occur, this device may progress to BUS_OFF.
+//|     If it successfully acknowledges other packets on the bus, it can return to ERROR_WARNING or ERROR_ACTIVE and transmit packets.
+//|     """
+//|
+//|     BUS_OFF: object
+//|     """The bus has turned off due to the number of errors that have
+//|     occurred recently.  It must be restarted before it will send or receive
+//|     packets.  This device will neither send or acknowledge packets on the bus."""
+//|
+MAKE_ENUM_MAP(canio_bus_state) {
+    MAKE_ENUM_MAP_ENTRY(bus_state, ERROR_ACTIVE),
+    MAKE_ENUM_MAP_ENTRY(bus_state, ERROR_PASSIVE),
+    MAKE_ENUM_MAP_ENTRY(bus_state, ERROR_WARNING),
+    MAKE_ENUM_MAP_ENTRY(bus_state, BUS_OFF),
+};
+STATIC MP_DEFINE_CONST_DICT(canio_bus_state_locals_dict, canio_bus_state_locals_table);
+
+MAKE_PRINTER(canio, canio_bus_state);
+
+MAKE_ENUM_TYPE(canio, BusState, canio_bus_state);
diff --git a/shared-bindings/canio/BusState.h b/shared-bindings/canio/BusState.h
new file mode 100644
index 0000000000..e24eba92c1
--- /dev/null
+++ b/shared-bindings/canio/BusState.h
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jeff Epler for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+typedef enum {
+    BUS_STATE_ERROR_ACTIVE, BUS_STATE_ERROR_PASSIVE, BUS_STATE_ERROR_WARNING, BUS_STATE_OFF
+} canio_bus_state_t;
+
+extern const mp_obj_type_t canio_bus_state_type;
diff --git a/shared-bindings/canio/__init__.c b/shared-bindings/canio/__init__.c
index f29d3ab8ac..451a68c9eb 100644
--- a/shared-bindings/canio/__init__.c
+++ b/shared-bindings/canio/__init__.c
@@ -24,6 +24,16 @@
  * THE SOFTWARE.
  */
 
+#include "py/obj.h"
+
+#include "shared-bindings/canio/__init__.h"
+
+#include "shared-bindings/canio/BusState.h"
+#include "shared-bindings/canio/CAN.h"
+#include "shared-bindings/canio/Match.h"
+#include "shared-bindings/canio/Message.h"
+#include "shared-bindings/canio/Listener.h"
+
 //| """CAN bus access
 //|
 //| The `canio` module contains low level classes to support the CAN bus
@@ -57,56 +67,6 @@
 //| """
 //|
 
-#include "py/obj.h"
-#include "py/enum.h"
-
-#include "shared-bindings/canio/__init__.h"
-#include "shared-bindings/canio/CAN.h"
-#include "shared-bindings/canio/Match.h"
-#include "shared-bindings/canio/Message.h"
-#include "shared-bindings/canio/Listener.h"
-
-MAKE_ENUM_VALUE(canio_bus_state_type, bus_state, ERROR_ACTIVE, BUS_STATE_ERROR_ACTIVE);
-MAKE_ENUM_VALUE(canio_bus_state_type, bus_state, ERROR_PASSIVE, BUS_STATE_ERROR_PASSIVE);
-MAKE_ENUM_VALUE(canio_bus_state_type, bus_state, ERROR_WARNING, BUS_STATE_ERROR_WARNING);
-MAKE_ENUM_VALUE(canio_bus_state_type, bus_state, BUS_OFF, BUS_STATE_OFF);
-
-//| class BusState:
-//|     """The state of the CAN bus"""
-//|
-//|     ERROR_ACTIVE: object
-//|     """The bus is in the normal (active) state"""
-//|
-//|     ERROR_WARNING: object
-//|     """The bus is in the normal (active) state, but a moderate number of errors have occurred recently.
-//|
-//|     NOTE: Not all implementations may use ERROR_WARNING.  Do not rely on seeing ERROR_WARNING before ERROR_PASSIVE."""
-//|
-//|     ERROR_PASSIVE: object
-//|     """The bus is in the passive state due to the number of errors that have occurred recently.
-//|
-//|     This device will acknowledge packets it receives, but cannot transmit messages.
-//|     If additional errors occur, this device may progress to BUS_OFF.
-//|     If it successfully acknowledges other packets on the bus, it can return to ERROR_WARNING or ERROR_ACTIVE and transmit packets.
-//|     """
-//|
-//|     BUS_OFF: object
-//|     """The bus has turned off due to the number of errors that have
-//|     occurred recently.  It must be restarted before it will send or receive
-//|     packets.  This device will neither send or acknowledge packets on the bus."""
-//|
-MAKE_ENUM_MAP(canio_bus_state) {
-    MAKE_ENUM_MAP_ENTRY(bus_state, ERROR_ACTIVE),
-    MAKE_ENUM_MAP_ENTRY(bus_state, ERROR_PASSIVE),
-    MAKE_ENUM_MAP_ENTRY(bus_state, ERROR_WARNING),
-    MAKE_ENUM_MAP_ENTRY(bus_state, BUS_OFF),
-};
-STATIC MP_DEFINE_CONST_DICT(canio_bus_state_locals_dict, canio_bus_state_locals_table);
-
-MAKE_PRINTER(canio, canio_bus_state);
-
-MAKE_ENUM_TYPE(canio, BusState, canio_bus_state);
-
 STATIC const mp_rom_map_elem_t canio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_BusState), MP_ROM_PTR(&canio_bus_state_type) },
     { MP_ROM_QSTR(MP_QSTR_CAN), MP_ROM_PTR(&canio_can_type) },
diff --git a/shared-bindings/canio/__init__.h b/shared-bindings/canio/__init__.h
index e24eba92c1..20b6638cd8 100644
--- a/shared-bindings/canio/__init__.h
+++ b/shared-bindings/canio/__init__.h
@@ -25,9 +25,3 @@
  */
 
 #pragma once
-
-typedef enum {
-    BUS_STATE_ERROR_ACTIVE, BUS_STATE_ERROR_PASSIVE, BUS_STATE_ERROR_WARNING, BUS_STATE_OFF
-} canio_bus_state_t;
-
-extern const mp_obj_type_t canio_bus_state_type;
diff --git a/shared-bindings/sleepio/__init__.c b/shared-bindings/sleepio/__init__.c
index 2f7a8c6c7b..2d5db18f0a 100644
--- a/shared-bindings/sleepio/__init__.c
+++ b/shared-bindings/sleepio/__init__.c
@@ -33,14 +33,15 @@
 //|
 //| Light sleep leaves the CPU and RAM powered so that CircuitPython can resume where it left off
 //| after being woken up. Light sleep is automatically done by CircuitPython when `time.sleep()` is
-//| called. To light sleep until a non-time alarm use `sleepio.sleep_until_alarm()`.
+//| called. To light sleep until a non-time alarm use `sleepio.sleep_until_alarm()`. Any active
+//| peripherals, such as I2C, are left on.
 //|
 //| Deep sleep shuts down power to nearly all of the chip including the CPU and RAM. This can save
 //| a more significant amount of power at the cost of starting CircuitPython from scratch when woken
 //| up. CircuitPython will enter deep sleep automatically when code exits without error. If an
 //| error causes CircuitPython to exit, error LED error flashes will be done periodically. To set
 //| alarms for deep sleep use `sleepio.set_alarms` they will apply to next deep sleep only."""
-
+//|
 
 //| wake_alarm: Alarm
 //| """The most recent alarm to wake us up from a sleep (light or deep.)"""
@@ -86,8 +87,9 @@ mp_map_elem_t sleepio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_sleepio) },
 
     { MP_ROM_QSTR(MP_QSTR_wake_alarm), mp_const_none },
-    { MP_ROM_QSTR(MP_QSTR_sleep_until_alarm), mp_const_none },
-    { MP_ROM_QSTR(MP_QSTR_set_alarms), mp_const_none },
+
+    { MP_ROM_QSTR(MP_QSTR_sleep_until_alarm), sleepio_sleep_until_alarm_obj },
+    { MP_ROM_QSTR(MP_QSTR_set_alarms), sleepio_set_alarms_obj },
 };
 STATIC MP_DEFINE_CONST_DICT(sleepio_module_globals, sleepio_module_globals_table);
 
diff --git a/shared-bindings/supervisor/RunReason.c b/shared-bindings/supervisor/RunReason.c
new file mode 100644
index 0000000000..5233cf959b
--- /dev/null
+++ b/shared-bindings/supervisor/RunReason.c
@@ -0,0 +1,62 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/enum.h"
+
+#include "shared-bindings/supervisor/RunReason.h"
+
+MAKE_ENUM_VALUE(canio_bus_state_type, run_reason, ERROR_ACTIVE, RUN_REASON_STARTUP);
+MAKE_ENUM_VALUE(canio_bus_state_type, bus_state, ERROR_PASSIVE, RUN_REASON_AUTORELOAD);
+MAKE_ENUM_VALUE(canio_bus_state_type, bus_state, ERROR_WARNING, RUN_REASON_SUPERVISOR_RELOAD);
+MAKE_ENUM_VALUE(canio_bus_state_type, bus_state, BUS_OFF, RUN_REASON_RELOAD_HOTKEY);
+
+//| class RunReason:
+//|     """The state of the CAN bus"""
+//|
+//|     STARTUP: object
+//|     """The first VM was run after the microcontroller started up. See `microcontroller.start_reason`
+//|        for more detail why the microcontroller was started."""
+//|
+//|     AUTORELOAD: object
+//|     """The VM was run due to a USB write to the filesystem."""
+//|
+//|     SUPERVISOR_RELOAD: object
+//|     """The VM was run due to a call to `supervisor.reload()`."""
+//|
+//|     RELOAD_HOTKEY: object
+//|     """The VM was run due CTRL-D."""
+//|
+MAKE_ENUM_MAP(canio_bus_state) {
+    MAKE_ENUM_MAP_ENTRY(bus_state, ERROR_ACTIVE),
+    MAKE_ENUM_MAP_ENTRY(bus_state, ERROR_PASSIVE),
+    MAKE_ENUM_MAP_ENTRY(bus_state, ERROR_WARNING),
+    MAKE_ENUM_MAP_ENTRY(bus_state, BUS_OFF),
+};
+STATIC MP_DEFINE_CONST_DICT(canio_bus_state_locals_dict, canio_bus_state_locals_table);
+
+MAKE_PRINTER(canio, canio_bus_state);
+
+MAKE_ENUM_TYPE(canio, BusState, canio_bus_state);
diff --git a/shared-bindings/supervisor/RunReason.h b/shared-bindings/supervisor/RunReason.h
new file mode 100644
index 0000000000..f9aaacae63
--- /dev/null
+++ b/shared-bindings/supervisor/RunReason.h
@@ -0,0 +1,36 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+typedef enum {
+    RUN_REASON_STARTUP,
+    RUN_REASON_AUTORELOAD,
+    RUN_REASON_SUPERVISOR_RELOAD,
+    RUN_REASON_RELOAD_HOTKEY
+} supervisor_run_reason_t;
+
+extern const mp_obj_type_t canio_bus_state_type;
diff --git a/shared-bindings/supervisor/Runtime.c b/shared-bindings/supervisor/Runtime.c
index bfca6e7b1d..f9db38c9b5 100755
--- a/shared-bindings/supervisor/Runtime.c
+++ b/shared-bindings/supervisor/Runtime.c
@@ -90,9 +90,31 @@ const mp_obj_property_t supervisor_serial_bytes_available_obj = {
 };
 
 
+//|     run_reason: RunReason
+//|     """Returns why the Python VM was run this time."""
+//|
+STATIC mp_obj_t supervisor_get_run_reason(mp_obj_t self) {
+    if (!common_hal_get_serial_bytes_available()) {
+        return mp_const_false;
+    }
+    else {
+        return mp_const_true;
+    }
+}
+MP_DEFINE_CONST_FUN_OBJ_1(supervisor_get_run_reason_obj, supervisor_get_run_reason);
+
+const mp_obj_property_t supervisor_run_reason_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&supervisor_get_run_reason_obj,
+              (mp_obj_t)&mp_const_none_obj,
+              (mp_obj_t)&mp_const_none_obj},
+};
+
+
 STATIC const mp_rom_map_elem_t supervisor_runtime_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_serial_connected), MP_ROM_PTR(&supervisor_serial_connected_obj) },
     { MP_ROM_QSTR(MP_QSTR_serial_bytes_available), MP_ROM_PTR(&supervisor_serial_bytes_available_obj) },
+    { MP_ROM_QSTR(MP_QSTR_run_reason), MP_ROM_PTR(&supervisor_run_reason_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(supervisor_runtime_locals_dict, supervisor_runtime_locals_dict_table);

From 9a4efed8cbaca3aa48c6cc0ce0a4e267eef7a8e1 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Tue, 27 Oct 2020 17:55:03 -0700
Subject: [PATCH 16/16] Start tweaking the workflow to sleep

---
 main.c                                        | 49 ++++++++++-----
 .../esp32s2/common-hal/alarm_touch/__init__.c |  7 ---
 shared-bindings/alarm_touch/__init__.c        | 28 ---------
 shared-bindings/alarm_touch/__init__.h        | 14 -----
 shared-bindings/sleepio/ResetReason.c         | 61 +++++++++++++++++++
 shared-bindings/sleepio/ResetReason.h         | 36 +++++++++++
 shared-bindings/sleepio/__init__.c            | 27 ++++----
 shared-bindings/sleepio/__init__.h            |  5 +-
 supervisor/serial.h                           |  1 -
 supervisor/shared/rgb_led_status.c            | 10 ++-
 supervisor/shared/safe_mode.c                 |  4 ++
 supervisor/shared/serial.h                    | 29 +++++++++
 supervisor/shared/usb/usb.c                   |  9 ++-
 supervisor/shared/workflow.c                  | 32 ++++++++++
 supervisor/shared/workflow.h                  | 29 +++++++++
 supervisor/supervisor.mk                      |  1 +
 supervisor/workflow.h                         | 30 +++++++++
 17 files changed, 282 insertions(+), 90 deletions(-)
 delete mode 100644 ports/esp32s2/common-hal/alarm_touch/__init__.c
 delete mode 100644 shared-bindings/alarm_touch/__init__.c
 delete mode 100644 shared-bindings/alarm_touch/__init__.h
 create mode 100644 shared-bindings/sleepio/ResetReason.c
 create mode 100644 shared-bindings/sleepio/ResetReason.h
 create mode 100644 supervisor/shared/serial.h
 create mode 100644 supervisor/shared/workflow.c
 create mode 100644 supervisor/shared/workflow.h
 create mode 100755 supervisor/workflow.h

diff --git a/main.c b/main.c
index 328c3bbcba..1854a14071 100755
--- a/main.c
+++ b/main.c
@@ -88,6 +88,10 @@
 #include "common-hal/canio/CAN.h"
 #endif
 
+#if CIRCUITPY_SLEEPIO
+#include "shared-bindings/sleepio/__init__.h"
+#endif
+
 void do_str(const char *src, mp_parse_input_kind_t input_kind) {
     mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0);
     if (lex == NULL) {
@@ -303,19 +307,6 @@ bool run_code_py(safe_mode_t safe_mode) {
         }
     }
 
-    for (uint8_t i = 0; i<=100; i++) {
-        if (!usb_msc_ejected()) {
-            //Go into light sleep
-            break;
-        }
-        mp_hal_delay_ms(10);
-    }
-
-    if (usb_msc_ejected()) {
-        //Go into deep sleep
-        common_hal_mcu_deep_sleep();
-    }
-
     // Display a different completion message if the user has no USB attached (cannot save files)
     if (!serial_connected_at_start) {
         serial_write_compressed(translate("\nCode done running. Waiting for reload.\n"));
@@ -326,6 +317,14 @@ bool run_code_py(safe_mode_t safe_mode) {
     bool refreshed_epaper_display = false;
     #endif
     rgb_status_animation_t animation;
+    bool ok = result->return_code != PYEXEC_EXCEPTION;
+    #if CIRCUITPY_SLEEPIO
+    // If USB isn't enumerated then deep sleep.
+    if (ok && !supervisor_workflow_active() && supervisor_ticks_ms64() > CIRCUITPY_USB_ENUMERATION_DELAY * 1024) {
+        common_hal_sleepio_deep_sleep();
+    }
+    #endif
+    // Show the animation every N seconds.
     prep_rgb_status_animation(&result, found_main, safe_mode, &animation);
     while (true) {
         RUN_BACKGROUND_TASKS;
@@ -358,8 +357,24 @@ bool run_code_py(safe_mode_t safe_mode) {
             refreshed_epaper_display = maybe_refresh_epaperdisplay();
         }
         #endif
-
-        tick_rgb_status_animation(&animation);
+        bool animation_done = tick_rgb_status_animation(&animation);
+        if (animation_done && supervisor_workflow_active()) {
+            #if CIRCUITPY_SLEEPIO
+            int64_t remaining_enumeration_wait = CIRCUITPY_USB_ENUMERATION_DELAY * 1024 - supervisor_ticks_ms64();
+            // If USB isn't enumerated then deep sleep after our waiting period.
+            if (ok && remaining_enumeration_wait < 0) {
+                common_hal_sleepio_deep_sleep();
+                return; // Doesn't actually get here.
+            }
+            #endif
+            // Wake up every so often to flash the error code.
+            if (!ok) {
+                port_interrupt_after_ticks(CIRCUITPY_FLASH_ERROR_PERIOD * 1024);
+            } else {
+                port_interrupt_after_ticks(remaining_enumeration_wait);
+            }
+            port_sleep_until_interrupt();
+        }
     }
 }
 
@@ -406,7 +421,9 @@ void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
         if (!skip_boot_output) {
             // Wait 1.5 seconds before opening CIRCUITPY_BOOT_OUTPUT_FILE for write,
             // in case power is momentary or will fail shortly due to, say a low, battery.
-            mp_hal_delay_ms(1500);
+            if (common_hal_sleepio_get_reset_reason() == RESET_REASON_POWER_VALID) {
+                mp_hal_delay_ms(1500);
+            }
 
             // USB isn't up, so we can write the file.
             filesystem_set_internal_writable_by_usb(false);
diff --git a/ports/esp32s2/common-hal/alarm_touch/__init__.c b/ports/esp32s2/common-hal/alarm_touch/__init__.c
deleted file mode 100644
index df32b26930..0000000000
--- a/ports/esp32s2/common-hal/alarm_touch/__init__.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "esp_sleep.h"
-
-#include "shared-bindings/alarm_touch/__init__.h"
-
-void common_hal_alarm_touch_disable (void) {
-    esp_sleep_disable_wakeup_source(ESP_SLEEP_WAKEUP_TOUCHPAD);
-}
diff --git a/shared-bindings/alarm_touch/__init__.c b/shared-bindings/alarm_touch/__init__.c
deleted file mode 100644
index 5f5a156d80..0000000000
--- a/shared-bindings/alarm_touch/__init__.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "py/obj.h"
-#include "shared-bindings/alarm_touch/__init__.h"
-
-//| """alarm_touch module
-//|
-//| The `alarm_touch` module implements deep sleep."""
-
-STATIC mp_obj_t alarm_touch_disable(void) {
-    common_hal_alarm_touch_disable();
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(alarm_touch_disable_obj, alarm_touch_disable);
-
-STATIC const mp_rom_map_elem_t alarm_touch_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_alarm_touch) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_Disable), MP_ROM_PTR(&alarm_touch_disable_obj) },
-};
-STATIC MP_DEFINE_CONST_DICT(alarm_touch_module_globals, alarm_touch_module_globals_table);
-
-const mp_obj_module_t alarm_touch_module = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&alarm_touch_module_globals,
-};
-
-const mp_obj_type_t alarm_touch_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_touchAlarm,
-};
diff --git a/shared-bindings/alarm_touch/__init__.h b/shared-bindings/alarm_touch/__init__.h
deleted file mode 100644
index 600587d247..0000000000
--- a/shared-bindings/alarm_touch/__init__.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_ALARM_TOUCH___INIT___H
-#define MICROPY_INCLUDED_SHARED_BINDINGS_ALARM_TOUCH___INIT___H
-
-#include "py/runtime.h"
-
-typedef struct {
-    mp_obj_base_t base;
-} alarm_touch_obj_t;
-
-extern const mp_obj_type_t alarm_touch_type;
-
-extern void common_hal_alarm_touch_disable (void);
-
-#endif //MICROPY_INCLUDED_SHARED_BINDINGS_ALARM_TOUCH___INIT___H
diff --git a/shared-bindings/sleepio/ResetReason.c b/shared-bindings/sleepio/ResetReason.c
new file mode 100644
index 0000000000..095f4bed0d
--- /dev/null
+++ b/shared-bindings/sleepio/ResetReason.c
@@ -0,0 +1,61 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/enum.h"
+
+#include "shared-bindings/sleepio/ResetReason.h"
+
+MAKE_ENUM_VALUE(sleepio_reset_reason_type, reset_reason, POWER_VALID, RESET_REASON_POWER_VALID);
+MAKE_ENUM_VALUE(sleepio_reset_reason_type, reset_reason, SOFTWARE, RESET_REASON_SOFTWARE);
+MAKE_ENUM_VALUE(sleepio_reset_reason_type, reset_reason, DEEP_SLEEP_ALARM, RESET_REASON_DEEP_SLEEP_ALARM);
+MAKE_ENUM_VALUE(sleepio_reset_reason_type, reset_reason, EXTERNAL, RESET_REASON_EXTERNAL);
+
+//| class ResetReason:
+//|     """The reason the chip was last reset"""
+//|
+//|     POWER_VALID: object
+//|     """The chip was reset and started once power levels were valid."""
+//|
+//|     SOFTWARE: object
+//|     """The chip was reset from software."""
+//|
+//|     DEEP_SLEEP_ALARM: object
+//|     """The chip was reset for deep sleep and started by an alarm."""
+//|
+//|     EXTERNAL: object
+//|     """The chip was reset by an external input such as a button."""
+//|
+MAKE_ENUM_MAP(sleepio_reset_reason) {
+    MAKE_ENUM_MAP_ENTRY(reset_reason, POWER_VALID),
+    MAKE_ENUM_MAP_ENTRY(reset_reason, SOFTWARE),
+    MAKE_ENUM_MAP_ENTRY(reset_reason, DEEP_SLEEP_ALARM),
+    MAKE_ENUM_MAP_ENTRY(reset_reason, EXTERNAL),
+};
+STATIC MP_DEFINE_CONST_DICT(sleepio_reset_reason_locals_dict, sleepio_reset_reason_locals_table);
+
+MAKE_PRINTER(sleepio, sleepio_reset_reason);
+
+MAKE_ENUM_TYPE(sleepio, ResetReason, sleepio_reset_reason);
diff --git a/shared-bindings/sleepio/ResetReason.h b/shared-bindings/sleepio/ResetReason.h
new file mode 100644
index 0000000000..50b8d002aa
--- /dev/null
+++ b/shared-bindings/sleepio/ResetReason.h
@@ -0,0 +1,36 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+typedef enum {
+    RESET_REASON_POWER_APPLIED,
+    RESET_REASON_SOFTWARE,
+    RESET_REASON_DEEP_SLEEP_ALARM,
+    RESET_REASON_BUTTON,
+} sleepio_reset_reason_t;
+
+extern const mp_obj_type_t sleepio_reset_reason_type;
diff --git a/shared-bindings/sleepio/__init__.c b/shared-bindings/sleepio/__init__.c
index 2d5db18f0a..9793c1b502 100644
--- a/shared-bindings/sleepio/__init__.c
+++ b/shared-bindings/sleepio/__init__.c
@@ -47,6 +47,10 @@
 //| """The most recent alarm to wake us up from a sleep (light or deep.)"""
 //|
 
+//| reset_reason: ResetReason
+//| """The reason the chip started up from reset state. This can may be power up or due to an alarm."""
+//|
+
 //| def sleep_until_alarm(alarm: Alarm, ...) -> Alarm:
 //|     """Performs a light sleep until woken by one of the alarms. The alarm that woke us up is
 //|        returned."""
@@ -54,14 +58,6 @@
 //|
 
 STATIC mp_obj_t sleepio_sleep_until_alarm(size_t n_args, const mp_obj_t *args) {
-    // mp_int_t size = MP_OBJ_SMALL_INT_VALUE(struct_calcsize(args[0]));
-    // vstr_t vstr;
-    // vstr_init_len(&vstr, size);
-    // byte *p = (byte*)vstr.buf;
-    // memset(p, 0, size);
-    // byte *end_p = &p[size];
-    // shared_modules_struct_pack_into(args[0], p, end_p, n_args - 1, &args[1]);
-    // return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(sleepio_sleep_until_alarm_obj, 1, MP_OBJ_FUN_ARGS_MAX, sleepio_sleep_until_alarm);
 
@@ -71,14 +67,6 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(sleepio_sleep_until_alarm_obj, 1, MP_OBJ_FUN
 //|     ...
 //|
 STATIC mp_obj_t sleepio_set_alarms(size_t n_args, const mp_obj_t *args) {
-    // mp_int_t size = MP_OBJ_SMALL_INT_VALUE(struct_calcsize(args[0]));
-    // vstr_t vstr;
-    // vstr_init_len(&vstr, size);
-    // byte *p = (byte*)vstr.buf;
-    // memset(p, 0, size);
-    // byte *end_p = &p[size];
-    // shared_modules_struct_pack_into(args[0], p, end_p, n_args - 1, &args[1]);
-    // return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(sleepio_set_alarms_obj, 1, MP_OBJ_FUN_ARGS_MAX, sleepio_set_alarms);
 
@@ -87,16 +75,23 @@ mp_map_elem_t sleepio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_sleepio) },
 
     { MP_ROM_QSTR(MP_QSTR_wake_alarm), mp_const_none },
+    { MP_ROM_QSTR(MP_QSTR_reset_reason), mp_const_none },
 
     { MP_ROM_QSTR(MP_QSTR_sleep_until_alarm), sleepio_sleep_until_alarm_obj },
     { MP_ROM_QSTR(MP_QSTR_set_alarms), sleepio_set_alarms_obj },
 };
 STATIC MP_DEFINE_CONST_DICT(sleepio_module_globals, sleepio_module_globals_table);
 
+// These are called from common hal code to set the current wake alarm.
 void common_hal_sleepio_set_wake_alarm(mp_obj_t alarm) {
     // sleepio_module_globals_table[1].value = alarm;
 }
 
+// These are called from common hal code to set the current wake alarm.
+void common_hal_sleepio_set_reset_reason(mp_obj_t reset_reason) {
+    // sleepio_module_globals_table[1].value = alarm;
+}
+
 const mp_obj_module_t sleepio_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&sleepio_module_globals,
diff --git a/shared-bindings/sleepio/__init__.h b/shared-bindings/sleepio/__init__.h
index ccd3bf4a02..6ea538055a 100644
--- a/shared-bindings/sleepio/__init__.h
+++ b/shared-bindings/sleepio/__init__.h
@@ -3,8 +3,7 @@
 
 #include "py/obj.h"
 
-// This is implemented by shared-bindings so that implementations can set the
-// newest alarm source.
-extern void common_hal_sleepio_set_wake_alarm(mp_obj_t alarm);
+extern mp_obj_t common_hal_sleepio_get_wake_alarm(void);
+extern sleepio_reset_reason_t common_hal_sleepio_get_reset_reason(void);
 
 #endif  // MICROPY_INCLUDED_SHARED_BINDINGS_SLEEPIO___INIT___H
diff --git a/supervisor/serial.h b/supervisor/serial.h
index 9c2d44737a..066886303e 100644
--- a/supervisor/serial.h
+++ b/supervisor/serial.h
@@ -47,5 +47,4 @@ char serial_read(void);
 bool serial_bytes_available(void);
 bool serial_connected(void);
 
-extern volatile bool _serial_connected;
 #endif  // MICROPY_INCLUDED_SUPERVISOR_SERIAL_H
diff --git a/supervisor/shared/rgb_led_status.c b/supervisor/shared/rgb_led_status.c
index 283b9da123..bff74a1f0e 100644
--- a/supervisor/shared/rgb_led_status.c
+++ b/supervisor/shared/rgb_led_status.c
@@ -367,6 +367,7 @@ void prep_rgb_status_animation(const pyexec_result_t* result,
     status->found_main = found_main;
     status->total_exception_cycle = 0;
     status->ok = result->return_code != PYEXEC_EXCEPTION;
+    status->cycles = 0;
     if (status->ok) {
         // If this isn't an exception, skip exception sorting and handling
         return;
@@ -411,14 +412,16 @@ void prep_rgb_status_animation(const pyexec_result_t* result,
     #endif
 }
 
-void tick_rgb_status_animation(rgb_status_animation_t* status) {
+bool tick_rgb_status_animation(rgb_status_animation_t* status) {
     #if defined(MICROPY_HW_NEOPIXEL) || (defined(MICROPY_HW_APA102_MOSI) && defined(MICROPY_HW_APA102_SCK)) || (defined(CP_RGB_STATUS_LED))
     uint32_t tick_diff = supervisor_ticks_ms32() - status->pattern_start;
     if (status->ok) {
         // All is good. Ramp ALL_DONE up and down.
         if (tick_diff > ALL_GOOD_CYCLE_MS) {
             status->pattern_start = supervisor_ticks_ms32();
-            tick_diff = 0;
+            status->cycles++;
+            new_status_color(BLACK);
+            return status->cycles;
         }
 
         uint16_t brightness = tick_diff * 255 / (ALL_GOOD_CYCLE_MS / 2);
@@ -433,7 +436,8 @@ void tick_rgb_status_animation(rgb_status_animation_t* status) {
     } else {
         if (tick_diff > status->total_exception_cycle) {
             status->pattern_start = supervisor_ticks_ms32();
-            tick_diff = 0;
+            status->cycles++;
+            return;
         }
         // First flash the file color.
         if (tick_diff < EXCEPTION_TYPE_LENGTH_MS) {
diff --git a/supervisor/shared/safe_mode.c b/supervisor/shared/safe_mode.c
index d59e754ed4..fa871eeebf 100644
--- a/supervisor/shared/safe_mode.c
+++ b/supervisor/shared/safe_mode.c
@@ -52,6 +52,10 @@ safe_mode_t wait_for_safe_mode_reset(void) {
         current_safe_mode = safe_mode;
         return safe_mode;
     }
+    if (common_hal_sleepio_get_reset_reason() != RESET_REASON_POWER_VALID &&
+        common_hal_sleepio_get_reset_reason() != RESET_REASON_BUTTON) {
+        return NO_SAFE_MODE;
+    }
     port_set_saved_word(SAFE_MODE_DATA_GUARD | (MANUAL_SAFE_MODE << 8));
     // Wait for a while to allow for reset.
     temp_status_color(SAFE_MODE);
diff --git a/supervisor/shared/serial.h b/supervisor/shared/serial.h
new file mode 100644
index 0000000000..84f92c337c
--- /dev/null
+++ b/supervisor/shared/serial.h
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+extern volatile bool _serial_connected;
diff --git a/supervisor/shared/usb/usb.c b/supervisor/shared/usb/usb.c
index 89fbf56f37..7fbc5cbe6a 100644
--- a/supervisor/shared/usb/usb.c
+++ b/supervisor/shared/usb/usb.c
@@ -30,6 +30,7 @@
 #include "supervisor/background_callback.h"
 #include "supervisor/port.h"
 #include "supervisor/serial.h"
+#include "supervisor/shared/serial.h"
 #include "supervisor/usb.h"
 #include "lib/utils/interrupt_char.h"
 #include "lib/mp-readline/readline.h"
@@ -102,14 +103,16 @@ void usb_irq_handler(void) {
 // tinyusb callbacks
 //--------------------------------------------------------------------+
 
-// Invoked when device is mounted
+// Invoked when device is plugged into a host
 void tud_mount_cb(void) {
     usb_msc_mount();
+    _workflow_active = true;
 }
 
-// Invoked when device is unmounted
+// Invoked when device is unplugged from the host
 void tud_umount_cb(void) {
     usb_msc_umount();
+    _workflow_active = false;
 }
 
 // Invoked when usb bus is suspended
@@ -117,10 +120,12 @@ void tud_umount_cb(void) {
 // USB Specs: Within 7ms, device must draw an average current less than 2.5 mA from bus
 void tud_suspend_cb(bool remote_wakeup_en) {
     _serial_connected = false;
+    _workflow_active = false;
 }
 
 // Invoked when usb bus is resumed
 void tud_resume_cb(void) {
+    _workflow_active = true;
 }
 
 // Invoked when cdc when line state changed e.g connected/disconnected
diff --git a/supervisor/shared/workflow.c b/supervisor/shared/workflow.c
new file mode 100644
index 0000000000..adcffb319a
--- /dev/null
+++ b/supervisor/shared/workflow.c
@@ -0,0 +1,32 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// Set by the shared USB code.
+volatile bool _workflow_active;
+
+bool workflow_active(void) {
+    return _workflow_active;
+}
diff --git a/supervisor/shared/workflow.h b/supervisor/shared/workflow.h
new file mode 100644
index 0000000000..4a138332a7
--- /dev/null
+++ b/supervisor/shared/workflow.h
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+extern volatile bool _workflow_active;
diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk
index e81c51a88c..a59e99e3de 100644
--- a/supervisor/supervisor.mk
+++ b/supervisor/supervisor.mk
@@ -75,6 +75,7 @@ else
 		lib/tinyusb/src/class/cdc/cdc_device.c \
 		lib/tinyusb/src/tusb.c \
 		supervisor/shared/serial.c \
+		supervisor/shared/workflow.c \
 		supervisor/usb.c \
 		supervisor/shared/usb/usb_desc.c \
 		supervisor/shared/usb/usb.c \
diff --git a/supervisor/workflow.h b/supervisor/workflow.h
new file mode 100755
index 0000000000..4008b83a11
--- /dev/null
+++ b/supervisor/workflow.h
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+// True when the user could be actively iterating on their code.
+bool workflow_active(void);