From 8889ac12e1306cf0a266deaf9f4371c8e12b3e2b Mon Sep 17 00:00:00 2001
From: Christian Walther <cwalther@gmx.ch>
Date: Thu, 29 Oct 2020 16:39:06 +0100
Subject: [PATCH 001/349] Add supervisor.set_next_code() function (prototype).

Part of #1084.
---
 locale/circuitpython.pot              |  6 +-
 main.c                                | 82 +++++++++++++++++++++----
 shared-bindings/supervisor/__init__.c | 86 ++++++++++++++++++++++++++-
 supervisor/shared/autoreload.c        |  2 +
 supervisor/shared/autoreload.h        | 18 ++++++
 supervisor/shared/memory.c            |  2 +
 6 files changed, 182 insertions(+), 14 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 3ffc31cc6c..bcce38b1cc 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -47,6 +47,10 @@ msgstr ""
 msgid " is of type %q\n"
 msgstr ""
 
+#: main.c
+msgid " not found.\n"
+msgstr ""
+
 #: main.c
 msgid " output:\n"
 msgstr ""
@@ -2213,7 +2217,7 @@ msgstr ""
 msgid "argsort is not implemented for flattened arrays"
 msgstr ""
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/__init__.c
 msgid "argument has wrong type"
 msgstr ""
 
diff --git a/main.c b/main.c
index d9cdcca1da..2a0c92e551 100755
--- a/main.c
+++ b/main.c
@@ -272,7 +272,11 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
     result.exception_type = NULL;
     result.exception_line = 0;
 
+    bool skip_repl;
     bool found_main = false;
+    uint8_t next_code_options = 0;
+    // Collects stickiness bits that apply in the current situation.
+    uint8_t next_code_stickiness_situation = SUPERVISOR_NEXT_CODE_OPT_NEWLY_SET;
 
     if (safe_mode == NO_SAFE_MODE) {
         new_status_color(MAIN_RUNNING);
@@ -290,22 +294,62 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
         supervisor_allocation* heap = allocate_remaining_memory();
         start_mp(heap);
 
-        found_main = maybe_run_list(supported_filenames, &result);
-        #if CIRCUITPY_FULL_BUILD
-        if (!found_main){
-            found_main = maybe_run_list(double_extension_filenames, &result);
-            if (found_main) {
-                serial_write_compressed(translate("WARNING: Your code filename has two extensions\n"));
+        if (next_code_allocation) {
+            ((next_code_info_t*)next_code_allocation->ptr)->options &= ~SUPERVISOR_NEXT_CODE_OPT_NEWLY_SET;
+            next_code_options = ((next_code_info_t*)next_code_allocation->ptr)->options;
+            if (((next_code_info_t*)next_code_allocation->ptr)->filename[0] != '\0') {
+                const char* next_list[] = {((next_code_info_t*)next_code_allocation->ptr)->filename, ""};
+                found_main = maybe_run_list(next_list, &result);
+                if (!found_main) {
+                    serial_write(((next_code_info_t*)next_code_allocation->ptr)->filename);
+                    serial_write_compressed(translate(" not found.\n"));
+                }
             }
         }
-        #endif
+        if (!found_main) {
+            found_main = maybe_run_list(supported_filenames, &result);
+            #if CIRCUITPY_FULL_BUILD
+            if (!found_main){
+                found_main = maybe_run_list(double_extension_filenames, &result);
+                if (found_main) {
+                    serial_write_compressed(translate("WARNING: Your code filename has two extensions\n"));
+                }
+            }
+            #endif
+        }
 
         // TODO: on deep sleep, make sure display is refreshed before sleeping (for e-ink).
 
         cleanup_after_vm(heap);
 
+        // If a new next code file was set, that is a reason to keep it (obviously). Stuff this into
+        // the options because it can be treated like any other reason-for-stickiness bit. The
+        // source is different though: it comes from the options that will apply to the next run,
+        // while the rest of next_code_options is what applied to this run.
+        if (next_code_allocation != NULL && (((next_code_info_t*)next_code_allocation->ptr)->options & SUPERVISOR_NEXT_CODE_OPT_NEWLY_SET)) {
+            next_code_options |= SUPERVISOR_NEXT_CODE_OPT_NEWLY_SET;
+        }
+
+        if (reload_requested) {
+            next_code_stickiness_situation |= SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_RELOAD;
+        }
+        else if (result.return_code == 0) { //TODO mask out PYEXEC_DEEP_SLEEP?
+            next_code_stickiness_situation |= SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_SUCCESS;
+            if (next_code_options & SUPERVISOR_NEXT_CODE_OPT_RELOAD_ON_SUCCESS) {
+                skip_repl = true;
+                goto done;
+            }
+        }
+        else {
+            next_code_stickiness_situation |= SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_ERROR;
+            if (next_code_options & SUPERVISOR_NEXT_CODE_OPT_RELOAD_ON_ERROR) {
+                skip_repl = true;
+                goto done;
+            }
+        }
         if (result.return_code & PYEXEC_FORCED_EXIT) {
-            return reload_requested;
+            skip_repl = reload_requested;
+            goto done;
         }
 
         if (reload_requested && result.return_code == PYEXEC_EXCEPTION) {
@@ -333,9 +377,16 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
                 board_init();
             }
             #endif
+            next_code_stickiness_situation |= SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_RELOAD;
+            // Should the STICKY_ON_SUCCESS and STICKY_ON_ERROR bits be cleared in
+            // next_code_stickiness_situation? I can see arguments either way, but I'm deciding
+            // "no" for now, mainly because it's a bit less code. At this point, we have both a
+            // success or error and a reload, so let's have both of the respective options take
+            // effect (in OR combination).
             supervisor_set_run_reason(RUN_REASON_AUTO_RELOAD);
             reload_requested = false;
-            return true;
+            skip_repl = true;
+            goto done;
         }
 
         if (serial_connected() && serial_bytes_available()) {
@@ -345,11 +396,11 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
             }
             #endif
             // Skip REPL if reload was requested.
-            bool ctrl_d = serial_read() == CHAR_CTRL_D;
-            if (ctrl_d) {
+            skip_repl = serial_read() == CHAR_CTRL_D;
+            if (skip_repl) {
                 supervisor_set_run_reason(RUN_REASON_REPL_RELOAD);
             }
-            return ctrl_d;
+            goto done;
         }
 
         // Check for a deep sleep alarm and restart the VM. This can happen if
@@ -428,6 +479,13 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
             port_idle_until_interrupt();
         }
     }
+
+done:
+    if ((next_code_options & next_code_stickiness_situation) == 0) {
+        free_memory(next_code_allocation);
+        next_code_allocation = NULL;
+    }
+    return skip_repl;
 }
 
 FIL* boot_output_file;
diff --git a/shared-bindings/supervisor/__init__.c b/shared-bindings/supervisor/__init__.c
index ad86030478..d904d11c6e 100644
--- a/shared-bindings/supervisor/__init__.c
+++ b/shared-bindings/supervisor/__init__.c
@@ -23,9 +23,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include <string.h>
+
 #include "py/obj.h"
 #include "py/runtime.h"
 #include "py/reload.h"
+#include "py/objstr.h"
 
 #include "lib/utils/interrupt_char.h"
 #include "supervisor/shared/autoreload.h"
@@ -112,6 +115,87 @@ STATIC mp_obj_t supervisor_set_next_stack_limit(mp_obj_t size_obj) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(supervisor_set_next_stack_limit_obj, supervisor_set_next_stack_limit);
 
+//| def set_next_code_file(filename: Optional[str], *, reload_on_success : bool = False, reload_on_error: bool = False, sticky_on_success: bool = False, sticky_on_error: bool = False, sticky_on_reload: bool = False) -> None:
+//|     """Set what file to run on the next vm run.
+//|
+//|     When not ``None``, the given ``filename`` is inserted at the front of the usual ['code.py',
+//|     'main.py'] search sequence.
+//|
+//|     The optional keyword arguments specify what happens after the specified file has run:
+//|
+//|     ``sticky_on_…`` determine whether the newly set filename and options stay in effect: If
+//|     True, further runs will continue to run that file (unless it says otherwise by calling
+//|     ``set_next_code_filename()`` itself). If False, the settings will only affect one run and
+//|     revert to the standard code.py/main.py afterwards.
+//|
+//|     ``reload_on_…`` determine how to continue: If False, wait in the usual "Code done running.
+//|     Waiting for reload. / Press any key to enter the REPL. Use CTRL-D to reload." state. If
+//|     True, reload immediately as if CTRL-D was pressed.
+//|
+//|     ``…_on_success`` take effect when the program runs to completion or calls ``sys.exit()``.
+//|
+//|     ``…_on_error`` take effect when the program exits with an exception, including the
+//|     KeyboardInterrupt caused by CTRL-C.
+//|
+//|     ``…_on_reload`` take effect when the program is interrupted by files being written to the USB
+//|     drive (auto-reload) or when it calls ``supervisor.reload()``.
+//|
+//|     These settings are stored in RAM, not in persistent memory, and will therefore only affect
+//|     soft reloads. Powering off or resetting the device will always revert to standard settings.
+//|
+//|     When called multiple times in the same run, only the last call takes effect, replacing any
+//|     settings made by previous ones. This is the main use of passing ``None`` as a filename: to
+//|     reset to the standard search sequence."""
+//|     ...
+//|
+STATIC mp_obj_t supervisor_set_next_code_file(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_filename, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_rom_obj = mp_const_none} },
+        { MP_QSTR_reload_on_success, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
+        { MP_QSTR_reload_on_error, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
+        { MP_QSTR_sticky_on_success, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
+        { MP_QSTR_sticky_on_error, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
+        { MP_QSTR_sticky_on_reload, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
+    };
+    struct {
+        mp_arg_val_t filename;
+        mp_arg_val_t reload_on_success;
+        mp_arg_val_t reload_on_error;
+        mp_arg_val_t sticky_on_success;
+        mp_arg_val_t sticky_on_error;
+        mp_arg_val_t sticky_on_reload;
+    } args;
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, (mp_arg_val_t*)&args);
+    if (!MP_OBJ_IS_STR_OR_BYTES(args.filename.u_obj) && args.filename.u_obj != mp_const_none) {
+        mp_raise_TypeError(translate("argument has wrong type"));
+    }
+    if (args.filename.u_obj == mp_const_none) args.filename.u_obj = mp_const_empty_bytes;
+    uint8_t options = 0;
+    if (args.reload_on_success.u_bool) options |= SUPERVISOR_NEXT_CODE_OPT_RELOAD_ON_SUCCESS;
+    if (args.reload_on_error.u_bool) options |= SUPERVISOR_NEXT_CODE_OPT_RELOAD_ON_ERROR;
+    if (args.sticky_on_success.u_bool) options |= SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_SUCCESS;
+    if (args.sticky_on_error.u_bool) options |= SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_ERROR;
+    if (args.sticky_on_reload.u_bool) options |= SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_RELOAD;
+    size_t len;
+    const char* filename = mp_obj_str_get_data(args.filename.u_obj, &len);
+    free_memory(next_code_allocation);
+    if (options != 0 || len != 0) {
+        next_code_allocation = allocate_memory(align32_size(sizeof(next_code_info_t) + len + 1), false, true);
+        if (next_code_allocation == NULL) {
+            m_malloc_fail(sizeof(next_code_info_t) + len + 1);
+        }
+        next_code_info_t* next_code = (next_code_info_t*)next_code_allocation->ptr;
+        next_code->options = options | SUPERVISOR_NEXT_CODE_OPT_NEWLY_SET;
+        memcpy(&next_code->filename, filename, len);
+        next_code->filename[len] = '\0';
+    }
+    else {
+        next_code_allocation = NULL;
+    }
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(supervisor_set_next_code_file_obj, 0, supervisor_set_next_code_file);
+
 STATIC const mp_rom_map_elem_t supervisor_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_supervisor) },
     { MP_ROM_QSTR(MP_QSTR_enable_autoreload),  MP_ROM_PTR(&supervisor_enable_autoreload_obj) },
@@ -121,7 +205,7 @@ STATIC const mp_rom_map_elem_t supervisor_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_reload),  MP_ROM_PTR(&supervisor_reload_obj) },
     { MP_ROM_QSTR(MP_QSTR_RunReason),  MP_ROM_PTR(&supervisor_run_reason_type) },
     { MP_ROM_QSTR(MP_QSTR_set_next_stack_limit),  MP_ROM_PTR(&supervisor_set_next_stack_limit_obj) },
-
+    { MP_ROM_QSTR(MP_QSTR_set_next_code_file),  MP_ROM_PTR(&supervisor_set_next_code_file_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(supervisor_module_globals, supervisor_module_globals_table);
diff --git a/supervisor/shared/autoreload.c b/supervisor/shared/autoreload.c
index 1976f66470..a267879a60 100644
--- a/supervisor/shared/autoreload.c
+++ b/supervisor/shared/autoreload.c
@@ -30,6 +30,8 @@
 #include "py/reload.h"
 #include "supervisor/shared/tick.h"
 
+supervisor_allocation* next_code_allocation;
+
 static volatile uint32_t autoreload_delay_ms = 0;
 static bool autoreload_enabled = false;
 static bool autoreload_suspended = false;
diff --git a/supervisor/shared/autoreload.h b/supervisor/shared/autoreload.h
index fbd482c19a..069be997dc 100644
--- a/supervisor/shared/autoreload.h
+++ b/supervisor/shared/autoreload.h
@@ -29,6 +29,24 @@
 
 #include <stdbool.h>
 
+#include "supervisor/memory.h"
+
+enum {
+	SUPERVISOR_NEXT_CODE_OPT_RELOAD_ON_SUCCESS = 0x1,
+	SUPERVISOR_NEXT_CODE_OPT_RELOAD_ON_ERROR = 0x2,
+	SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_SUCCESS = 0x4,
+	SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_ERROR = 0x8,
+	SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_RELOAD = 0x10,
+	SUPERVISOR_NEXT_CODE_OPT_NEWLY_SET = 0x20,
+};
+
+typedef struct {
+    uint8_t options;
+    char filename[];
+} next_code_info_t;
+
+extern supervisor_allocation* next_code_allocation;
+
 extern volatile bool reload_requested;
 
 void autoreload_tick(void);
diff --git a/supervisor/shared/memory.c b/supervisor/shared/memory.c
index 480c322b01..74747d6cf6 100755
--- a/supervisor/shared/memory.c
+++ b/supervisor/shared/memory.c
@@ -36,6 +36,8 @@ enum {
     CIRCUITPY_SUPERVISOR_IMMOVABLE_ALLOC_COUNT =
     // stack + heap
     2
+    // next_code_allocation
+    + 1
 #ifdef EXTERNAL_FLASH_DEVICES
     + 1
 #endif

From b74dc546fc2d7d04853db3acc4dc6ed92cc77f67 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 20 Apr 2021 21:39:53 +1000
Subject: [PATCH 002/349] tools/metrics.py: Add rp2 port to table of ports that
 can be built.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/metrics.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/metrics.py b/tools/metrics.py
index 98291e25a9..c857d0733e 100755
--- a/tools/metrics.py
+++ b/tools/metrics.py
@@ -67,6 +67,7 @@ port_data = {
     "8": PortData("esp8266", "esp8266", "build-GENERIC/firmware.elf"),
     "3": PortData("esp32", "esp32", "build-GENERIC/micropython.elf"),
     "r": PortData("nrf", "nrf", "build-pca10040/firmware.elf"),
+    "p": PortData("rp2", "rp2", "build-PICO/firmware.elf"),
     "d": PortData("samd", "samd", "build-ADAFRUIT_ITSYBITSY_M4_EXPRESS/firmware.elf"),
 }
 

From 6e0f9b9262a2948391704d53eafec8d2bd2e5ad2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 8 Apr 2021 16:12:32 +1000
Subject: [PATCH 003/349] stm32/boards/pllvalues.py: Support wider range of PLL
 values for F413.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/pllvalues.py | 38 ++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/ports/stm32/boards/pllvalues.py b/ports/stm32/boards/pllvalues.py
index 619146cd47..e0fff40dd3 100644
--- a/ports/stm32/boards/pllvalues.py
+++ b/ports/stm32/boards/pllvalues.py
@@ -31,15 +31,26 @@ mcu_default = MCU(
     range_vco_out=range(192, 432 + 1),
 )
 
-mcu_h7 = MCU(
-    range_sysclk=range(2, 400 + 1, 2),  # above 400MHz currently unsupported
-    range_m=range(1, 63 + 1),
-    range_n=range(4, 512 + 1),
-    range_p=range(2, 128 + 1, 2),
-    range_q=range(1, 128 + 1),
-    range_vco_in=range(1, 16 + 1),
-    range_vco_out=range(150, 960 + 1),  # 150-420=medium, 192-960=wide
-)
+mcu_table = {
+    "stm32f413": MCU(
+        range_sysclk=range(2, 100 + 1, 2),
+        range_m=range(2, 63 + 1),
+        range_n=range(50, 432 + 1),
+        range_p=range(2, 8 + 1, 2),
+        range_q=range(2, 15 + 1),
+        range_vco_in=range(1, 2 + 1),
+        range_vco_out=range(100, 432 + 1),
+    ),
+    "stm32h7": MCU(
+        range_sysclk=range(2, 400 + 1, 2),  # above 400MHz currently unsupported
+        range_m=range(1, 63 + 1),
+        range_n=range(4, 512 + 1),
+        range_p=range(2, 128 + 1, 2),
+        range_q=range(1, 128 + 1),
+        range_vco_in=range(1, 16 + 1),
+        range_vco_out=range(150, 960 + 1),  # 150-420=medium, 192-960=wide
+    ),
+}
 
 
 def close_int(x):
@@ -271,10 +282,11 @@ def main():
         hse = int(argv[0])
 
     # Select MCU parameters
-    if mcu_series.startswith("stm32h7"):
-        mcu = mcu_h7
-    else:
-        mcu = mcu_default
+    mcu = mcu_default
+    for m in mcu_table:
+        if mcu_series.startswith(m):
+            mcu = mcu_table[m]
+            break
 
     # Relax constraint on PLLQ being 48MHz on MCUs which have separate PLLs for 48MHz
     relax_pll48 = mcu_series.startswith(("stm32f413", "stm32f7", "stm32h7"))

From 00d6a79b3d5dc80d840dc1d51166e7d95856b3d6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 21 Apr 2021 14:06:14 +1000
Subject: [PATCH 004/349] stm32/machine_timer: Improve usability of Timer
 constructor and init.

Improvements are:
- Default period is 1000ms with callback disabled.
- if period is not specified then it's not updated (previously, if period
  was not specified then it was set to -1 and running the timer callback as
  fast as possible, making the REPL unresponsive).
- Use uint64_t to compute delta_ms, and raise a ValueError if the period is
  too large.
- If callback is not specified then it's not updated.
- Specifying None for the callback will disable the timer.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/machine_timer.c | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/ports/stm32/machine_timer.c b/ports/stm32/machine_timer.c
index e9b16ab72f..c37ac87672 100644
--- a/ports/stm32/machine_timer.c
+++ b/ports/stm32/machine_timer.c
@@ -42,7 +42,7 @@ STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_ar
     enum { ARG_mode, ARG_callback, ARG_period, ARG_tick_hz, ARG_freq, };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_mode,         MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = SOFT_TIMER_MODE_PERIODIC} },
-        { MP_QSTR_callback,     MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_callback,     MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_period,       MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0xffffffff} },
         { MP_QSTR_tick_hz,      MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1000} },
         { MP_QSTR_freq,         MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
@@ -53,24 +53,35 @@ STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_ar
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     self->mode = args[ARG_mode].u_int;
+
+    uint64_t delta_ms = self->delta_ms;
     if (args[ARG_freq].u_obj != mp_const_none) {
         // Frequency specified in Hz
         #if MICROPY_PY_BUILTINS_FLOAT
-        self->delta_ms = (uint32_t)(MICROPY_FLOAT_CONST(1000.0) / mp_obj_get_float(args[ARG_freq].u_obj));
+        delta_ms = (uint32_t)(MICROPY_FLOAT_CONST(1000.0) / mp_obj_get_float(args[ARG_freq].u_obj));
         #else
-        self->delta_ms = 1000 / mp_obj_get_int(args[ARG_freq].u_obj);
+        delta_ms = 1000 / mp_obj_get_int(args[ARG_freq].u_obj);
         #endif
-    } else {
+    } else if (args[ARG_period].u_int != 0xffffffff) {
         // Period specified
-        self->delta_ms = args[ARG_period].u_int * 1000 / args[ARG_tick_hz].u_int;
+        delta_ms = (uint64_t)args[ARG_period].u_int * 1000 / args[ARG_tick_hz].u_int;
     }
-    if (self->delta_ms < 1) {
-        self->delta_ms = 1;
+
+    if (delta_ms < 1) {
+        delta_ms = 1;
+    } else if (delta_ms >= 0x40000000) {
+        mp_raise_ValueError(MP_ERROR_TEXT("period too large"));
     }
+    self->delta_ms = (uint32_t)delta_ms;
     self->expiry_ms = mp_hal_ticks_ms() + self->delta_ms;
 
-    self->callback = args[ARG_callback].u_obj;
-    soft_timer_insert(self);
+    if (args[ARG_callback].u_obj != MP_OBJ_NULL) {
+        self->callback = args[ARG_callback].u_obj;
+    }
+
+    if (self->callback != mp_const_none) {
+        soft_timer_insert(self);
+    }
 
     return mp_const_none;
 }
@@ -78,6 +89,8 @@ STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_ar
 STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     machine_timer_obj_t *self = m_new_obj(machine_timer_obj_t);
     self->pairheap.base.type = &machine_timer_type;
+    self->delta_ms = 1000;
+    self->callback = mp_const_none;
 
     // Get timer id (only soft timer (-1) supported at the moment)
     mp_int_t id = -1;

From 5669a6095444e079af5e38b2b04ca5ff2e7c11f9 Mon Sep 17 00:00:00 2001
From: David Michieli <dmm@planetinnovation.com.au>
Date: Thu, 22 Apr 2021 13:43:50 +1000
Subject: [PATCH 005/349] stm32/mboot: Allow unpacking dfu without secret key.

- unpack-dfu command no longer requies a secret key to be present
- pack-dfu command raises an exception if no secret key is found
---
 ports/stm32/mboot/mboot_pack_dfu.py | 13 ++++++++++---
 tools/ci.sh                         |  4 ++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/mboot/mboot_pack_dfu.py b/ports/stm32/mboot/mboot_pack_dfu.py
index 540057e06e..683cdd0a71 100644
--- a/ports/stm32/mboot/mboot_pack_dfu.py
+++ b/ports/stm32/mboot/mboot_pack_dfu.py
@@ -86,9 +86,14 @@ class Keys:
 
     def load(self):
         with open(self.filename) as f:
-            self.sign_sk = self._load_data("mboot_pack_sign_secret_key", f.readline())
-            self.sign_pk = self._load_data("mboot_pack_sign_public_key", f.readline())
-            self.secretbox = self._load_data("mboot_pack_secretbox_key", f.readline())
+            for line in f:
+                for key, attr in (
+                    ("mboot_pack_sign_secret_key", "sign_sk"),
+                    ("mboot_pack_sign_public_key", "sign_pk"),
+                    ("mboot_pack_secretbox_key", "secretbox"),
+                ):
+                    if key in line:
+                        setattr(self, attr, self._load_data(key, line))
 
 
 def dfu_read(filename):
@@ -135,6 +140,8 @@ def encrypt(keys, data):
 
 
 def sign(keys, data):
+    if not hasattr(keys, "sign_sk"):
+        raise Exception("packing a dfu requires a secret key")
     return pyhy.hydro_sign_create(data, MBOOT_PACK_HYDRO_CONTEXT, keys.sign_sk)
 
 
diff --git a/tools/ci.sh b/tools/ci.sh
index c018b55002..33cf364ddd 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -243,6 +243,10 @@ function ci_stm32_nucleo_build {
     BUILD_WB55=ports/stm32/build-NUCLEO_WB55
     python3 ports/stm32/mboot/mboot_pack_dfu.py -k $BOARD_WB55/mboot_keys.h unpack-dfu $BUILD_WB55/firmware.pack.dfu $BUILD_WB55/firmware.unpack.dfu
     diff $BUILD_WB55/firmware.unpack.dfu $BUILD_WB55/firmware.dfu
+    # Test unpack-dfu command works without a secret key
+    tail -n +2 $BOARD_WB55/mboot_keys.h > $BOARD_WB55/mboot_keys_no_sk.h
+    python3 ports/stm32/mboot/mboot_pack_dfu.py -k $BOARD_WB55/mboot_keys_no_sk.h unpack-dfu $BUILD_WB55/firmware.pack.dfu $BUILD_WB55/firmware.unpack_no_sk.dfu
+    diff $BUILD_WB55/firmware.unpack.dfu $BUILD_WB55/firmware.unpack_no_sk.dfu
 }
 
 ########################################################################################

From 3c4bfd1dec28ffbefc6379dedeaa24feaa2ef373 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 20 Apr 2021 17:11:13 +1000
Subject: [PATCH 006/349] py/objexcept: Support errno attribute on OSError
 exceptions.

This commit adds the errno attribute to exceptions, so code can retrieve
errno codes from an OSError using exc.errno.

The implementation here simply lets `errno` (and the existing `value`)
attributes work on any exception instance (they both alias args[0]).  This
is for efficiency and to keep code size down.  The pros and cons of this
are:

Pros:
- more compatible with CPython, less difference to document and learn
- OSError().errno will correctly return None, whereas the current way of
  doing it via OSError().args[0] will raise an IndexError
- it reduces code size on most bare-metal ports (because they already have
  the errno qstr)
- for Python code that uses exc.errno the generated bytecode is 2 bytes
  smaller and more efficient to execute (compared with exc.args[0]); so
  bytecode loaded to RAM saves 2 bytes RAM for each use of this attribute,
  and bytecode that is frozen saves 2 bytes flash/ROM for each use
- it's easier/shorter to type, and saves 2 bytes of space in .py files that
  use it (for each use)

Cons:
- increases code size by 4-8 bytes on minimal ports that don't already have
  the `errno` qstr
- all exceptions now have .errno and .value attributes (a cpydiff test is
  added to address this)

See also #2407.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/builtins.rst              |  4 ----
 docs/library/uerrno.rst                |  4 ++--
 py/objexcept.c                         |  4 +++-
 tests/basics/exception1.py             |  5 +++++
 tests/basics/subclass_native3.py       | 20 ++++++++++++++++++++
 tests/cpydiff/types_exception_attrs.py |  9 +++++++++
 6 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 tests/cpydiff/types_exception_attrs.py

diff --git a/docs/library/builtins.rst b/docs/library/builtins.rst
index 365248dc76..3029cd9e3b 100644
--- a/docs/library/builtins.rst
+++ b/docs/library/builtins.rst
@@ -176,10 +176,6 @@ Exceptions
 
 .. exception:: OSError
 
-    |see_cpython| `python:OSError`. MicroPython doesn't implement ``errno``
-    attribute, instead use the standard way to access exception arguments:
-    ``exc.args[0]``.
-
 .. exception:: RuntimeError
 
 .. exception:: StopIteration
diff --git a/docs/library/uerrno.rst b/docs/library/uerrno.rst
index def01362f1..1d60c80e11 100644
--- a/docs/library/uerrno.rst
+++ b/docs/library/uerrno.rst
@@ -16,13 +16,13 @@ Constants
 
     Error codes, based on ANSI C/POSIX standard. All error codes start with
     "E". As mentioned above, inventory of the codes depends on
-    :term:`MicroPython port`. Errors are usually accessible as ``exc.args[0]``
+    :term:`MicroPython port`. Errors are usually accessible as ``exc.errno``
     where ``exc`` is an instance of `OSError`. Usage example::
 
         try:
             uos.mkdir("my_dir")
         except OSError as exc:
-            if exc.args[0] == uerrno.EEXIST:
+            if exc.errno == uerrno.EEXIST:
                 print("Directory already exists")
 
 .. data:: errorcode
diff --git a/py/objexcept.c b/py/objexcept.c
index 885032c3e3..f6bffec383 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -261,7 +261,9 @@ void mp_obj_exception_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     if (attr == MP_QSTR_args) {
         decompress_error_text_maybe(self);
         dest[0] = MP_OBJ_FROM_PTR(self->args);
-    } else if (self->base.type == &mp_type_StopIteration && attr == MP_QSTR_value) {
+    } else if (attr == MP_QSTR_value || attr == MP_QSTR_errno) {
+        // These are aliases for args[0]: .value for StopIteration and .errno for OSError.
+        // For efficiency let these attributes apply to all exception instances.
         dest[0] = mp_obj_exception_get_value(self_in);
     }
 }
diff --git a/tests/basics/exception1.py b/tests/basics/exception1.py
index d83764cb93..a0ca8a74e2 100644
--- a/tests/basics/exception1.py
+++ b/tests/basics/exception1.py
@@ -1,3 +1,5 @@
+# test basic properties of exceptions
+
 print(repr(IndexError()))
 print(str(IndexError()))
 
@@ -12,3 +14,6 @@ s = StopIteration()
 print(s.value)
 s = StopIteration(1, 2, 3)
 print(s.value)
+
+print(OSError().errno)
+print(OSError(1, "msg").errno)
diff --git a/tests/basics/subclass_native3.py b/tests/basics/subclass_native3.py
index 6745b77bb2..ac5aabfed7 100644
--- a/tests/basics/subclass_native3.py
+++ b/tests/basics/subclass_native3.py
@@ -1,6 +1,10 @@
+# test subclassing a native exception
+
+
 class MyExc(Exception):
     pass
 
+
 e = MyExc(100, "Some error")
 print(e)
 print(repr(e))
@@ -20,3 +24,19 @@ try:
     raise MyExc("Some error2")
 except:
     print("Caught user exception")
+
+
+class MyStopIteration(StopIteration):
+    pass
+
+
+print(MyStopIteration().value)
+print(MyStopIteration(1).value)
+
+
+class MyOSError(OSError):
+    pass
+
+
+print(MyOSError().errno)
+print(MyOSError(1, "msg").errno)
diff --git a/tests/cpydiff/types_exception_attrs.py b/tests/cpydiff/types_exception_attrs.py
new file mode 100644
index 0000000000..ad72b62a61
--- /dev/null
+++ b/tests/cpydiff/types_exception_attrs.py
@@ -0,0 +1,9 @@
+"""
+categories: Types,Exception
+description: All exceptions have readable ``value`` and ``errno`` attributes, not just ``StopIteration`` and ``OSError``.
+cause: MicroPython is optimised to reduce code size.
+workaround: Only use ``value`` on ``StopIteration`` exceptions, and ``errno`` on ``OSError`` exceptions.  Do not use or rely on these attributes on other exceptions.
+"""
+e = Exception(1)
+print(e.value)
+print(e.errno)

From ac1d01d43ee02d294f5fe762ae608fbb3f72babb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 20 Apr 2021 17:11:59 +1000
Subject: [PATCH 007/349] tools/upip.py: Use .errno instead of .args[0] for
 OSError exceptions.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/upip.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/upip.py b/tools/upip.py
index aa8aecedfc..728b843c94 100644
--- a/tools/upip.py
+++ b/tools/upip.py
@@ -60,7 +60,7 @@ def _makedirs(name, mode=0o777):
             os.mkdir(s)
             ret = True
         except OSError as e:
-            if e.args[0] != errno.EEXIST and e.args[0] != errno.EISDIR:
+            if e.errno != errno.EEXIST and e.errno != errno.EISDIR:
                 raise e
             ret = False
     return ret

From 342d55529d6f3312fc158d7af005f56d5e30adef Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 20 Apr 2021 17:12:08 +1000
Subject: [PATCH 008/349] extmod/uasyncio: Use .errno instead of .args[0] for
 OSError exceptions.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/uasyncio/stream.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/uasyncio/stream.py b/extmod/uasyncio/stream.py
index b6d787e4f0..395ff1f6af 100644
--- a/extmod/uasyncio/stream.py
+++ b/extmod/uasyncio/stream.py
@@ -82,7 +82,7 @@ async def open_connection(host, port):
     try:
         s.connect(ai[-1])
     except OSError as er:
-        if er.args[0] != EINPROGRESS:
+        if er.errno != EINPROGRESS:
             raise er
     yield core._io_queue.queue_write(s)
     return ss, ss

From 3123f6918ba18b0a3f7a89500b450f4cb15e1aee Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 22 Apr 2021 19:32:21 +1000
Subject: [PATCH 009/349] tests: Use .errno instead of .args[0] for OSError
 exceptions.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/btree1.py                     |  2 +-
 tests/extmod/btree_error.py                |  2 +-
 tests/extmod/uselect_poll_basic.py         |  2 +-
 tests/extmod/usocket_tcp_basic.py          |  2 +-
 tests/extmod/usocket_udp_nonblock.py       |  2 +-
 tests/extmod/vfs_fat_fileio1.py            | 10 +++++-----
 tests/extmod/vfs_fat_fileio2.py            | 12 ++++++------
 tests/extmod/vfs_fat_more.py               |  2 +-
 tests/extmod/vfs_fat_ramdisk.py            |  6 +++---
 tests/extmod/websocket_basic.py            |  2 +-
 tests/multi_net/tcp_accept_recv.py         |  2 +-
 tests/multi_net/tcp_client_rst.py          |  2 +-
 tests/multi_net/uasyncio_tcp_client_rst.py |  2 +-
 tests/net_hosted/accept_nonblock.py        |  2 +-
 tests/net_hosted/accept_timeout.py         |  2 +-
 tests/net_hosted/connect_nonblock.py       |  2 +-
 tests/net_hosted/connect_nonblock_xfer.py  | 10 +++++-----
 tests/net_inet/ssl_errors.py               |  2 +-
 tests/net_inet/test_tls_nonblock.py        |  6 +++---
 19 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/tests/extmod/btree1.py b/tests/extmod/btree1.py
index 4890d92b42..1f4853eaa3 100644
--- a/tests/extmod/btree1.py
+++ b/tests/extmod/btree1.py
@@ -65,7 +65,7 @@ print(db.seq(1, b"qux"))
 try:
     db.seq(b"foo1")
 except OSError as e:
-    print(e.args[0] == uerrno.EINVAL)
+    print(e.errno == uerrno.EINVAL)
 
 print(list(db.keys()))
 print(list(db.values()))
diff --git a/tests/extmod/btree_error.py b/tests/extmod/btree_error.py
index 00e07ec8c7..b64769e884 100644
--- a/tests/extmod/btree_error.py
+++ b/tests/extmod/btree_error.py
@@ -27,7 +27,7 @@ class Device(uio.IOBase):
 try:
     db = btree.open(Device(), pagesize=511)
 except OSError as er:
-    print("OSError", er.args[0] == uerrno.EINVAL)
+    print("OSError", er.errno == uerrno.EINVAL)
 
 # Valid pagesize, device returns error on read; errno comes from Device.readinto
 try:
diff --git a/tests/extmod/uselect_poll_basic.py b/tests/extmod/uselect_poll_basic.py
index 07328365b3..97fbd6fd15 100644
--- a/tests/extmod/uselect_poll_basic.py
+++ b/tests/extmod/uselect_poll_basic.py
@@ -33,7 +33,7 @@ poller.unregister(s)
 try:
     poller.modify(s, select.POLLIN)
 except OSError as e:
-    assert e.args[0] == errno.ENOENT
+    assert e.errno == errno.ENOENT
 
 # poll after closing the socket, should return POLLNVAL
 poller.register(s)
diff --git a/tests/extmod/usocket_tcp_basic.py b/tests/extmod/usocket_tcp_basic.py
index 368dfe3c98..c2fe8cd14c 100644
--- a/tests/extmod/usocket_tcp_basic.py
+++ b/tests/extmod/usocket_tcp_basic.py
@@ -14,4 +14,4 @@ s = socket.socket()
 try:
     s.recv(1)
 except OSError as er:
-    print("ENOTCONN:", er.args[0] == errno.ENOTCONN)
+    print("ENOTCONN:", er.errno == errno.ENOTCONN)
diff --git a/tests/extmod/usocket_udp_nonblock.py b/tests/extmod/usocket_udp_nonblock.py
index 7dc0e562a3..bc560de142 100644
--- a/tests/extmod/usocket_udp_nonblock.py
+++ b/tests/extmod/usocket_udp_nonblock.py
@@ -17,4 +17,4 @@ s.settimeout(0)
 try:
     s.recv(1)
 except OSError as er:
-    print("EAGAIN:", er.args[0] == errno.EAGAIN)
+    print("EAGAIN:", er.errno == errno.EAGAIN)
diff --git a/tests/extmod/vfs_fat_fileio1.py b/tests/extmod/vfs_fat_fileio1.py
index e42911093f..7da08b80cf 100644
--- a/tests/extmod/vfs_fat_fileio1.py
+++ b/tests/extmod/vfs_fat_fileio1.py
@@ -58,22 +58,22 @@ f.close()  # allowed
 try:
     f.write("world!")
 except OSError as e:
-    print(e.args[0] == uerrno.EINVAL)
+    print(e.errno == uerrno.EINVAL)
 
 try:
     f.read()
 except OSError as e:
-    print(e.args[0] == uerrno.EINVAL)
+    print(e.errno == uerrno.EINVAL)
 
 try:
     f.flush()
 except OSError as e:
-    print(e.args[0] == uerrno.EINVAL)
+    print(e.errno == uerrno.EINVAL)
 
 try:
     open("foo_file.txt", "x")
 except OSError as e:
-    print(e.args[0] == uerrno.EEXIST)
+    print(e.errno == uerrno.EEXIST)
 
 with open("foo_file.txt", "a") as f:
     f.write("world!")
@@ -105,7 +105,7 @@ vfs.mkdir("foo_dir")
 try:
     vfs.rmdir("foo_file.txt")
 except OSError as e:
-    print(e.args[0] == 20)  # uerrno.ENOTDIR
+    print(e.errno == 20)  # uerrno.ENOTDIR
 
 vfs.remove("foo_file.txt")
 print(list(vfs.ilistdir()))
diff --git a/tests/extmod/vfs_fat_fileio2.py b/tests/extmod/vfs_fat_fileio2.py
index 531dd91f94..13978a0af6 100644
--- a/tests/extmod/vfs_fat_fileio2.py
+++ b/tests/extmod/vfs_fat_fileio2.py
@@ -51,22 +51,22 @@ uos.chdir("/ramdisk")
 try:
     vfs.mkdir("foo_dir")
 except OSError as e:
-    print(e.args[0] == uerrno.EEXIST)
+    print(e.errno == uerrno.EEXIST)
 
 try:
     vfs.remove("foo_dir")
 except OSError as e:
-    print(e.args[0] == uerrno.EISDIR)
+    print(e.errno == uerrno.EISDIR)
 
 try:
     vfs.remove("no_file.txt")
 except OSError as e:
-    print(e.args[0] == uerrno.ENOENT)
+    print(e.errno == uerrno.ENOENT)
 
 try:
     vfs.rename("foo_dir", "/null/file")
 except OSError as e:
-    print(e.args[0] == uerrno.ENOENT)
+    print(e.errno == uerrno.ENOENT)
 
 # file in dir
 with open("foo_dir/file-in-dir.txt", "w+t") as f:
@@ -82,7 +82,7 @@ with open("foo_dir/sub_file.txt", "w") as f:
 try:
     vfs.rmdir("foo_dir")
 except OSError as e:
-    print(e.args[0] == uerrno.EACCES)
+    print(e.errno == uerrno.EACCES)
 
 # trim full path
 vfs.rename("foo_dir/file-in-dir.txt", "foo_dir/file.txt")
@@ -111,5 +111,5 @@ try:
     f = open("large_file.txt", "wb")
     f.write(bytearray(bsize * free))
 except OSError as e:
-    print("ENOSPC:", e.args[0] == 28)  # uerrno.ENOSPC
+    print("ENOSPC:", e.errno == 28)  # uerrno.ENOSPC
 f.close()
diff --git a/tests/extmod/vfs_fat_more.py b/tests/extmod/vfs_fat_more.py
index 076802f6ad..f9b54fda00 100644
--- a/tests/extmod/vfs_fat_more.py
+++ b/tests/extmod/vfs_fat_more.py
@@ -90,7 +90,7 @@ for exist in ("", "/", "dir", "/dir", "dir/subdir"):
     try:
         uos.mkdir(exist)
     except OSError as er:
-        print("mkdir OSError", er.args[0] == 17)  # EEXIST
+        print("mkdir OSError", er.errno == 17)  # EEXIST
 
 uos.chdir("/")
 print(uos.stat("test5.txt")[:-3])
diff --git a/tests/extmod/vfs_fat_ramdisk.py b/tests/extmod/vfs_fat_ramdisk.py
index 9a68d94fed..4decb5557d 100644
--- a/tests/extmod/vfs_fat_ramdisk.py
+++ b/tests/extmod/vfs_fat_ramdisk.py
@@ -57,7 +57,7 @@ print("getcwd:", vfs.getcwd())
 try:
     vfs.stat("no_file.txt")
 except OSError as e:
-    print(e.args[0] == uerrno.ENOENT)
+    print(e.errno == uerrno.ENOENT)
 
 with vfs.open("foo_file.txt", "w") as f:
     f.write("hello!")
@@ -80,7 +80,7 @@ with vfs.open("sub_file.txt", "w") as f:
 try:
     vfs.chdir("sub_file.txt")
 except OSError as e:
-    print(e.args[0] == uerrno.ENOENT)
+    print(e.errno == uerrno.ENOENT)
 
 vfs.chdir("..")
 print("getcwd:", vfs.getcwd())
@@ -94,4 +94,4 @@ print(list(vfs.ilistdir(b"")))
 try:
     vfs.ilistdir(b"no_exist")
 except OSError as e:
-    print("ENOENT:", e.args[0] == uerrno.ENOENT)
+    print("ENOENT:", e.errno == uerrno.ENOENT)
diff --git a/tests/extmod/websocket_basic.py b/tests/extmod/websocket_basic.py
index 10396e914d..a07542f965 100644
--- a/tests/extmod/websocket_basic.py
+++ b/tests/extmod/websocket_basic.py
@@ -59,4 +59,4 @@ print(ws.ioctl(9))
 try:
     ws.ioctl(-1)
 except OSError as e:
-    print("ioctl: EINVAL:", e.args[0] == uerrno.EINVAL)
+    print("ioctl: EINVAL:", e.errno == uerrno.EINVAL)
diff --git a/tests/multi_net/tcp_accept_recv.py b/tests/multi_net/tcp_accept_recv.py
index d61108ed1c..f93ede3bf4 100644
--- a/tests/multi_net/tcp_accept_recv.py
+++ b/tests/multi_net/tcp_accept_recv.py
@@ -17,7 +17,7 @@ def instance0():
     try:
         print("recv", s.recv(10))  # should raise Errno 107 ENOTCONN
     except OSError as er:
-        print(er.args[0])
+        print(er.errno)
     s.close()
 
 
diff --git a/tests/multi_net/tcp_client_rst.py b/tests/multi_net/tcp_client_rst.py
index 08f262db50..14da8b1470 100644
--- a/tests/multi_net/tcp_client_rst.py
+++ b/tests/multi_net/tcp_client_rst.py
@@ -33,7 +33,7 @@ def instance0():
         print(s2.recv(10))
         print(convert_poll_list(poll.poll(1000)))
     except OSError as er:
-        print(er.args[0])
+        print(er.errno)
     print(convert_poll_list(poll.poll(1000)))
     # TODO lwip raises here but apparently it shouldn't
     print(s2.recv(10))
diff --git a/tests/multi_net/uasyncio_tcp_client_rst.py b/tests/multi_net/uasyncio_tcp_client_rst.py
index a3a05490c7..d81f22748e 100644
--- a/tests/multi_net/uasyncio_tcp_client_rst.py
+++ b/tests/multi_net/uasyncio_tcp_client_rst.py
@@ -24,7 +24,7 @@ async def handle_connection(reader, writer):
         writer.close()
         await writer.wait_closed()
     except OSError as er:
-        print("OSError", er.args[0])
+        print("OSError", er.errno)
     ev.set()
 
 
diff --git a/tests/net_hosted/accept_nonblock.py b/tests/net_hosted/accept_nonblock.py
index 941965e178..d17e287498 100644
--- a/tests/net_hosted/accept_nonblock.py
+++ b/tests/net_hosted/accept_nonblock.py
@@ -12,5 +12,5 @@ s.listen(1)
 try:
     s.accept()
 except OSError as er:
-    print(er.args[0] == 11)  # 11 is EAGAIN
+    print(er.errno == 11)  # 11 is EAGAIN
 s.close()
diff --git a/tests/net_hosted/accept_timeout.py b/tests/net_hosted/accept_timeout.py
index 5f528d557d..734fe217ca 100644
--- a/tests/net_hosted/accept_timeout.py
+++ b/tests/net_hosted/accept_timeout.py
@@ -18,5 +18,5 @@ s.listen(1)
 try:
     s.accept()
 except OSError as er:
-    print(er.args[0] in (errno.ETIMEDOUT, "timed out"))  # CPython uses a string instead of errno
+    print(er.errno in (errno.ETIMEDOUT, "timed out"))  # CPython uses a string instead of errno
 s.close()
diff --git a/tests/net_hosted/connect_nonblock.py b/tests/net_hosted/connect_nonblock.py
index c024b65a0a..4b8055c161 100644
--- a/tests/net_hosted/connect_nonblock.py
+++ b/tests/net_hosted/connect_nonblock.py
@@ -13,7 +13,7 @@ def test(peer_addr):
     try:
         s.connect(peer_addr)
     except OSError as er:
-        print(er.args[0] == errno.EINPROGRESS)
+        print(er.errno == errno.EINPROGRESS)
     s.close()
 
 
diff --git a/tests/net_hosted/connect_nonblock_xfer.py b/tests/net_hosted/connect_nonblock_xfer.py
index feb648ea0a..1a0b242276 100644
--- a/tests/net_hosted/connect_nonblock_xfer.py
+++ b/tests/net_hosted/connect_nonblock_xfer.py
@@ -25,9 +25,9 @@ def do_connect(peer_addr, tls, handshake):
         # print("Connecting to", peer_addr)
         s.connect(peer_addr)
     except OSError as er:
-        print("connect:", er.args[0] == errno.EINPROGRESS)
-        if er.args[0] != errno.EINPROGRESS:
-            print("  got", er.args[0])
+        print("connect:", er.errno == errno.EINPROGRESS)
+        if er.errno != errno.EINPROGRESS:
+            print("  got", er.errno)
     # wrap with ssl/tls if desired
     if tls:
         try:
@@ -67,7 +67,7 @@ def test(peer_addr, tls=False, handshake=False):
         except OSError as er:
             #
             dp(er)
-            print("send:", er.args[0] in (errno.EAGAIN, errno.EINPROGRESS))
+            print("send:", er.errno in (errno.EAGAIN, errno.EINPROGRESS))
         s.close()
     else:  # fake it...
         print("connect:", True)
@@ -103,7 +103,7 @@ def test(peer_addr, tls=False, handshake=False):
             print("recv:", s.recv(10))
         except OSError as er:
             dp(er)
-            print("recv:", er.args[0] == errno.EAGAIN)
+            print("recv:", er.errno == errno.EAGAIN)
         s.close()
     else:  # fake it...
         print("connect:", True)
diff --git a/tests/net_inet/ssl_errors.py b/tests/net_inet/ssl_errors.py
index fd281b1c49..ece1f6e253 100644
--- a/tests/net_inet/ssl_errors.py
+++ b/tests/net_inet/ssl_errors.py
@@ -17,7 +17,7 @@ def test(addr, hostname, block=True):
         s.connect(addr)
         print("connected")
     except OSError as e:
-        if e.args[0] != errno.EINPROGRESS:
+        if e.errno != errno.EINPROGRESS:
             raise
         print("EINPROGRESS")
 
diff --git a/tests/net_inet/test_tls_nonblock.py b/tests/net_inet/test_tls_nonblock.py
index c27ead3d50..54abc6966f 100644
--- a/tests/net_inet/test_tls_nonblock.py
+++ b/tests/net_inet/test_tls_nonblock.py
@@ -16,7 +16,7 @@ def test_one(site, opts):
         s.connect(addr)
         raise OSError(-1, "connect blocks")
     except OSError as e:
-        if e.args[0] != errno.EINPROGRESS:
+        if e.errno != errno.EINPROGRESS:
             raise
 
     if sys.implementation.name != "micropython":
@@ -31,7 +31,7 @@ def test_one(site, opts):
             else:
                 s = ssl.wrap_socket(s, do_handshake_on_connect=False)
         except OSError as e:
-            if e.args[0] != errno.EINPROGRESS:
+            if e.errno != errno.EINPROGRESS:
                 raise
         print("wrapped")
 
@@ -69,7 +69,7 @@ def test_one(site, opts):
             try:
                 b = s.read(128)
             except OSError as err:
-                if err.args[0] == 2:  # 2=ssl.SSL_ERROR_WANT_READ:
+                if err.errno == 2:  # 2=ssl.SSL_ERROR_WANT_READ:
                     continue
                 raise
             if b is None:

From 178198a01df51b5f4c5ef9f38ab2fb8f6269d5f4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 21 Apr 2021 11:00:43 +1000
Subject: [PATCH 010/349] tools/pyboard.py: Support opening serial port in
 exclusive mode.

This is now the default, but can be overridden with CLI `--no-exclusive`,
or constructing `Pyboard(..., exclusive=False)`.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/pyboard.py | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index 069f7490d0..29a15f7eae 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -4,7 +4,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright (c) 2014-2019 Damien P. George
+# Copyright (c) 2014-2021 Damien P. George
 # Copyright (c) 2017 Paul Sokolovsky
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -252,7 +252,9 @@ class ProcessPtyToTerminal:
 
 
 class Pyboard:
-    def __init__(self, device, baudrate=115200, user="micro", password="python", wait=0):
+    def __init__(
+        self, device, baudrate=115200, user="micro", password="python", wait=0, exclusive=True
+    ):
         self.use_raw_paste = True
         if device.startswith("exec:"):
             self.serial = ProcessToSerial(device[len("exec:") :])
@@ -264,10 +266,15 @@ class Pyboard:
         else:
             import serial
 
+            # Set options, and exclusive if pyserial supports it
+            serial_kwargs = {"baudrate": baudrate, "interCharTimeout": 1}
+            if serial.__version__ >= "3.3":
+                serial_kwargs["exclusive"] = exclusive
+
             delayed = False
             for attempt in range(wait + 1):
                 try:
-                    self.serial = serial.Serial(device, baudrate=baudrate, interCharTimeout=1)
+                    self.serial = serial.Serial(device, **serial_kwargs)
                     break
                 except (OSError, IOError):  # Py2 and Py3 have different errors
                     if wait == 0:
@@ -650,6 +657,11 @@ def main():
         action="store_true",
         help="Do not follow the output after running the scripts.",
     )
+    group.add_argument(
+        "--no-exclusive",
+        action="store_true",
+        help="Do not try to open the serial device for exclusive access.",
+    )
     cmd_parser.add_argument(
         "-f",
         "--filesystem",
@@ -662,7 +674,9 @@ def main():
 
     # open the connection to the pyboard
     try:
-        pyb = Pyboard(args.device, args.baudrate, args.user, args.password, args.wait)
+        pyb = Pyboard(
+            args.device, args.baudrate, args.user, args.password, args.wait, not args.no_exclusive
+        )
     except PyboardError as er:
         print(er)
         sys.exit(1)

From df4e9bdf5c69e36775de313b098651bbd97132a7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 22 Apr 2021 10:26:52 +1000
Subject: [PATCH 011/349] esp32/CMakeLists.txt: Require CMake version 3.12.

Because "find_package(Python3 ...)" requires at least this version of
CMake.  And other features like GREATER_EQUAL and COMMAND_EXPAND_LISTS need
at least CMake 3.7 and 3.8 respectively.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/CMakeLists.txt b/ports/esp32/CMakeLists.txt
index fa419202f9..29409adc74 100644
--- a/ports/esp32/CMakeLists.txt
+++ b/ports/esp32/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Top-level cmake file for building MicroPython on ESP32.
 
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
 
 # Set the location of this port's directory.
 set(MICROPY_PORT_DIR ${CMAKE_SOURCE_DIR})

From bb2007b05ccf0e41684cc61f1677c11b7df93f7a Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 22 Apr 2021 18:01:46 +0200
Subject: [PATCH 012/349] windows/mpconfigport.h: Enable features also present
 in unix port.

---
 ports/windows/mpconfigport.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index faf10752ee..6421c93bdb 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -65,6 +65,7 @@
 #define MICROPY_VFS_POSIX_FILE      (1)
 #define MICROPY_PY_FUNCTION_ATTRS   (1)
 #define MICROPY_PY_DESCRIPTORS      (1)
+#define MICROPY_PY_DELATTR_SETATTR  (1)
 #define MICROPY_PY_BUILTINS_STR_UNICODE (1)
 #define MICROPY_PY_BUILTINS_STR_CENTER (1)
 #define MICROPY_PY_BUILTINS_STR_PARTITION (1)
@@ -75,12 +76,14 @@
 #define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (1)
 #define MICROPY_PY_BUILTINS_INPUT   (1)
 #define MICROPY_PY_BUILTINS_POW3    (1)
+#define MICROPY_PY_BUILTINS_ROUND_INT (1)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
 #define MICROPY_PY_ALL_SPECIAL_METHODS (1)
 #define MICROPY_PY_REVERSE_SPECIAL_METHODS (1)
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
 #define MICROPY_PY_BUILTINS_SLICE_ATTRS (1)
 #define MICROPY_PY_SYS_EXIT         (1)
+#define MICROPY_PY_SYS_ATEXIT       (1)
 #define MICROPY_PY_SYS_PLATFORM     "win32"
 #ifndef MICROPY_PY_SYS_PATH_DEFAULT
 #define MICROPY_PY_SYS_PATH_DEFAULT "~/.micropython/lib"
@@ -93,6 +96,7 @@
 #define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (1)
 #define MICROPY_PY_MATH_ISCLOSE     (1)
 #define MICROPY_PY_CMATH            (1)
+#define MICROPY_PY_IO_IOBASE        (1)
 #define MICROPY_PY_IO_FILEIO        (1)
 #define MICROPY_PY_GC_COLLECT_RETVAL (1)
 #define MICROPY_MODULE_FROZEN_STR   (0)

From a1bc32d8a8fbb09bc04c2ca07b10475f7ddde8c3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 23 Apr 2021 23:44:37 +1000
Subject: [PATCH 013/349] drivers/sdcard: Add sleep_ms(1) delay in
 SDCard.readinto sync loop.

So this driver works on faster MCUs (that run this loop fast) with older,
slower SD cards.

Fixes issue #7129.

Signed-off-by: Damien George <damien@micropython.org>
---
 drivers/sdcard/sdcard.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/sdcard/sdcard.py b/drivers/sdcard/sdcard.py
index c991fe5608..0ba3076a3d 100644
--- a/drivers/sdcard/sdcard.py
+++ b/drivers/sdcard/sdcard.py
@@ -176,6 +176,7 @@ class SDCard:
             self.spi.readinto(self.tokenbuf, 0xFF)
             if self.tokenbuf[0] == _TOKEN_DATA:
                 break
+            time.sleep_ms(1)
         else:
             self.cs(1)
             raise OSError("timeout waiting for response")

From 530c76f6caee9445f468380f58b98f4e3ceda759 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 24 Apr 2021 00:10:59 +1000
Subject: [PATCH 014/349] lib/utils: Remove unused PYEXEC_SWITCH_MODE from
 pyexec.h.

It was made obsolete by commit c98c128fe885e539ecd73843756340f8950115c8.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/utils/pyexec.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/utils/pyexec.h b/lib/utils/pyexec.h
index f69c5ce9a8..981e7dca9f 100644
--- a/lib/utils/pyexec.h
+++ b/lib/utils/pyexec.h
@@ -41,7 +41,6 @@ extern pyexec_mode_kind_t pyexec_mode_kind;
 extern int pyexec_system_exit;
 
 #define PYEXEC_FORCED_EXIT (0x100)
-#define PYEXEC_SWITCH_MODE (0x200)
 
 int pyexec_raw_repl(void);
 int pyexec_friendly_repl(void);

From 65b90cd0f9cb3ee8b5954820cd6d68b782121cd1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 22 Apr 2021 11:04:58 +1000
Subject: [PATCH 015/349] teensy: Provide own implementation of gc_collect, to
 not use stm32.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/teensy/Makefile | 1 -
 ports/teensy/main.c   | 7 +++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ports/teensy/Makefile b/ports/teensy/Makefile
index d3978718e0..cf9529442a 100644
--- a/ports/teensy/Makefile
+++ b/ports/teensy/Makefile
@@ -95,7 +95,6 @@ SRC_C = \
 	usb.c \
 
 STM_SRC_C = $(addprefix ports/stm32/,\
-	gccollect.c \
 	irq.c \
 	pin.c \
 	pin_named_pins.c \
diff --git a/ports/teensy/main.c b/ports/teensy/main.c
index df3fd1ffcf..d4c5f0396f 100644
--- a/ports/teensy/main.c
+++ b/ports/teensy/main.c
@@ -9,6 +9,7 @@
 #include "py/gc.h"
 #include "py/mphal.h"
 #include "gccollect.h"
+#include "lib/utils/gchelper.h"
 #include "lib/utils/pyexec.h"
 #include "lib/mp-readline/readline.h"
 #include "lexermemzip.h"
@@ -349,6 +350,12 @@ soft_reset:
     goto soft_reset;
 }
 
+void gc_collect(void) {
+    gc_collect_start();
+    gc_helper_collect_regs_and_stack();
+    gc_collect_end();
+}
+
 // stub out __libc_init_array. It's called by mk20dx128.c and is used to call
 // global C++ constructors. Since this is a C-only projects, we don't need to
 // call constructors.

From 0f78c36c5aa458a954eed39a46942209107a553e Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 27 Apr 2021 01:15:43 +0200
Subject: [PATCH 016/349] tools/gen-cpydiff.py: Fix formatting of doc strings
 for new Black.

Since version 21.4b0, Black now processes one-line docstrings by stripping
leading and trailing spaces, and adding a padding space when needed to
break up """"; see https://github.com/psf/black/pull/1740

This commit makes the Python code in this repository conform to this rule.
---
 tools/gen-cpydiff.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/gen-cpydiff.py b/tools/gen-cpydiff.py
index c45bad1058..c9f58ec505 100644
--- a/tools/gen-cpydiff.py
+++ b/tools/gen-cpydiff.py
@@ -74,7 +74,7 @@ Output = namedtuple(
 
 
 def readfiles():
-    """ Reads test files """
+    """Reads test files"""
     tests = list(filter(lambda x: x.endswith(".py"), os.listdir(TESTPATH)))
     tests.sort()
     files = []
@@ -95,7 +95,7 @@ def readfiles():
 
 
 def uimports(code):
-    """ converts CPython module names into MicroPython equivalents """
+    """converts CPython module names into MicroPython equivalents"""
     for uimport in UIMPORTLIST:
         uimport = bytes(uimport, "utf8")
         code = code.replace(uimport, b"u" + uimport)
@@ -103,7 +103,7 @@ def uimports(code):
 
 
 def run_tests(tests):
-    """ executes all tests """
+    """executes all tests"""
     results = []
     for test in tests:
         with open(TESTPATH + test.name, "rb") as f:
@@ -152,7 +152,7 @@ def run_tests(tests):
 
 
 def indent(block, spaces):
-    """ indents paragraphs of text for rst formatting """
+    """indents paragraphs of text for rst formatting"""
     new_block = ""
     for line in block.split("\n"):
         new_block += spaces + line + "\n"
@@ -160,7 +160,7 @@ def indent(block, spaces):
 
 
 def gen_table(contents):
-    """ creates a table given any set of columns """
+    """creates a table given any set of columns"""
     xlengths = []
     ylengths = []
     for column in contents:
@@ -194,7 +194,7 @@ def gen_table(contents):
 
 
 def gen_rst(results):
-    """ creates restructured text documents to display tests """
+    """creates restructured text documents to display tests"""
 
     # make sure the destination directory exists
     try:
@@ -254,7 +254,7 @@ def gen_rst(results):
 
 
 def main():
-    """ Main function """
+    """Main function"""
 
     # set search path so that test scripts find the test modules (and no other ones)
     os.environ["PYTHONPATH"] = TESTPATH

From 30d9f77cc535306eeb9eed6f17e71355fd58995a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 27 Apr 2021 23:46:46 +1000
Subject: [PATCH 017/349] top: Update .git-blame-ignore-revs for latest
 formatting commit.

Signed-off-by: Damien George <damien@micropython.org>
---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 83726922a5..c5039f58b5 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,3 +1,6 @@
+# tools/gen-cpydiff.py: Fix formatting of doc strings for new Black.
+0f78c36c5aa458a954eed39a46942209107a553e
+
 # tests/run-tests.py: Reformat with Black.
 2a38d7103672580882fb621a5b76e8d26805d593
 

From d4b706c4d01377d42855ff1544ced77536f69caf Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 22 Apr 2021 12:13:58 +1000
Subject: [PATCH 018/349] py: Add option to compile without any error messages
 at all.

This introduces a new option, MICROPY_ERROR_REPORTING_NONE, which
completely disables all error messages.  To be used in cases where
MicroPython needs to fit in very limited systems.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/argcheck.c      | 14 ++++++------
 py/bc.c            |  4 ++--
 py/builtinimport.c |  4 ++--
 py/compile.c       |  4 ++--
 py/misc.h          |  4 ++++
 py/modbuiltins.c   |  2 +-
 py/mpconfig.h      |  2 ++
 py/obj.c           | 20 ++++++++---------
 py/obj.h           |  5 +++++
 py/objexcept.c     |  4 ++++
 py/objnamedtuple.c |  6 +++---
 py/objstr.c        | 38 ++++++++++++++++----------------
 py/objtype.c       |  8 +++----
 py/parsenum.c      |  2 +-
 py/runtime.c       | 54 ++++++++++++++++++++++++++++++++--------------
 py/runtime.h       | 13 +++++++++++
 16 files changed, 117 insertions(+), 67 deletions(-)

diff --git a/py/argcheck.c b/py/argcheck.c
index c333ead05b..ffcca4cb65 100644
--- a/py/argcheck.c
+++ b/py/argcheck.c
@@ -38,7 +38,7 @@ void mp_arg_check_num_sig(size_t n_args, size_t n_kw, uint32_t sig) {
     size_t n_args_max = (sig >> 1) & 0xffff;
 
     if (n_kw && !takes_kw) {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_arg_error_terse_mismatch();
         #else
         mp_raise_TypeError(MP_ERROR_TEXT("function doesn't take keyword arguments"));
@@ -47,7 +47,7 @@ void mp_arg_check_num_sig(size_t n_args, size_t n_kw, uint32_t sig) {
 
     if (n_args_min == n_args_max) {
         if (n_args != n_args_min) {
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             mp_arg_error_terse_mismatch();
             #else
             mp_raise_msg_varg(&mp_type_TypeError,
@@ -57,7 +57,7 @@ void mp_arg_check_num_sig(size_t n_args, size_t n_kw, uint32_t sig) {
         }
     } else {
         if (n_args < n_args_min) {
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             mp_arg_error_terse_mismatch();
             #else
             mp_raise_msg_varg(&mp_type_TypeError,
@@ -65,7 +65,7 @@ void mp_arg_check_num_sig(size_t n_args, size_t n_kw, uint32_t sig) {
                 n_args_min - n_args);
             #endif
         } else if (n_args > n_args_max) {
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             mp_arg_error_terse_mismatch();
             #else
             mp_raise_msg_varg(&mp_type_TypeError,
@@ -90,7 +90,7 @@ void mp_arg_parse_all(size_t n_pos, const mp_obj_t *pos, mp_map_t *kws, size_t n
             mp_map_elem_t *kw = mp_map_lookup(kws, MP_OBJ_NEW_QSTR(allowed[i].qst), MP_MAP_LOOKUP);
             if (kw == NULL) {
                 if (allowed[i].flags & MP_ARG_REQUIRED) {
-                    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                     mp_arg_error_terse_mismatch();
                     #else
                     mp_raise_msg_varg(&mp_type_TypeError, MP_ERROR_TEXT("'%q' argument required"), allowed[i].qst);
@@ -114,7 +114,7 @@ void mp_arg_parse_all(size_t n_pos, const mp_obj_t *pos, mp_map_t *kws, size_t n
     }
     if (pos_found < n_pos) {
     extra_positional:
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_arg_error_terse_mismatch();
         #else
         // TODO better error message
@@ -122,7 +122,7 @@ void mp_arg_parse_all(size_t n_pos, const mp_obj_t *pos, mp_map_t *kws, size_t n
         #endif
     }
     if (kws_found < kws->used) {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_arg_error_terse_mismatch();
         #else
         // TODO better error message
diff --git a/py/bc.c b/py/bc.c
index 34bc78fd3a..58694b97dc 100644
--- a/py/bc.c
+++ b/py/bc.c
@@ -75,7 +75,7 @@ const byte *mp_decode_uint_skip(const byte *ptr) {
 #endif
 
 STATIC NORETURN void fun_pos_args_mismatch(mp_obj_fun_bc_t *f, size_t expected, size_t given) {
-    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
     // generic message, used also for other argument issues
     (void)f;
     (void)expected;
@@ -212,7 +212,7 @@ void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw
             }
             // Didn't find name match with positional args
             if ((scope_flags & MP_SCOPE_FLAG_VARKEYWORDS) == 0) {
-                #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                 mp_raise_TypeError(MP_ERROR_TEXT("unexpected keyword argument"));
                 #else
                 mp_raise_msg_varg(&mp_type_TypeError,
diff --git a/py/builtinimport.c b/py/builtinimport.c
index bdc82e77c8..874d2dd7f0 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -396,7 +396,7 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
                 #endif
                 if (module_obj == MP_OBJ_NULL) {
                     // couldn't find the file, so fail
-                    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                     mp_raise_msg(&mp_type_ImportError, MP_ERROR_TEXT("module not found"));
                     #else
                     mp_raise_msg_varg(&mp_type_ImportError, MP_ERROR_TEXT("no module named '%q'"), mod_name);
@@ -499,7 +499,7 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
     #endif
 
     // Couldn't find the module, so fail
-    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
     mp_raise_msg(&mp_type_ImportError, MP_ERROR_TEXT("module not found"));
     #else
     mp_raise_msg_varg(&mp_type_ImportError, MP_ERROR_TEXT("no module named '%q'"), module_name_qstr);
diff --git a/py/compile.c b/py/compile.c
index d1a4d65c8b..1182b8b1eb 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -2597,7 +2597,7 @@ STATIC void compile_atom_brace_helper(compiler_t *comp, mp_parse_node_struct_t *
                     compile_node(comp, pn_i);
                     if (is_dict) {
                         if (!is_key_value) {
-                            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                             compile_syntax_error(comp, (mp_parse_node_t)pns, MP_ERROR_TEXT("invalid syntax"));
                             #else
                             compile_syntax_error(comp, (mp_parse_node_t)pns, MP_ERROR_TEXT("expecting key:value for dict"));
@@ -2607,7 +2607,7 @@ STATIC void compile_atom_brace_helper(compiler_t *comp, mp_parse_node_struct_t *
                         EMIT(store_map);
                     } else {
                         if (is_key_value) {
-                            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                             compile_syntax_error(comp, (mp_parse_node_t)pns, MP_ERROR_TEXT("invalid syntax"));
                             #else
                             compile_syntax_error(comp, (mp_parse_node_t)pns, MP_ERROR_TEXT("expecting just a value for set"));
diff --git a/py/misc.h b/py/misc.h
index fe2b3b8afa..9538098383 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -264,6 +264,10 @@ typedef union _mp_float_union_t {
 
 #if MICROPY_ROM_TEXT_COMPRESSION
 
+#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NONE
+#error "MICROPY_ERROR_REPORTING_NONE requires MICROPY_ROM_TEXT_COMPRESSION disabled"
+#endif
+
 #ifdef NO_QSTR
 
 // Compression enabled but doing QSTR extraction.
diff --git a/py/modbuiltins.c b/py/modbuiltins.c
index cfbfc5a256..ac41942b9c 100644
--- a/py/modbuiltins.c
+++ b/py/modbuiltins.c
@@ -372,7 +372,7 @@ STATIC mp_obj_t mp_builtin_ord(mp_obj_t o_in) {
         }
     }
 
-    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
     mp_raise_TypeError(MP_ERROR_TEXT("ord expects a character"));
     #else
     mp_raise_msg_varg(&mp_type_TypeError,
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 3dd83a34ab..5c7212fd1f 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -667,6 +667,8 @@ typedef long long mp_longint_impl_t;
 #define MICROPY_ENABLE_DOC_STRING (0)
 #endif
 
+// Exception messages are removed (requires disabling MICROPY_ROM_TEXT_COMPRESSION)
+#define MICROPY_ERROR_REPORTING_NONE     (0)
 // Exception messages are short static strings
 #define MICROPY_ERROR_REPORTING_TERSE    (1)
 // Exception messages provide basic error details
diff --git a/py/obj.c b/py/obj.c
index ed047acc39..f66a9d183c 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -359,7 +359,7 @@ mp_float_t mp_obj_get_float(mp_obj_t arg) {
     mp_float_t val;
 
     if (!mp_obj_get_float_maybe(arg, &val)) {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_raise_TypeError(MP_ERROR_TEXT("can't convert to float"));
         #else
         mp_raise_msg_varg(&mp_type_TypeError,
@@ -399,7 +399,7 @@ bool mp_obj_get_complex_maybe(mp_obj_t arg, mp_float_t *real, mp_float_t *imag)
 
 void mp_obj_get_complex(mp_obj_t arg, mp_float_t *real, mp_float_t *imag) {
     if (!mp_obj_get_complex_maybe(arg, real, imag)) {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_raise_TypeError(MP_ERROR_TEXT("can't convert to complex"));
         #else
         mp_raise_msg_varg(&mp_type_TypeError,
@@ -417,7 +417,7 @@ void mp_obj_get_array(mp_obj_t o, size_t *len, mp_obj_t **items) {
     } else if (mp_obj_is_type(o, &mp_type_list)) {
         mp_obj_list_get(o, len, items);
     } else {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_raise_TypeError(MP_ERROR_TEXT("expected tuple/list"));
         #else
         mp_raise_msg_varg(&mp_type_TypeError,
@@ -431,7 +431,7 @@ void mp_obj_get_array_fixed_n(mp_obj_t o, size_t len, mp_obj_t **items) {
     size_t seq_len;
     mp_obj_get_array(o, &seq_len, items);
     if (seq_len != len) {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_raise_ValueError(MP_ERROR_TEXT("tuple/list has wrong length"));
         #else
         mp_raise_msg_varg(&mp_type_ValueError,
@@ -446,7 +446,7 @@ size_t mp_get_index(const mp_obj_type_t *type, size_t len, mp_obj_t index, bool
     if (mp_obj_is_small_int(index)) {
         i = MP_OBJ_SMALL_INT_VALUE(index);
     } else if (!mp_obj_get_int_maybe(index, &i)) {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_raise_TypeError(MP_ERROR_TEXT("indices must be integers"));
         #else
         mp_raise_msg_varg(&mp_type_TypeError,
@@ -466,7 +466,7 @@ size_t mp_get_index(const mp_obj_type_t *type, size_t len, mp_obj_t index, bool
         }
     } else {
         if (i < 0 || (mp_uint_t)i >= len) {
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             mp_raise_msg(&mp_type_IndexError, MP_ERROR_TEXT("index out of range"));
             #else
             mp_raise_msg_varg(&mp_type_IndexError, MP_ERROR_TEXT("%q index out of range"), type->name);
@@ -500,7 +500,7 @@ mp_obj_t mp_obj_id(mp_obj_t o_in) {
 mp_obj_t mp_obj_len(mp_obj_t o_in) {
     mp_obj_t len = mp_obj_len_maybe(o_in);
     if (len == MP_OBJ_NULL) {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_raise_TypeError(MP_ERROR_TEXT("object has no len"));
         #else
         mp_raise_msg_varg(&mp_type_TypeError,
@@ -541,21 +541,21 @@ mp_obj_t mp_obj_subscr(mp_obj_t base, mp_obj_t index, mp_obj_t value) {
         // TODO: call base classes here?
     }
     if (value == MP_OBJ_NULL) {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_raise_TypeError(MP_ERROR_TEXT("object doesn't support item deletion"));
         #else
         mp_raise_msg_varg(&mp_type_TypeError,
             MP_ERROR_TEXT("'%s' object doesn't support item deletion"), mp_obj_get_type_str(base));
         #endif
     } else if (value == MP_OBJ_SENTINEL) {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_raise_TypeError(MP_ERROR_TEXT("object isn't subscriptable"));
         #else
         mp_raise_msg_varg(&mp_type_TypeError,
             MP_ERROR_TEXT("'%s' object isn't subscriptable"), mp_obj_get_type_str(base));
         #endif
     } else {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_raise_TypeError(MP_ERROR_TEXT("object doesn't support item assignment"));
         #else
         mp_raise_msg_varg(&mp_type_TypeError,
diff --git a/py/obj.h b/py/obj.h
index 6a040b7773..86e5d83125 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -741,8 +741,13 @@ mp_obj_t mp_obj_new_complex(mp_float_t real, mp_float_t imag);
 mp_obj_t mp_obj_new_exception(const mp_obj_type_t *exc_type);
 mp_obj_t mp_obj_new_exception_arg1(const mp_obj_type_t *exc_type, mp_obj_t arg);
 mp_obj_t mp_obj_new_exception_args(const mp_obj_type_t *exc_type, size_t n_args, const mp_obj_t *args);
+#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NONE
+#define mp_obj_new_exception_msg(exc_type, msg) mp_obj_new_exception(exc_type)
+#define mp_obj_new_exception_msg_varg(exc_type, ...) mp_obj_new_exception(exc_type)
+#else
 mp_obj_t mp_obj_new_exception_msg(const mp_obj_type_t *exc_type, mp_rom_error_text_t msg);
 mp_obj_t mp_obj_new_exception_msg_varg(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, ...); // counts args by number of % symbols in fmt, excluding %%; can only handle void* sizes (ie no float/double!)
+#endif
 #ifdef va_start
 mp_obj_t mp_obj_new_exception_msg_vlist(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, va_list arg); // same fmt restrictions as above
 #endif
diff --git a/py/objexcept.c b/py/objexcept.c
index f6bffec383..f03bb1b416 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -373,6 +373,8 @@ mp_obj_t mp_obj_new_exception_args(const mp_obj_type_t *exc_type, size_t n_args,
     return mp_obj_exception_make_new(exc_type, n_args, 0, args);
 }
 
+#if MICROPY_ERROR_REPORTING != MICROPY_ERROR_REPORTING_NONE
+
 mp_obj_t mp_obj_new_exception_msg(const mp_obj_type_t *exc_type, mp_rom_error_text_t msg) {
     // Check that the given type is an exception type
     assert(exc_type->make_new == mp_obj_exception_make_new);
@@ -518,6 +520,8 @@ mp_obj_t mp_obj_new_exception_msg_vlist(const mp_obj_type_t *exc_type, mp_rom_er
     return mp_obj_exception_make_new(exc_type, 1, 0, &arg);
 }
 
+#endif
+
 // return true if the given object is an exception type
 bool mp_obj_is_exception_type(mp_obj_t self_in) {
     if (mp_obj_is_type(self_in, &mp_type_type)) {
diff --git a/py/objnamedtuple.c b/py/objnamedtuple.c
index e4543f5b9b..214cad2572 100644
--- a/py/objnamedtuple.c
+++ b/py/objnamedtuple.c
@@ -95,7 +95,7 @@ STATIC mp_obj_t namedtuple_make_new(const mp_obj_type_t *type_in, size_t n_args,
     const mp_obj_namedtuple_type_t *type = (const mp_obj_namedtuple_type_t *)type_in;
     size_t num_fields = type->n_fields;
     if (n_args + n_kw != num_fields) {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_arg_error_terse_mismatch();
         #elif MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NORMAL
         mp_raise_msg_varg(&mp_type_TypeError,
@@ -121,14 +121,14 @@ STATIC mp_obj_t namedtuple_make_new(const mp_obj_type_t *type_in, size_t n_args,
         qstr kw = mp_obj_str_get_qstr(args[i]);
         size_t id = mp_obj_namedtuple_find_field(type, kw);
         if (id == (size_t)-1) {
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             mp_arg_error_terse_mismatch();
             #else
             mp_raise_msg_varg(&mp_type_TypeError, MP_ERROR_TEXT("unexpected keyword argument '%q'"), kw);
             #endif
         }
         if (tuple->items[id] != MP_OBJ_NULL) {
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             mp_arg_error_terse_mismatch();
             #else
             mp_raise_msg_varg(&mp_type_TypeError,
diff --git a/py/objstr.c b/py/objstr.c
index 9f8da873d6..98657bd217 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -942,7 +942,7 @@ STATIC mp_obj_t arg_as_int(mp_obj_t arg) {
 }
 #endif
 
-#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
 STATIC NORETURN void terse_str_format_value_error(void) {
     mp_raise_ValueError(MP_ERROR_TEXT("bad format string"));
 }
@@ -963,7 +963,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
                 vstr_add_byte(&vstr, '}');
                 continue;
             }
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             terse_str_format_value_error();
             #else
             mp_raise_ValueError(MP_ERROR_TEXT("single '}' encountered in format string"));
@@ -1002,7 +1002,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
             if (str < top && (*str == 'r' || *str == 's')) {
                 conversion = *str++;
             } else {
-                #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                 terse_str_format_value_error();
                 #elif MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NORMAL
                 mp_raise_ValueError(MP_ERROR_TEXT("bad conversion specifier"));
@@ -1040,14 +1040,14 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
             }
         }
         if (str >= top) {
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             terse_str_format_value_error();
             #else
             mp_raise_ValueError(MP_ERROR_TEXT("unmatched '{' in format"));
             #endif
         }
         if (*str != '}') {
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             terse_str_format_value_error();
             #else
             mp_raise_ValueError(MP_ERROR_TEXT("expected ':' after format specifier"));
@@ -1060,7 +1060,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
             int index = 0;
             if (MP_LIKELY(unichar_isdigit(*field_name))) {
                 if (*arg_i > 0) {
-                    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                     terse_str_format_value_error();
                     #else
                     mp_raise_ValueError(
@@ -1090,7 +1090,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
             }
         } else {
             if (*arg_i < 0) {
-                #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                 terse_str_format_value_error();
                 #else
                 mp_raise_ValueError(
@@ -1183,7 +1183,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
                 type = *s++;
             }
             if (*s) {
-                #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                 terse_str_format_value_error();
                 #else
                 mp_raise_ValueError(MP_ERROR_TEXT("invalid format specifier"));
@@ -1204,14 +1204,14 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
 
         if (flags & (PF_FLAG_SHOW_SIGN | PF_FLAG_SPACE_SIGN)) {
             if (type == 's') {
-                #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                 terse_str_format_value_error();
                 #else
                 mp_raise_ValueError(MP_ERROR_TEXT("sign not allowed in string format specifier"));
                 #endif
             }
             if (type == 'c') {
-                #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                 terse_str_format_value_error();
                 #else
                 mp_raise_ValueError(
@@ -1275,7 +1275,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
                     break;
 
                 default:
-                    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                     terse_str_format_value_error();
                     #else
                     mp_raise_msg_varg(&mp_type_ValueError,
@@ -1347,7 +1347,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
                 #endif
 
                 default:
-                    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                     terse_str_format_value_error();
                     #else
                     mp_raise_msg_varg(&mp_type_ValueError,
@@ -1359,7 +1359,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
             // arg doesn't look like a number
 
             if (align == '=') {
-                #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                 terse_str_format_value_error();
                 #else
                 mp_raise_ValueError(
@@ -1383,7 +1383,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
                 }
 
                 default:
-                    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                     terse_str_format_value_error();
                     #else
                     mp_raise_msg_varg(&mp_type_ValueError,
@@ -1412,7 +1412,7 @@ STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, size_t n_args, const mp_obj_
     mp_check_self(mp_obj_is_str_or_bytes(pattern));
 
     GET_STR_DATA_LEN(pattern, str, len);
-    #if MICROPY_ERROR_REPORTING != MICROPY_ERROR_REPORTING_TERSE
+    #if MICROPY_ERROR_REPORTING > MICROPY_ERROR_REPORTING_TERSE
     const byte *start_str = str;
     #endif
     bool is_bytes = mp_obj_is_type(pattern, &mp_type_bytes);
@@ -1444,7 +1444,7 @@ STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, size_t n_args, const mp_obj_
             const byte *key = ++str;
             while (*str != ')') {
                 if (str >= top) {
-                    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                     terse_str_format_value_error();
                     #else
                     mp_raise_ValueError(MP_ERROR_TEXT("incomplete format key"));
@@ -1508,7 +1508,7 @@ STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, size_t n_args, const mp_obj_
 
         if (str >= top) {
         incomplete_format:
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             terse_str_format_value_error();
             #else
             mp_raise_ValueError(MP_ERROR_TEXT("incomplete format"));
@@ -1594,7 +1594,7 @@ STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, size_t n_args, const mp_obj_
                 break;
 
             default:
-                #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                 terse_str_format_value_error();
                 #else
                 mp_raise_msg_varg(&mp_type_ValueError,
@@ -2131,7 +2131,7 @@ bool mp_obj_str_equal(mp_obj_t s1, mp_obj_t s2) {
 }
 
 STATIC NORETURN void bad_implicit_conversion(mp_obj_t self_in) {
-    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
     mp_raise_TypeError(MP_ERROR_TEXT("can't convert to str implicitly"));
     #else
     const qstr src_name = mp_obj_get_type(self_in)->name;
diff --git a/py/objtype.c b/py/objtype.c
index 7f75232941..508bab99d3 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -348,7 +348,7 @@ mp_obj_t mp_obj_instance_make_new(const mp_obj_type_t *self, size_t n_args, size
             m_del(mp_obj_t, args2, 2 + n_args + 2 * n_kw);
         }
         if (init_ret != mp_const_none) {
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             mp_raise_TypeError(MP_ERROR_TEXT("__init__() should return None"));
             #else
             mp_raise_msg_varg(&mp_type_TypeError,
@@ -860,7 +860,7 @@ mp_obj_t mp_obj_instance_call(mp_obj_t self_in, size_t n_args, size_t n_kw, cons
     mp_obj_t member[2] = {MP_OBJ_NULL, MP_OBJ_NULL};
     mp_obj_t call = mp_obj_instance_get_call(self_in, member);
     if (call == MP_OBJ_NULL) {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_raise_TypeError(MP_ERROR_TEXT("object not callable"));
         #else
         mp_raise_msg_varg(&mp_type_TypeError,
@@ -985,7 +985,7 @@ STATIC mp_obj_t type_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp
     mp_obj_type_t *self = MP_OBJ_TO_PTR(self_in);
 
     if (self->make_new == NULL) {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_raise_TypeError(MP_ERROR_TEXT("can't create instance"));
         #else
         mp_raise_msg_varg(&mp_type_TypeError, MP_ERROR_TEXT("can't create '%q' instances"), self->name);
@@ -1125,7 +1125,7 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
         mp_obj_type_t *t = MP_OBJ_TO_PTR(bases_items[i]);
         // TODO: Verify with CPy, tested on function type
         if (t->make_new == NULL) {
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             mp_raise_TypeError(MP_ERROR_TEXT("type isn't an acceptable base type"));
             #else
             mp_raise_msg_varg(&mp_type_TypeError,
diff --git a/py/parsenum.c b/py/parsenum.c
index e665da7d8c..1cfe842577 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -145,7 +145,7 @@ overflow:
 
 value_error:
     {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_obj_t exc = mp_obj_new_exception_msg(&mp_type_ValueError,
             MP_ERROR_TEXT("invalid syntax for integer"));
         raise_exc(exc, lex);
diff --git a/py/runtime.c b/py/runtime.c
index 0ce6854732..18a7c8565d 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -189,7 +189,7 @@ mp_obj_t mp_load_global(qstr qst) {
         #endif
         elem = mp_map_lookup((mp_map_t *)&mp_module_builtins_globals.map, MP_OBJ_NEW_QSTR(qst), MP_MAP_LOOKUP);
         if (elem == NULL) {
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             mp_raise_msg(&mp_type_NameError, MP_ERROR_TEXT("name not defined"));
             #else
             mp_raise_msg_varg(&mp_type_NameError, MP_ERROR_TEXT("name '%q' isn't defined"), qst);
@@ -289,7 +289,7 @@ mp_obj_t mp_unary_op(mp_unary_op_t op, mp_obj_t arg) {
         }
         // With MP_UNARY_OP_INT, mp_unary_op() becomes a fallback for mp_obj_get_int().
         // In this case provide a more focused error message to not confuse, e.g. chr(1.0)
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         if (op == MP_UNARY_OP_INT) {
             mp_raise_TypeError(MP_ERROR_TEXT("can't convert to int"));
         } else {
@@ -610,7 +610,7 @@ generic_binary_op:
     }
 
 unsupported_op:
-    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
     mp_raise_TypeError(MP_ERROR_TEXT("unsupported type for operator"));
     #else
     mp_raise_msg_varg(&mp_type_TypeError,
@@ -652,7 +652,7 @@ mp_obj_t mp_call_function_n_kw(mp_obj_t fun_in, size_t n_args, size_t n_kw, cons
         return type->call(fun_in, n_args, n_kw, args);
     }
 
-    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
     mp_raise_TypeError(MP_ERROR_TEXT("object not callable"));
     #else
     mp_raise_msg_varg(&mp_type_TypeError,
@@ -881,13 +881,13 @@ void mp_unpack_sequence(mp_obj_t seq_in, size_t num, mp_obj_t *items) {
     return;
 
 too_short:
-    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
     mp_raise_ValueError(MP_ERROR_TEXT("wrong number of values to unpack"));
     #else
     mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("need more than %d values to unpack"), (int)seq_len);
     #endif
 too_long:
-    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
     mp_raise_ValueError(MP_ERROR_TEXT("wrong number of values to unpack"));
     #else
     mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("too many values to unpack (expected %d)"), (int)num);
@@ -948,7 +948,7 @@ void mp_unpack_ex(mp_obj_t seq_in, size_t num_in, mp_obj_t *items) {
     return;
 
 too_short:
-    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
     mp_raise_ValueError(MP_ERROR_TEXT("wrong number of values to unpack"));
     #else
     mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("need more than %d values to unpack"), (int)seq_len);
@@ -1117,7 +1117,7 @@ void mp_load_method(mp_obj_t base, qstr attr, mp_obj_t *dest) {
 
     if (dest[0] == MP_OBJ_NULL) {
         // no attribute/method called attr
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_raise_msg(&mp_type_AttributeError, MP_ERROR_TEXT("no such attribute"));
         #else
         // following CPython, we give a more detailed error message for type objects
@@ -1161,7 +1161,7 @@ void mp_store_attr(mp_obj_t base, qstr attr, mp_obj_t value) {
             return;
         }
     }
-    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
     mp_raise_msg(&mp_type_AttributeError, MP_ERROR_TEXT("no such attribute"));
     #else
     mp_raise_msg_varg(&mp_type_AttributeError,
@@ -1206,7 +1206,7 @@ mp_obj_t mp_getiter(mp_obj_t o_in, mp_obj_iter_buf_t *iter_buf) {
     }
 
     // object not iterable
-    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
     mp_raise_TypeError(MP_ERROR_TEXT("object not iterable"));
     #else
     mp_raise_msg_varg(&mp_type_TypeError,
@@ -1229,7 +1229,7 @@ mp_obj_t mp_iternext_allow_raise(mp_obj_t o_in) {
             // __next__ exists, call it and return its result
             return mp_call_method_n_kw(0, 0, dest);
         } else {
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             mp_raise_TypeError(MP_ERROR_TEXT("object not an iterator"));
             #else
             mp_raise_msg_varg(&mp_type_TypeError,
@@ -1265,7 +1265,7 @@ mp_obj_t mp_iternext(mp_obj_t o_in) {
                 }
             }
         } else {
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             mp_raise_TypeError(MP_ERROR_TEXT("object not an iterator"));
             #else
             mp_raise_msg_varg(&mp_type_TypeError,
@@ -1512,6 +1512,26 @@ NORETURN void m_malloc_fail(size_t num_bytes) {
         MP_ERROR_TEXT("memory allocation failed, allocating %u bytes"), (uint)num_bytes);
 }
 
+#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NONE
+
+NORETURN void mp_raise_type(const mp_obj_type_t *exc_type) {
+    nlr_raise(mp_obj_new_exception(exc_type));
+}
+
+NORETURN void mp_raise_ValueError_no_msg(void) {
+    mp_raise_type(&mp_type_ValueError);
+}
+
+NORETURN void mp_raise_TypeError_no_msg(void) {
+    mp_raise_type(&mp_type_TypeError);
+}
+
+NORETURN void mp_raise_NotImplementedError_no_msg(void) {
+    mp_raise_type(&mp_type_NotImplementedError);
+}
+
+#else
+
 NORETURN void mp_raise_msg(const mp_obj_type_t *exc_type, mp_rom_error_text_t msg) {
     if (msg == NULL) {
         nlr_raise(mp_obj_new_exception(exc_type));
@@ -1536,14 +1556,16 @@ NORETURN void mp_raise_TypeError(mp_rom_error_text_t msg) {
     mp_raise_msg(&mp_type_TypeError, msg);
 }
 
-NORETURN void mp_raise_OSError(int errno_) {
-    nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(errno_)));
-}
-
 NORETURN void mp_raise_NotImplementedError(mp_rom_error_text_t msg) {
     mp_raise_msg(&mp_type_NotImplementedError, msg);
 }
 
+#endif
+
+NORETURN void mp_raise_OSError(int errno_) {
+    nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(errno_)));
+}
+
 #if MICROPY_STACK_CHECK || MICROPY_ENABLE_PYSTACK
 NORETURN void mp_raise_recursion_depth(void) {
     nlr_raise(mp_obj_new_exception_arg1(&mp_type_RuntimeError,
diff --git a/py/runtime.h b/py/runtime.h
index 0bf988b905..0cbbb287ac 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -159,12 +159,25 @@ mp_obj_t mp_import_name(qstr name, mp_obj_t fromlist, mp_obj_t level);
 mp_obj_t mp_import_from(mp_obj_t module, qstr name);
 void mp_import_all(mp_obj_t module);
 
+#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NONE
+NORETURN void mp_raise_type(const mp_obj_type_t *exc_type);
+NORETURN void mp_raise_ValueError_no_msg(void);
+NORETURN void mp_raise_TypeError_no_msg(void);
+NORETURN void mp_raise_NotImplementedError_no_msg(void);
+#define mp_raise_msg(exc_type, msg) mp_raise_type(exc_type)
+#define mp_raise_msg_varg(exc_type, ...) mp_raise_type(exc_type)
+#define mp_raise_ValueError(msg) mp_raise_ValueError_no_msg()
+#define mp_raise_TypeError(msg) mp_raise_TypeError_no_msg()
+#define mp_raise_NotImplementedError(msg) mp_raise_NotImplementedError_no_msg()
+#else
 #define mp_raise_type(exc_type) mp_raise_msg(exc_type, NULL)
 NORETURN void mp_raise_msg(const mp_obj_type_t *exc_type, mp_rom_error_text_t msg);
 NORETURN void mp_raise_msg_varg(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, ...);
 NORETURN void mp_raise_ValueError(mp_rom_error_text_t msg);
 NORETURN void mp_raise_TypeError(mp_rom_error_text_t msg);
 NORETURN void mp_raise_NotImplementedError(mp_rom_error_text_t msg);
+#endif
+
 NORETURN void mp_raise_OSError(int errno_);
 NORETURN void mp_raise_recursion_depth(void);
 

From 43a8c8178e0b5e2460edde0fdf436509a7f28764 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 27 Apr 2021 23:52:40 +1000
Subject: [PATCH 019/349] bare-arm: Switch to use MICROPY_ERROR_REPORTING_NONE
 to reduce size.

Reduces size of this port by about 3300 bytes, and demonstrates how to use
this feature.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/bare-arm/Makefile       | 2 +-
 ports/bare-arm/README.md      | 2 +-
 ports/bare-arm/mpconfigport.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/bare-arm/Makefile b/ports/bare-arm/Makefile
index 455a9dc5ac..1a21eb56a8 100644
--- a/ports/bare-arm/Makefile
+++ b/ports/bare-arm/Makefile
@@ -5,7 +5,7 @@ include ../../py/mkenv.mk
 include $(TOP)/py/py.mk
 
 # Set makefile-level MicroPython feature configurations.
-MICROPY_ROM_TEXT_COMPRESSION ?= 1
+MICROPY_ROM_TEXT_COMPRESSION ?= 0
 
 # Define toolchain and other tools.
 CROSS_COMPILE ?= arm-none-eabi-
diff --git a/ports/bare-arm/README.md b/ports/bare-arm/README.md
index 496ee9c755..dfa5534d59 100644
--- a/ports/bare-arm/README.md
+++ b/ports/bare-arm/README.md
@@ -18,4 +18,4 @@ compiled and executed when the firmware starts.  They produce output on the
 system's stdout.
 
 The size of the firmware (the machine code that is programmed to the
-microcontroller's flash/ROM) is currently around 61200 bytes.
+microcontroller's flash/ROM) is currently around 57900 bytes.
diff --git a/ports/bare-arm/mpconfigport.h b/ports/bare-arm/mpconfigport.h
index 41b6ee71a3..3bebc31594 100644
--- a/ports/bare-arm/mpconfigport.h
+++ b/ports/bare-arm/mpconfigport.h
@@ -37,7 +37,7 @@
 
 // Python internal features
 #define MICROPY_ENABLE_EXTERNAL_IMPORT          (0)
-#define MICROPY_ERROR_REPORTING                 (MICROPY_ERROR_REPORTING_TERSE)
+#define MICROPY_ERROR_REPORTING                 (MICROPY_ERROR_REPORTING_NONE)
 #define MICROPY_CPYTHON_COMPAT                  (0)
 #define MICROPY_MODULE_GETATTR                  (0)
 #define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG   (0)

From c5cbfd545ab436ef526e7fce7fafab89ac1b69f8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 24 Apr 2021 09:18:09 +1000
Subject: [PATCH 020/349] py/dynruntime.h: Add mp_obj_get_array() function.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/dynruntime.h | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/py/dynruntime.h b/py/dynruntime.h
index eb8301284e..a8256c1948 100644
--- a/py/dynruntime.h
+++ b/py/dynruntime.h
@@ -81,6 +81,7 @@ static inline void *m_realloc_dyn(void *ptr, size_t new_num_bytes) {
 
 #define mp_type_type                        (*mp_fun_table.type_type)
 #define mp_type_str                         (*mp_fun_table.type_str)
+#define mp_type_tuple                       (*((mp_obj_base_t *)mp_const_empty_tuple)->type)
 #define mp_type_list                        (*mp_fun_table.type_list)
 #define mp_type_EOFError                    (*(mp_obj_type_t *)(mp_load_global(MP_QSTR_EOFError)))
 #define mp_type_IndexError                  (*(mp_obj_type_t *)(mp_load_global(MP_QSTR_IndexError)))
@@ -121,6 +122,7 @@ static inline void *m_realloc_dyn(void *ptr, size_t new_num_bytes) {
 
 #define mp_obj_len(o)                       (mp_obj_len_dyn(o))
 #define mp_obj_subscr(base, index, val)     (mp_fun_table.obj_subscr((base), (index), (val)))
+#define mp_obj_get_array(o, len, items)     (mp_obj_get_array_dyn((o), (len), (items)))
 #define mp_obj_list_append(list, item)      (mp_fun_table.list_append((list), (item)))
 
 static inline mp_obj_t mp_obj_new_str_of_type_dyn(const mp_obj_type_t *type, const byte *data, size_t len) {
@@ -251,4 +253,23 @@ static inline void mp_raise_OSError_dyn(int er) {
 #define mp_obj_get_float(o)         (mp_obj_get_float_to_d((o)))
 #endif
 
+/******************************************************************************/
+// Inline function definitions.
+
+// *items may point inside a GC block
+static inline void mp_obj_get_array_dyn(mp_obj_t o, size_t *len, mp_obj_t **items) {
+    const mp_obj_type_t *type = mp_obj_get_type(o);
+    if (type == &mp_type_tuple) {
+        mp_obj_tuple_t *t = MP_OBJ_TO_PTR(o);
+        *len = t->len;
+        *items = &t->items[0];
+    } else if (type == &mp_type_list) {
+        mp_obj_list_t *l = MP_OBJ_TO_PTR(o);
+        *len = l->len;
+        *items = l->items;
+    } else {
+        mp_raise_TypeError("expected tuple/list");
+    }
+}
+
 #endif // MICROPY_INCLUDED_PY_DYNRUNTIME_H

From f452b9c26569a4e05e026a668dd336f80203f06d Mon Sep 17 00:00:00 2001
From: Daniel Maslowski <info@orangecms.org>
Date: Sat, 24 Apr 2021 17:41:55 +0200
Subject: [PATCH 021/349] pic16bit/Makefile: Make the XC compiler version
 user-configurable.

---
 ports/pic16bit/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/pic16bit/Makefile b/ports/pic16bit/Makefile
index fa6de38e39..3c2bd54ea2 100644
--- a/ports/pic16bit/Makefile
+++ b/ports/pic16bit/Makefile
@@ -6,7 +6,8 @@ QSTR_DEFS = qstrdefsport.h
 # include py core make definitions
 include $(TOP)/py/py.mk
 
-XC16 = /opt/microchip/xc16/v1.35
+XCVERSION ?= 1.35
+XC16 ?= /opt/microchip/xc16/v$(XCVERSION)
 CROSS_COMPILE ?= $(XC16)/bin/xc16-
 
 PARTFAMILY = dsPIC33F

From 4dc802400fb81cf674067b9fcb177139ea5ae27e Mon Sep 17 00:00:00 2001
From: plan-do-break-fix <jeffdswan@outlook.com>
Date: Sun, 25 Apr 2021 01:38:45 -0500
Subject: [PATCH 022/349] stm32,teensy: Correct typos in project README files.

---
 ports/stm32/mboot/README.md | 2 +-
 ports/teensy/README.md      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/mboot/README.md b/ports/stm32/mboot/README.md
index 59213eb615..b85bc3e2ee 100644
--- a/ports/stm32/mboot/README.md
+++ b/ports/stm32/mboot/README.md
@@ -159,7 +159,7 @@ Signed and encrypted DFU support
 --------------------------------
 
 Mboot optionally supports signing and encrypting the binary firmware in the DFU file.
-In general this is refered to as a packed DFU file.  This requires additional settings
+In general this is referred to as a packed DFU file.  This requires additional settings
 in the board config and requires the `pyhy` Python module to be installed for `python3`
 to be used when building packed firmware, eg:
 
diff --git a/ports/teensy/README.md b/ports/teensy/README.md
index c586853b52..dacc463ccd 100644
--- a/ports/teensy/README.md
+++ b/ports/teensy/README.md
@@ -5,7 +5,7 @@ Currently the Teensy 3.1 port of MicroPython builds under Linux and not under Wi
 The tool chain required for the build can be found at <https://launchpad.net/gcc-arm-embedded>.
 
 Download the current Linux *.tar.bz2 file. Instructions regarding unpacking the file and moving it to the correct location
-as well as adding the extracted folders to the enviroment variable can be found at
+as well as adding the extracted folders to the environment variable can be found at
 <http://eliaselectronics.com/stm32f4-tutorials/setting-up-the-stm32f4-arm-development-toolchain/>
 
 In order to download the firmware image to the teensy, you'll need to use the

From a708848b0cb0f304f43178140d84d5535e186a38 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 27 Apr 2021 00:54:21 +0200
Subject: [PATCH 023/349] stm32/uart: Fix H7 UART clock source configuration.

Previously to this commit, Usart16ClockSelection was overwritten and
Usart234578ClockSelection was not set.
---
 ports/stm32/uart.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index 36c59cee4a..babdf63d96 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -118,16 +118,10 @@ STATIC const pyb_uart_irq_map_t mp_uart_irq_map[] = {
 void uart_init0(void) {
     #if defined(STM32H7)
     RCC_PeriphCLKInitTypeDef RCC_PeriphClkInit = {0};
-    // Configure USART1/6 clock source
-    RCC_PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USART16;
+    // Configure USART1/6 and USART2/3/4/5/7/8 clock sources
+    RCC_PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USART16 | RCC_PERIPHCLK_USART234578;
     RCC_PeriphClkInit.Usart16ClockSelection = RCC_USART16CLKSOURCE_D2PCLK2;
-    if (HAL_RCCEx_PeriphCLKConfig(&RCC_PeriphClkInit) != HAL_OK) {
-        __fatal_error("HAL_RCCEx_PeriphCLKConfig");
-    }
-
-    // Configure USART2/3/4/5/7/8 clock source
-    RCC_PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USART234578;
-    RCC_PeriphClkInit.Usart16ClockSelection = RCC_USART234578CLKSOURCE_D2PCLK1;
+    RCC_PeriphClkInit.Usart234578ClockSelection = RCC_USART234578CLKSOURCE_D2PCLK1;
     if (HAL_RCCEx_PeriphCLKConfig(&RCC_PeriphClkInit) != HAL_OK) {
         __fatal_error("HAL_RCCEx_PeriphCLKConfig");
     }

From 21fee92be6c534d0d44518c0c76f0c7cf5f64b18 Mon Sep 17 00:00:00 2001
From: Steve App <hklang10@gmail.com>
Date: Sun, 25 Apr 2021 11:05:47 +0100
Subject: [PATCH 024/349] esp32: Restore FROZEN_MANIFEST support with new CMake
 build system.

This commit re-enables the command-line make option "FROZEN_MANIFEST".  The
boards/*/mpconfigboard.cmake will now use the command-line FROZEN_MANIFEST
value if supplied.

Usage: make FROZEN_MANIFEST=~/foo/my-manifest.py
---
 ports/esp32/Makefile                                  | 4 ++++
 ports/esp32/boards/GENERIC/mpconfigboard.cmake        | 5 +++--
 ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake   | 4 +++-
 ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake    | 4 +++-
 ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake     | 4 +++-
 ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake | 4 +++-
 ports/esp32/boards/TINYPICO/mpconfigboard.cmake       | 4 +++-
 7 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index 39b740ffae..5a40cd9569 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -26,6 +26,10 @@ endif
 
 IDFPY_FLAGS += -D MICROPY_BOARD=$(BOARD) -B $(BUILD) $(CMAKE_ARGS)
 
+ifdef FROZEN_MANIFEST
+       IDFPY_FLAGS += -D MICROPY_FROZEN_MANIFEST=$(FROZEN_MANIFEST)
+endif
+
 all:
 	idf.py $(IDFPY_FLAGS) build
 	@$(PYTHON) makeimg.py \
diff --git a/ports/esp32/boards/GENERIC/mpconfigboard.cmake b/ports/esp32/boards/GENERIC/mpconfigboard.cmake
index f69b05f47b..4aaa0420d9 100644
--- a/ports/esp32/boards/GENERIC/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC/mpconfigboard.cmake
@@ -2,5 +2,6 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.ble
 )
-
-set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+if(NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+endif()
diff --git a/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake
index 686c78df97..729377a5b4 100644
--- a/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake
@@ -4,4 +4,6 @@ set(SDKCONFIG_DEFAULTS
     boards/GENERIC_D2WD/sdkconfig.board
 )
 
-set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+if(NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+endif()
diff --git a/ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake
index ca552d470c..88c0efa218 100644
--- a/ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake
@@ -4,4 +4,6 @@ set(SDKCONFIG_DEFAULTS
     boards/GENERIC_OTA/sdkconfig.board
 )
 
-set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+if(NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+endif()
diff --git a/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake
index 23d52e8b94..73f2b24e66 100644
--- a/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake
@@ -5,4 +5,6 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.usb
 )
 
-set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+if(NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+endif()
diff --git a/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake
index 2128edb592..bb38f7df2b 100644
--- a/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake
@@ -4,4 +4,6 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.spiram
 )
 
-set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+if(NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+endif()
diff --git a/ports/esp32/boards/TINYPICO/mpconfigboard.cmake b/ports/esp32/boards/TINYPICO/mpconfigboard.cmake
index 5c31f5c600..0c65103a85 100644
--- a/ports/esp32/boards/TINYPICO/mpconfigboard.cmake
+++ b/ports/esp32/boards/TINYPICO/mpconfigboard.cmake
@@ -6,4 +6,6 @@ set(SDKCONFIG_DEFAULTS
     boards/TINYPICO/sdkconfig.board
 )
 
-set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
+if(NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
+endif()

From 326dd7f0dbbadc4a536636d486600ce93dade8c5 Mon Sep 17 00:00:00 2001
From: Steve App <hklang10@gmail.com>
Date: Sun, 25 Apr 2021 12:45:06 +0000
Subject: [PATCH 025/349] tools/makemanifest.py: Show directory name if there
 is a FreezeError.

---
 tools/makemanifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/makemanifest.py b/tools/makemanifest.py
index 117d1536e8..51de01dd8a 100644
--- a/tools/makemanifest.py
+++ b/tools/makemanifest.py
@@ -199,7 +199,7 @@ def mkdir(filename):
 def freeze_internal(kind, path, script, opt):
     path = convert_path(path)
     if not os.path.isdir(path):
-        raise FreezeError("freeze path must be a directory")
+        raise FreezeError("freeze path must be a directory: {}".format(path))
     if script is None and kind == KIND_AS_STR:
         if any(f[0] == KIND_AS_STR for f in manifest_list):
             raise FreezeError("can only freeze one str directory")

From 89b64478c73d2228419e77a4450c004157ec725a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 27 Apr 2021 16:30:58 +1000
Subject: [PATCH 026/349] stm32/softtimer: Add support for having a C-based
 callback.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/machine_timer.c |  7 ++++---
 ports/stm32/softtimer.c     |  6 +++++-
 ports/stm32/softtimer.h     | 10 ++++++++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ports/stm32/machine_timer.c b/ports/stm32/machine_timer.c
index c37ac87672..3f83d5ba61 100644
--- a/ports/stm32/machine_timer.c
+++ b/ports/stm32/machine_timer.c
@@ -76,10 +76,10 @@ STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_ar
     self->expiry_ms = mp_hal_ticks_ms() + self->delta_ms;
 
     if (args[ARG_callback].u_obj != MP_OBJ_NULL) {
-        self->callback = args[ARG_callback].u_obj;
+        self->py_callback = args[ARG_callback].u_obj;
     }
 
-    if (self->callback != mp_const_none) {
+    if (self->py_callback != mp_const_none) {
         soft_timer_insert(self);
     }
 
@@ -89,8 +89,9 @@ STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_ar
 STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     machine_timer_obj_t *self = m_new_obj(machine_timer_obj_t);
     self->pairheap.base.type = &machine_timer_type;
+    self->flags = SOFT_TIMER_FLAG_PY_CALLBACK;
     self->delta_ms = 1000;
-    self->callback = mp_const_none;
+    self->py_callback = mp_const_none;
 
     // Get timer id (only soft timer (-1) supported at the moment)
     mp_int_t id = -1;
diff --git a/ports/stm32/softtimer.c b/ports/stm32/softtimer.c
index d0a186c7d0..7e439d4e75 100644
--- a/ports/stm32/softtimer.c
+++ b/ports/stm32/softtimer.c
@@ -64,7 +64,11 @@ void soft_timer_handler(void) {
     while (heap != NULL && TICKS_DIFF(heap->expiry_ms, ticks_ms) <= 0) {
         soft_timer_entry_t *entry = heap;
         heap = (soft_timer_entry_t *)mp_pairheap_pop(soft_timer_lt, &heap->pairheap);
-        mp_sched_schedule(entry->callback, MP_OBJ_FROM_PTR(entry));
+        if (entry->flags & SOFT_TIMER_FLAG_PY_CALLBACK) {
+            mp_sched_schedule(entry->py_callback, MP_OBJ_FROM_PTR(entry));
+        } else {
+            entry->c_callback(entry);
+        }
         if (entry->mode == SOFT_TIMER_MODE_PERIODIC) {
             entry->expiry_ms += entry->delta_ms;
             heap = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &heap->pairheap, &entry->pairheap);
diff --git a/ports/stm32/softtimer.h b/ports/stm32/softtimer.h
index a80d9087b5..6e06bbcc65 100644
--- a/ports/stm32/softtimer.h
+++ b/ports/stm32/softtimer.h
@@ -28,15 +28,21 @@
 
 #include "py/pairheap.h"
 
+#define SOFT_TIMER_FLAG_PY_CALLBACK (1)
+
 #define SOFT_TIMER_MODE_ONE_SHOT (1)
 #define SOFT_TIMER_MODE_PERIODIC (2)
 
 typedef struct _soft_timer_entry_t {
     mp_pairheap_t pairheap;
-    uint32_t mode;
+    uint16_t flags;
+    uint16_t mode;
     uint32_t expiry_ms;
     uint32_t delta_ms; // for periodic mode
-    mp_obj_t callback;
+    union {
+        void (*c_callback)(struct _soft_timer_entry_t *);
+        mp_obj_t py_callback;
+    };
 } soft_timer_entry_t;
 
 extern volatile uint32_t soft_timer_next;

From 647fa63f9c457b616b1b20fdd98403b681302680 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 29 Apr 2021 15:21:22 +1000
Subject: [PATCH 027/349] stm32/softtimer: Support static soft timer instances.

This adds support for making static (ie not on the Python GC heap) soft
timers.  This can be useful for a board to define a custom background
handler, or eventually for BLE/network processing to use instead of systick
slots; it will be more efficient using soft timer for this.

The main issue with using the existing code for static soft timers is that
it would combine heap allocated and statically allocated soft_timer_entry_t
instances in the same pairing-heap data structure.  This would prevent the
GC from tracing some of the heap allocated entries (because the GC won't
follow pointers outside the heap).

This commit makes it so that soft timer entries are explicitly marked,
instead of relying on implicit marking by having the root of the pairing
heap in the root pointer section.  Also, on soft reset only the heap-
allocated soft timers are deleted from the pairing heap, leaving the
statically allocated ones.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/gccollect.c     |  4 +++
 ports/stm32/machine_timer.c |  5 ++-
 ports/stm32/mpconfigport.h  |  2 --
 ports/stm32/softtimer.c     | 65 +++++++++++++++++++++++++++++++------
 ports/stm32/softtimer.h     |  6 +++-
 5 files changed, 66 insertions(+), 16 deletions(-)

diff --git a/ports/stm32/gccollect.c b/ports/stm32/gccollect.c
index ad5645738e..8b47b121ec 100644
--- a/ports/stm32/gccollect.c
+++ b/ports/stm32/gccollect.c
@@ -32,6 +32,7 @@
 #include "py/mpthread.h"
 #include "lib/utils/gchelper.h"
 #include "gccollect.h"
+#include "softtimer.h"
 #include "systick.h"
 
 void gc_collect(void) {
@@ -51,6 +52,9 @@ void gc_collect(void) {
     mp_thread_gc_others();
     #endif
 
+    // trace soft timer nodes
+    soft_timer_gc_mark_all();
+
     // end the GC
     gc_collect_end();
 
diff --git a/ports/stm32/machine_timer.c b/ports/stm32/machine_timer.c
index 3f83d5ba61..c945322187 100644
--- a/ports/stm32/machine_timer.c
+++ b/ports/stm32/machine_timer.c
@@ -73,14 +73,13 @@ STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_ar
         mp_raise_ValueError(MP_ERROR_TEXT("period too large"));
     }
     self->delta_ms = (uint32_t)delta_ms;
-    self->expiry_ms = mp_hal_ticks_ms() + self->delta_ms;
 
     if (args[ARG_callback].u_obj != MP_OBJ_NULL) {
         self->py_callback = args[ARG_callback].u_obj;
     }
 
     if (self->py_callback != mp_const_none) {
-        soft_timer_insert(self);
+        soft_timer_insert(self, self->delta_ms);
     }
 
     return mp_const_none;
@@ -89,7 +88,7 @@ STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_ar
 STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     machine_timer_obj_t *self = m_new_obj(machine_timer_obj_t);
     self->pairheap.base.type = &machine_timer_type;
-    self->flags = SOFT_TIMER_FLAG_PY_CALLBACK;
+    self->flags = SOFT_TIMER_FLAG_PY_CALLBACK | SOFT_TIMER_FLAG_GC_ALLOCATED;
     self->delta_ms = 1000;
     self->py_callback = mp_const_none;
 
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 2888cac88c..28a2d6a76d 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -371,8 +371,6 @@ struct _mp_bluetooth_btstack_root_pointers_t;
     \
     mp_obj_t pyb_extint_callback[PYB_EXTI_NUM_VECTORS]; \
     \
-    struct _soft_timer_entry_t *soft_timer_heap; \
-    \
     /* pointers to all Timer objects (if they have been created) */ \
     struct _pyb_timer_obj_t *pyb_timer_obj_all[MICROPY_HW_MAX_TIMER]; \
     \
diff --git a/ports/stm32/softtimer.c b/ports/stm32/softtimer.c
index 7e439d4e75..7f19eccd2d 100644
--- a/ports/stm32/softtimer.c
+++ b/ports/stm32/softtimer.c
@@ -25,6 +25,8 @@
  */
 
 #include <stdint.h>
+#include "py/gc.h"
+#include "py/mphal.h"
 #include "py/runtime.h"
 #include "irq.h"
 #include "softtimer.h"
@@ -36,9 +38,10 @@ extern __IO uint32_t uwTick;
 
 volatile uint32_t soft_timer_next;
 
-void soft_timer_deinit(void) {
-    MP_STATE_PORT(soft_timer_heap) = NULL;
-}
+// Pointer to the pairheap of soft timer objects.
+// This may contain bss/data pointers as well as GC-heap pointers,
+// and is explicitly GC traced by soft_timer_gc_mark_all().
+STATIC soft_timer_entry_t *soft_timer_heap;
 
 STATIC int soft_timer_lt(mp_pairheap_t *n1, mp_pairheap_t *n2) {
     soft_timer_entry_t *e1 = (soft_timer_entry_t *)n1;
@@ -57,10 +60,26 @@ STATIC void soft_timer_schedule_systick(uint32_t ticks_ms) {
     enable_irq(irq_state);
 }
 
+void soft_timer_deinit(void) {
+    // Pop off all the nodes which are allocated on the GC-heap.
+    uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
+    soft_timer_entry_t *heap_from = soft_timer_heap;
+    soft_timer_entry_t *heap_to = (soft_timer_entry_t *)mp_pairheap_new(soft_timer_lt);
+    while (heap_from != NULL) {
+        soft_timer_entry_t *entry = (soft_timer_entry_t *)mp_pairheap_peek(soft_timer_lt, &heap_from->pairheap);
+        heap_from = (soft_timer_entry_t *)mp_pairheap_pop(soft_timer_lt, &heap_from->pairheap);
+        if (!(entry->flags & SOFT_TIMER_FLAG_GC_ALLOCATED)) {
+            heap_to = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &heap_to->pairheap, &entry->pairheap);
+        }
+    }
+    soft_timer_heap = heap_to;
+    restore_irq_pri(irq_state);
+}
+
 // Must be executed at IRQ_PRI_PENDSV
 void soft_timer_handler(void) {
     uint32_t ticks_ms = uwTick;
-    soft_timer_entry_t *heap = MP_STATE_PORT(soft_timer_heap);
+    soft_timer_entry_t *heap = soft_timer_heap;
     while (heap != NULL && TICKS_DIFF(heap->expiry_ms, ticks_ms) <= 0) {
         soft_timer_entry_t *entry = heap;
         heap = (soft_timer_entry_t *)mp_pairheap_pop(soft_timer_lt, &heap->pairheap);
@@ -74,7 +93,7 @@ void soft_timer_handler(void) {
             heap = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &heap->pairheap, &entry->pairheap);
         }
     }
-    MP_STATE_PORT(soft_timer_heap) = heap;
+    soft_timer_heap = heap;
     if (heap == NULL) {
         // No more timers left, set largest delay possible
         soft_timer_next = uwTick;
@@ -84,11 +103,37 @@ void soft_timer_handler(void) {
     }
 }
 
-void soft_timer_insert(soft_timer_entry_t *entry) {
-    mp_pairheap_init_node(soft_timer_lt, &entry->pairheap);
+void soft_timer_gc_mark_all(void) {
+    // Mark all soft timer nodes that are allocated on the GC-heap.
+    // To avoid deep C recursion, pop and recreate the pairheap as nodes are marked.
     uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
-    MP_STATE_PORT(soft_timer_heap) = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &MP_STATE_PORT(soft_timer_heap)->pairheap, &entry->pairheap);
-    if (entry == MP_STATE_PORT(soft_timer_heap)) {
+    soft_timer_entry_t *heap_from = soft_timer_heap;
+    soft_timer_entry_t *heap_to = (soft_timer_entry_t *)mp_pairheap_new(soft_timer_lt);
+    while (heap_from != NULL) {
+        soft_timer_entry_t *entry = (soft_timer_entry_t *)mp_pairheap_peek(soft_timer_lt, &heap_from->pairheap);
+        heap_from = (soft_timer_entry_t *)mp_pairheap_pop(soft_timer_lt, &heap_from->pairheap);
+        if (entry->flags & SOFT_TIMER_FLAG_GC_ALLOCATED) {
+            gc_collect_root((void **)&entry, 1);
+        }
+        heap_to = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &heap_to->pairheap, &entry->pairheap);
+    }
+    soft_timer_heap = heap_to;
+    restore_irq_pri(irq_state);
+}
+
+void soft_timer_static_init(soft_timer_entry_t *entry, uint16_t mode, uint32_t delta_ms, void (*cb)(soft_timer_entry_t *)) {
+    entry->flags = 0;
+    entry->mode = mode;
+    entry->delta_ms = delta_ms;
+    entry->c_callback = cb;
+}
+
+void soft_timer_insert(soft_timer_entry_t *entry, uint32_t initial_delta_ms) {
+    mp_pairheap_init_node(soft_timer_lt, &entry->pairheap);
+    entry->expiry_ms = mp_hal_ticks_ms() + initial_delta_ms;
+    uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
+    soft_timer_heap = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &soft_timer_heap->pairheap, &entry->pairheap);
+    if (entry == soft_timer_heap) {
         // This new timer became the earliest one so set soft_timer_next
         soft_timer_schedule_systick(entry->expiry_ms);
     }
@@ -97,6 +142,6 @@ void soft_timer_insert(soft_timer_entry_t *entry) {
 
 void soft_timer_remove(soft_timer_entry_t *entry) {
     uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
-    MP_STATE_PORT(soft_timer_heap) = (soft_timer_entry_t *)mp_pairheap_delete(soft_timer_lt, &MP_STATE_PORT(soft_timer_heap)->pairheap, &entry->pairheap);
+    soft_timer_heap = (soft_timer_entry_t *)mp_pairheap_delete(soft_timer_lt, &soft_timer_heap->pairheap, &entry->pairheap);
     restore_irq_pri(irq_state);
 }
diff --git a/ports/stm32/softtimer.h b/ports/stm32/softtimer.h
index 6e06bbcc65..25d828a9fd 100644
--- a/ports/stm32/softtimer.h
+++ b/ports/stm32/softtimer.h
@@ -29,6 +29,7 @@
 #include "py/pairheap.h"
 
 #define SOFT_TIMER_FLAG_PY_CALLBACK (1)
+#define SOFT_TIMER_FLAG_GC_ALLOCATED (2)
 
 #define SOFT_TIMER_MODE_ONE_SHOT (1)
 #define SOFT_TIMER_MODE_PERIODIC (2)
@@ -49,7 +50,10 @@ extern volatile uint32_t soft_timer_next;
 
 void soft_timer_deinit(void);
 void soft_timer_handler(void);
-void soft_timer_insert(soft_timer_entry_t *entry);
+void soft_timer_gc_mark_all(void);
+
+void soft_timer_static_init(soft_timer_entry_t *entry, uint16_t mode, uint32_t delta_ms, void (*cb)(soft_timer_entry_t *));
+void soft_timer_insert(soft_timer_entry_t *entry, uint32_t initial_delta_ms);
 void soft_timer_remove(soft_timer_entry_t *entry);
 
 #endif // MICROPY_INCLUDED_STM32_SOFTTIMER_H

From a72b8443cae183ecd5396d3ae963984f4d2e1cdc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Apr 2021 10:30:17 +1000
Subject: [PATCH 028/349] stm32/boardctrl: Add constants for reset mode values.

And use the same boardctrl.h header for both the application and mboot so
these constants are consistent.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boardctrl.c  | 18 ++++++++++--------
 ports/stm32/boardctrl.h  |  9 +++++++++
 ports/stm32/main.c       |  5 +++--
 ports/stm32/mboot/main.c |  7 ++++---
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/ports/stm32/boardctrl.c b/ports/stm32/boardctrl.c
index c82fefa97c..ce04914ea9 100644
--- a/ports/stm32/boardctrl.c
+++ b/ports/stm32/boardctrl.c
@@ -57,8 +57,8 @@ STATIC uint update_reset_mode(uint reset_mode) {
             }
             mp_hal_delay_ms(20);
             if (i % 30 == 29) {
-                if (++reset_mode > 3) {
-                    reset_mode = 1;
+                if (++reset_mode > BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM) {
+                    reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
                 }
                 led_state(2, reset_mode & 1);
                 led_state(3, reset_mode & 2);
@@ -97,8 +97,8 @@ STATIC uint update_reset_mode(uint reset_mode) {
             if (!switch_get()) {
                 break;
             }
-            if (++reset_mode > 3) {
-                reset_mode = 1;
+            if (++reset_mode > BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM) {
+                reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
             }
         }
         // Flash the selected reset mode
@@ -124,7 +124,7 @@ void boardctrl_before_soft_reset_loop(boardctrl_state_t *state) {
     #if !MICROPY_HW_USES_BOOTLOADER
     // Update the reset_mode via the default
     // method which uses the board switch/button and LEDs.
-    state->reset_mode = update_reset_mode(1);
+    state->reset_mode = update_reset_mode(BOARDCTRL_RESET_MODE_NORMAL);
     #endif
 }
 
@@ -142,7 +142,8 @@ void boardctrl_top_soft_reset_loop(boardctrl_state_t *state) {
 }
 
 int boardctrl_run_boot_py(boardctrl_state_t *state) {
-    bool run_boot_py = state->reset_mode == 1 || state->reset_mode == 3;
+    bool run_boot_py = state->reset_mode == BOARDCTRL_RESET_MODE_NORMAL
+        || state->reset_mode == BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM;
 
     if (run_boot_py) {
         // Run boot.py, if it exists.
@@ -174,7 +175,8 @@ int boardctrl_run_boot_py(boardctrl_state_t *state) {
 }
 
 int boardctrl_run_main_py(boardctrl_state_t *state) {
-    bool run_main_py = (state->reset_mode == 1 || state->reset_mode == 3)
+    bool run_main_py = (state->reset_mode == BOARDCTRL_RESET_MODE_NORMAL
+        || state->reset_mode == BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM)
         && pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL;
 
     if (run_main_py) {
@@ -205,5 +207,5 @@ void boardctrl_start_soft_reset(boardctrl_state_t *state) {
 
 void boardctrl_end_soft_reset(boardctrl_state_t *state) {
     // Set reset_mode to normal boot.
-    state->reset_mode = 1;
+    state->reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
 }
diff --git a/ports/stm32/boardctrl.h b/ports/stm32/boardctrl.h
index 33e71b65c9..551be3453e 100644
--- a/ports/stm32/boardctrl.h
+++ b/ports/stm32/boardctrl.h
@@ -60,11 +60,20 @@
 #define MICROPY_BOARD_END_SOFT_RESET boardctrl_end_soft_reset
 #endif
 
+// Constants to return from boardctrl_run_boot_py, boardctrl_run_main_py.
 enum {
     BOARDCTRL_CONTINUE,
     BOARDCTRL_GOTO_SOFT_RESET_EXIT,
 };
 
+// Constants for boardctrl_state_t.reset_mode.
+enum {
+    BOARDCTRL_RESET_MODE_NORMAL = 1,
+    BOARDCTRL_RESET_MODE_SAFE_MODE = 2,
+    BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM = 3,
+    BOARDCTRL_RESET_MODE_BOOTLOADER = 4,
+};
+
 typedef struct _boardctrl_state_t {
     uint8_t reset_mode;
     bool log_soft_reset;
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index bc8e6f0691..ca80daaceb 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -156,7 +156,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(pyb_main_obj, 1, pyb_main);
 #if MICROPY_HW_FLASH_MOUNT_AT_BOOT
 // avoid inlining to avoid stack usage within main()
 MP_NOINLINE STATIC bool init_flash_fs(uint reset_mode) {
-    if (reset_mode == 3) {
+    if (reset_mode == BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM) {
         // Asked by user to reset filesystem
         factory_reset_create_filesystem();
     }
@@ -210,7 +210,8 @@ MP_NOINLINE STATIC bool init_flash_fs(uint reset_mode) {
     mp_obj_t mount_point = MP_OBJ_NEW_QSTR(MP_QSTR__slash_flash);
     ret = mp_vfs_mount_and_chdir_protected(bdev, mount_point);
 
-    if (ret == -MP_ENODEV && bdev == MP_OBJ_FROM_PTR(&pyb_flash_obj) && reset_mode != 3) {
+    if (ret == -MP_ENODEV && bdev == MP_OBJ_FROM_PTR(&pyb_flash_obj)
+        && reset_mode != BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM) {
         // No filesystem, bdev is still the default (so didn't detect a possibly corrupt littlefs),
         // and didn't already create a filesystem, so try to create a fresh one now.
         ret = factory_reset_create_filesystem();
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 4407ca9da9..a77060ab2b 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -29,6 +29,7 @@
 
 #include "py/mphal.h"
 #include "extmod/crypto-algorithms/sha256.c"
+#include "boardctrl.h"
 #include "usbd_core.h"
 #include "storage.h"
 #include "flash.h"
@@ -1289,7 +1290,7 @@ static int pyb_usbdd_shutdown(void) {
 
 static int get_reset_mode(void) {
     usrbtn_init();
-    int reset_mode = 1;
+    int reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
     if (usrbtn_state()) {
         // Cycle through reset modes while USR is held
         // Timeout is roughly 20s, where reset_mode=1
@@ -1299,7 +1300,7 @@ static int get_reset_mode(void) {
         for (int i = 0; i < (RESET_MODE_NUM_STATES * RESET_MODE_TIMEOUT_CYCLES + 1) * 32; i++) {
             if (i % 32 == 0) {
                 if (++reset_mode > RESET_MODE_NUM_STATES) {
-                    reset_mode = 1;
+                    reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
                 }
                 uint8_t l = RESET_MODE_LED_STATES >> ((reset_mode - 1) * 4);
                 led_state_all(l);
@@ -1396,7 +1397,7 @@ void stm32_main(int initial_r0) {
 
     int reset_mode = get_reset_mode();
     uint32_t msp = *(volatile uint32_t*)APPLICATION_ADDR;
-    if (reset_mode != 4 && (msp & APP_VALIDITY_BITS) == 0) {
+    if (reset_mode != BOARDCTRL_RESET_MODE_BOOTLOADER && (msp & APP_VALIDITY_BITS) == 0) {
         // not DFU mode so jump to application, passing through reset_mode
         // undo our DFU settings
         // TODO probably should disable all IRQ sources first

From 885b246ca91592ba48637a8519dd4fbd576ad38a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 29 Apr 2021 23:48:58 +1000
Subject: [PATCH 029/349] stm32/boardctrl: Show first reset-mode state on LEDs
 when selecting.

Commit 1e297c88989592258965b69cb740039e26c7636c introduced a bug where the
very first reset-mode state on the LEDs was not shown, because prior to
that commit the first reset-mode state was the same as the initial LED
state (green on, others off) and update_reset_mode() was called after
setting this initial LED state.

This is fixed in this commit by changing the update_reset_mode() loop so
that it displays the current reset mode before doing the delay.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boardctrl.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/ports/stm32/boardctrl.c b/ports/stm32/boardctrl.c
index ce04914ea9..8cc519d8e9 100644
--- a/ports/stm32/boardctrl.c
+++ b/ports/stm32/boardctrl.c
@@ -51,20 +51,21 @@ STATIC uint update_reset_mode(uint reset_mode) {
         // The original method used on the pyboard is appropriate if you have 2
         // or more LEDs.
         #if defined(MICROPY_HW_LED2)
-        for (uint i = 0; i < 3000; i++) {
-            if (!switch_get()) {
-                break;
-            }
-            mp_hal_delay_ms(20);
-            if (i % 30 == 29) {
-                if (++reset_mode > BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM) {
-                    reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
+        for (uint i = 0; i < 100; i++) {
+            led_state(2, reset_mode & 1);
+            led_state(3, reset_mode & 2);
+            led_state(4, reset_mode & 4);
+            for (uint j = 0; j < 30; ++j) {
+                mp_hal_delay_ms(20);
+                if (!switch_get()) {
+                    goto select_mode;
                 }
-                led_state(2, reset_mode & 1);
-                led_state(3, reset_mode & 2);
-                led_state(4, reset_mode & 4);
+            }
+            if (++reset_mode > BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM) {
+                reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
             }
         }
+    select_mode:
         // flash the selected reset mode
         for (uint i = 0; i < 6; i++) {
             led_state(2, 0);

From ef2896bdeacdfa3f6dc9faaa3f9c0f3d9bef291b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Apr 2021 16:10:42 +1000
Subject: [PATCH 030/349] stm32/mboot: Allow a board to add source files to the
 build.

A board can now use BUILDING_MBOOT at the Makefile-level to do things
conditional on building mboot, for example add source files to SRC_C.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/Makefile | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 0c92442597..534622c030 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -23,6 +23,9 @@ ifeq ($(wildcard $(BOARD_DIR)/.),)
 $(error Invalid BOARD specified: $(BOARD_DIR))
 endif
 
+# Enable BUILDING_MBOOT so boards can configure their .mk file accordingly.
+BUILDING_MBOOT = 1
+
 include ../../../py/mkenv.mk
 include $(BOARD_DIR)/mpconfigboard.mk
 
@@ -78,7 +81,7 @@ CFLAGS += -DAPPLICATION_ADDR=$(TEXT0_ADDR)
 CFLAGS += -DFFCONF_H=\"ports/stm32/mboot/ffconf.h\"
 CFLAGS += -DLFS1_NO_MALLOC -DLFS1_NO_DEBUG -DLFS1_NO_WARN -DLFS1_NO_ERROR -DLFS1_NO_ASSERT
 CFLAGS += -DLFS2_NO_MALLOC -DLFS2_NO_DEBUG -DLFS2_NO_WARN -DLFS2_NO_ERROR -DLFS2_NO_ASSERT -DLFS2_READONLY
-CFLAGS += -DBUILDING_MBOOT=1
+CFLAGS += -DBUILDING_MBOOT=$(BUILDING_MBOOT)
 CFLAGS += -DMICROPY_HW_STM32WB_FLASH_SYNCRONISATION=0
 CFLAGS += -DBOOTLOADER_DFU_USB_VID=$(BOOTLOADER_DFU_USB_VID) -DBOOTLOADER_DFU_USB_PID=$(BOOTLOADER_DFU_USB_PID)
 
@@ -98,7 +101,7 @@ COPT += -Os -DNDEBUG
 endif
 
 $(BUILD)/lib/libc/string0.o: CFLAGS += $(CFLAGS_BUILTIN)
-LIB_SRC_C = \
+LIB_SRC_C += \
 	lib/libc/string0.c \
 	lib/littlefs/lfs1.c \
 	lib/littlefs/lfs1_util.c \
@@ -111,7 +114,7 @@ LIB_SRC_C = \
 	extmod/uzlib/tinflate.c \
 	extmod/uzlib/tinfgzip.c
 
-SRC_C = \
+SRC_C += \
 	main.c \
 	elem.c \
 	fsload.c \
@@ -131,7 +134,7 @@ SRC_C = \
 	ports/stm32/usbd_conf.c \
 	$(wildcard $(BOARD_DIR)/*.c)
 
-SRC_O = \
+SRC_O += \
 	$(STARTUP_FILE) \
 	$(SYSTEM_FILE) \
 	ports/stm32/resethandler.o \
@@ -146,7 +149,7 @@ CFLAGS += -DMBOOT_PACK_KEYS_FILE=\"$(MBOOT_PACK_KEYS_FILE)\"
 endif
 
 $(BUILD)/$(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_ll_usb.o: CFLAGS += -Wno-attributes
-SRC_HAL = $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
+SRC_HAL += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_cortex.c \
 	hal_flash.c \
 	hal_flash_ex.c \
@@ -155,13 +158,12 @@ SRC_HAL = $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
 	ll_usb.c \
 	)
 
-SRC_USBDEV = $(addprefix ports/stm32/$(USBDEV_DIR)/,\
+SRC_USBDEV += $(addprefix ports/stm32/$(USBDEV_DIR)/,\
 	core/src/usbd_core.c \
 	core/src/usbd_ctlreq.c \
 	core/src/usbd_ioreq.c \
 	)
 
-OBJ =
 OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_O))

From fd01b6c779d39eae1aaa0f038b4ec15d86db44fe Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Apr 2021 16:12:07 +1000
Subject: [PATCH 031/349] stm32/adc: Allow mboot to use basic ADC functions.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/adc.h             | 5 +++++
 ports/stm32/machine_adc.c     | 8 ++++++--
 ports/stm32/mboot/Makefile    | 1 +
 ports/stm32/mboot/mphalport.h | 5 +++++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/adc.h b/ports/stm32/adc.h
index 6f2e61e099..64864b1967 100644
--- a/ports/stm32/adc.h
+++ b/ports/stm32/adc.h
@@ -26,8 +26,13 @@
 #ifndef MICROPY_INCLUDED_STM32_ADC_H
 #define MICROPY_INCLUDED_STM32_ADC_H
 
+#if !BUILDING_MBOOT
 extern const mp_obj_type_t pyb_adc_type;
 extern const mp_obj_type_t pyb_adc_all_type;
+#endif
+
+void adc_config(ADC_TypeDef *adc, uint32_t bits);
+uint32_t adc_config_and_read_u16(ADC_TypeDef *adc, uint32_t channel, uint32_t sample_time);
 
 #if defined(ADC_CHANNEL_VBAT)
 
diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index d9e5a64da5..f28bd5b398 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -96,7 +96,7 @@ STATIC const uint8_t adc_cr_to_bits_table[] = {16, 14, 12, 10, 8, 8, 8, 8};
 STATIC const uint8_t adc_cr_to_bits_table[] = {12, 10, 8, 6};
 #endif
 
-STATIC void adc_config(ADC_TypeDef *adc, uint32_t bits) {
+void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     // Configure ADC clock source and enable ADC clock
     #if defined(STM32L4) || defined(STM32WB)
     __HAL_RCC_ADC_CONFIG(RCC_ADCCLKSOURCE_SYSCLK);
@@ -331,7 +331,7 @@ STATIC uint32_t adc_read_channel(ADC_TypeDef *adc) {
     return value;
 }
 
-STATIC uint32_t adc_config_and_read_u16(ADC_TypeDef *adc, uint32_t channel, uint32_t sample_time) {
+uint32_t adc_config_and_read_u16(ADC_TypeDef *adc, uint32_t channel, uint32_t sample_time) {
     if (channel == ADC_CHANNEL_VREF) {
         return 0xffff;
     }
@@ -357,6 +357,8 @@ STATIC uint32_t adc_config_and_read_u16(ADC_TypeDef *adc, uint32_t channel, uint
 /******************************************************************************/
 // MicroPython bindings for machine.ADC
 
+#if !BUILDING_MBOOT
+
 const mp_obj_type_t machine_adc_type;
 
 typedef struct _machine_adc_obj_t {
@@ -462,3 +464,5 @@ const mp_obj_type_t machine_adc_type = {
     .make_new = machine_adc_make_new,
     .locals_dict = (mp_obj_dict_t *)&machine_adc_locals_dict,
 };
+
+#endif
diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 534622c030..d57b9368ee 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -128,6 +128,7 @@ SRC_C += \
 	ports/stm32/flash.c \
 	ports/stm32/flashbdev.c \
 	ports/stm32/i2cslave.c \
+	ports/stm32/machine_adc.c \
 	ports/stm32/powerctrlboot.c \
 	ports/stm32/qspi.c \
 	ports/stm32/spibdev.c \
diff --git a/ports/stm32/mboot/mphalport.h b/ports/stm32/mboot/mphalport.h
index 56d18a9b05..ab0bc1587c 100644
--- a/ports/stm32/mboot/mphalport.h
+++ b/ports/stm32/mboot/mphalport.h
@@ -39,6 +39,11 @@ static inline int mp_hal_status_to_neg_errno(HAL_StatusTypeDef status) {
 #define MP_HAL_PIN_MODE_OUTPUT          (1)
 #define MP_HAL_PIN_MODE_ALT             (2)
 #define MP_HAL_PIN_MODE_ANALOG          (3)
+#if defined(GPIO_ASCR_ASC0)
+#define MP_HAL_PIN_MODE_ADC             (11)
+#else
+#define MP_HAL_PIN_MODE_ADC             (3)
+#endif
 #define MP_HAL_PIN_MODE_OPEN_DRAIN      (5)
 #define MP_HAL_PIN_MODE_ALT_OPEN_DRAIN  (6)
 #define MP_HAL_PIN_PULL_NONE            (GPIO_NOPULL)

From 97f09fda3e00b4da11bed3d7fb3d83d89deeeafb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Apr 2021 16:21:38 +1000
Subject: [PATCH 032/349] stm32/mboot: Fix mp_hal_delay_us() and add
 mp_hal_ticks_ms().

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/main.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index a77060ab2b..c82e460faf 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -95,6 +95,9 @@
 // These bits are used to detect valid application firmware at APPLICATION_ADDR
 #define APP_VALIDITY_BITS (0x00000003)
 
+// For 1ms system ticker.
+static volatile uint32_t systick_ms;
+
 // Global dfu state
 dfu_context_t dfu_context SECTION_NOZERO_BSS;
 
@@ -104,6 +107,10 @@ uint32_t get_le32(const uint8_t *b) {
     return b[0] | b[1] << 8 | b[2] << 16 | b[3] << 24;
 }
 
+mp_uint_t mp_hal_ticks_ms(void) {
+    return systick_ms;
+}
+
 void mp_hal_delay_us(mp_uint_t usec) {
     // use a busy loop for the delay
     // sys freq is always a multiple of 2MHz, so division here won't lose precision
@@ -113,11 +120,10 @@ void mp_hal_delay_us(mp_uint_t usec) {
     const uint32_t ucount = SystemCoreClock / 2000000 * usec / 2;
     #endif
     for (uint32_t count = 0; ++count <= ucount;) {
+        __NOP();
     }
 }
 
-static volatile uint32_t systick_ms;
-
 void mp_hal_delay_ms(mp_uint_t ms) {
     if (__get_PRIMASK() == 0) {
         // IRQs enabled, use systick

From 58be5a5aa328e687a3560d4a85fb069400b0b8ca Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Apr 2021 16:26:20 +1000
Subject: [PATCH 033/349] stm32/mboot: Allow a board to customise the linker
 scripts.

A board can now define MBOOT_LD_FILES (at the Makefile-level) to specify
custom linker scripts.  And stm32_generic.ld has been split into 2 pieces
so one or the other can be reused (usually stm32_sections.ld wolud be
reused by a board, and stm32_memory.ld redefined).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/Makefile                             |  3 ++-
 ports/stm32/mboot/stm32_memory.ld                      | 10 ++++++++++
 .../mboot/{stm32_generic.ld => stm32_sections.ld}      | 10 ++--------
 3 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 ports/stm32/mboot/stm32_memory.ld
 rename ports/stm32/mboot/{stm32_generic.ld => stm32_sections.ld} (87%)

diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index d57b9368ee..de090da1c6 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -85,7 +85,8 @@ CFLAGS += -DBUILDING_MBOOT=$(BUILDING_MBOOT)
 CFLAGS += -DMICROPY_HW_STM32WB_FLASH_SYNCRONISATION=0
 CFLAGS += -DBOOTLOADER_DFU_USB_VID=$(BOOTLOADER_DFU_USB_VID) -DBOOTLOADER_DFU_USB_PID=$(BOOTLOADER_DFU_USB_PID)
 
-LDFLAGS = -nostdlib -L . -T stm32_generic.ld -Map=$(@:.elf=.map) --cref
+MBOOT_LD_FILES ?= stm32_memory.ld stm32_sections.ld
+LDFLAGS = -nostdlib -L . $(addprefix -T,$(MBOOT_LD_FILES)) -Map=$(@:.elf=.map) --cref
 LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 
 # Remove uncalled code from the final image.
diff --git a/ports/stm32/mboot/stm32_memory.ld b/ports/stm32/mboot/stm32_memory.ld
new file mode 100644
index 0000000000..cfcac4096b
--- /dev/null
+++ b/ports/stm32/mboot/stm32_memory.ld
@@ -0,0 +1,10 @@
+/*
+    Linker script fragment for mboot on an STM32xxx MCU.
+    This defines the memory sections for the bootloader to use.
+*/
+
+MEMORY
+{
+    FLASH_BL (rx)   : ORIGIN = 0x08000000, LENGTH = 32K
+    RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 120K
+}
diff --git a/ports/stm32/mboot/stm32_generic.ld b/ports/stm32/mboot/stm32_sections.ld
similarity index 87%
rename from ports/stm32/mboot/stm32_generic.ld
rename to ports/stm32/mboot/stm32_sections.ld
index ade4349674..3302c5f972 100644
--- a/ports/stm32/mboot/stm32_generic.ld
+++ b/ports/stm32/mboot/stm32_sections.ld
@@ -1,14 +1,8 @@
 /*
-    GNU linker script for generic STM32xxx MCU
+    Linker script fragment for mboot on an STM32xxx MCU.
+    This needs the following MEMORY sections to be defined: FLASH_BL, RAM.
 */
 
-/* Specify the memory areas */
-MEMORY
-{
-    FLASH_BL (rx)   : ORIGIN = 0x08000000, LENGTH = 32K /* sector 0 (can be 32K) */
-    RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 120K
-}
-
 /* produce a link error if there is not this amount of RAM for these sections */
 _minimum_stack_size = 8K;
 

From 37494b8c8a3e61612081aa737997201e7b24b536 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Apr 2021 16:45:51 +1000
Subject: [PATCH 034/349] stm32/mboot: Allow mboot to be placed at any location
 in flash.

A board can now define MBOOT_TEXT0_ADDR to place mboot at a location other
than 0x08000000.  This can be useful if, for example, there is already a
different bootloader on the device.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile       |  5 +++++
 ports/stm32/mboot/Makefile | 10 ++++++----
 ports/stm32/mboot/main.c   |  2 +-
 ports/stm32/modmachine.c   |  6 +++---
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index e7a8f0aee6..e94e7d72f3 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -27,6 +27,10 @@ MICROPY_ROM_TEXT_COMPRESSION ?= 1
 # File containing description of content to be frozen into firmware.
 FROZEN_MANIFEST ?= boards/manifest.py
 
+# Location of mboot (or other bootloader) if the device has one.
+# Used by machine.bootloader().
+MBOOT_TEXT0_ADDR ?= 0x08000000
+
 # include py core make definitions
 include $(TOP)/py/py.mk
 
@@ -101,6 +105,7 @@ CFLAGS += $(CFLAGS_MCU_$(MCU_SERIES))
 CFLAGS += $(COPT)
 CFLAGS += -I$(BOARD_DIR)
 CFLAGS += -DSTM32_HAL_H='<stm32$(MCU_SERIES)xx_hal.h>'
+CFLAGS += -DMBOOT_VTOR=$(MBOOT_TEXT0_ADDR)
 CFLAGS += -DMICROPY_HW_VTOR=$(TEXT0_ADDR)
 
 # Configure for nan-boxing object model if requested
diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index de090da1c6..17de685a61 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -29,6 +29,9 @@ BUILDING_MBOOT = 1
 include ../../../py/mkenv.mk
 include $(BOARD_DIR)/mpconfigboard.mk
 
+# A board can set MBOOT_TEXT0_ADDR to a custom location where mboot should reside.
+MBOOT_TEXT0_ADDR ?= 0x08000000
+
 MCU_SERIES_UPPER = $(shell echo $(MCU_SERIES) | tr '[:lower:]' '[:upper:]')
 CMSIS_MCU_LOWER = $(shell echo $(CMSIS_MCU) | tr '[:upper:]' '[:lower:]')
 
@@ -77,6 +80,7 @@ CFLAGS += $(COPT)
 CFLAGS += -I$(BOARD_DIR)
 CFLAGS += -DSTM32_HAL_H='<stm32$(MCU_SERIES)xx_hal.h>'
 CFLAGS += -DBOARD_$(BOARD)
+CFLAGS += -DMBOOT_VTOR=$(MBOOT_TEXT0_ADDR)
 CFLAGS += -DAPPLICATION_ADDR=$(TEXT0_ADDR)
 CFLAGS += -DFFCONF_H=\"ports/stm32/mboot/ffconf.h\"
 CFLAGS += -DLFS1_NO_MALLOC -DLFS1_NO_DEBUG -DLFS1_NO_WARN -DLFS1_NO_ERROR -DLFS1_NO_ASSERT
@@ -181,20 +185,18 @@ $(TOP)/lib/stm32lib/README.md:
 
 .PHONY: deploy deploy-stlink
 
-FLASH_ADDR = 0x08000000
-
 deploy: $(BUILD)/firmware.dfu
 	$(ECHO) "Writing $< to the board"
 	$(Q)$(PYTHON) $(PYDFU) -u $<
 
 deploy-stlink: $(BUILD)/firmware.dfu
 	$(ECHO) "Writing $< to the board via ST-LINK"
-	$(Q)$(STFLASH) write $(BUILD)/firmware.bin $(FLASH_ADDR)
+	$(Q)$(STFLASH) write $(BUILD)/firmware.bin $(MBOOT_TEXT0_ADDR)
 
 $(BUILD)/firmware.dfu: $(BUILD)/firmware.elf
 	$(ECHO) "Create $@"
 	$(Q)$(OBJCOPY) -O binary -j .isr_vector -j .text -j .data $^ $(BUILD)/firmware.bin
-	$(Q)$(PYTHON) $(DFU) -b $(FLASH_ADDR):$(BUILD)/firmware.bin $@
+	$(Q)$(PYTHON) $(DFU) -b $(MBOOT_TEXT0_ADDR):$(BUILD)/firmware.bin $@
 
 $(BUILD)/firmware.hex: $(BUILD)/firmware.elf
 	$(ECHO) "Create $@"
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index c82e460faf..36b6890361 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -1358,7 +1358,7 @@ void stm32_main(int initial_r0) {
     #endif
 
     // Make sure IRQ vector table points to flash where this bootloader lives.
-    SCB->VTOR = FLASH_BASE;
+    SCB->VTOR = MBOOT_VTOR;
 
     // Enable 8-byte stack alignment for IRQ handlers, in accord with EABI
     SCB->CCR |= SCB_CCR_STKALIGN_Msk;
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index f9fd1d9a64..aee563ee88 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -270,16 +270,16 @@ STATIC NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args)
     #if MICROPY_HW_USES_BOOTLOADER
     if (n_args == 0 || !mp_obj_is_true(args[0])) {
         // By default, with no args given, we enter the custom bootloader (mboot)
-        powerctrl_enter_bootloader(0x70ad0000, 0x08000000);
+        powerctrl_enter_bootloader(0x70ad0000, MBOOT_VTOR);
     }
 
     if (n_args == 1 && mp_obj_is_str_or_bytes(args[0])) {
         // With a string/bytes given, pass its data to the custom bootloader
         size_t len;
         const char *data = mp_obj_str_get_data(args[0], &len);
-        void *mboot_region = (void *)*((volatile uint32_t *)0x08000000);
+        void *mboot_region = (void *)*((volatile uint32_t *)MBOOT_VTOR);
         memmove(mboot_region, data, len);
-        powerctrl_enter_bootloader(0x70ad0080, 0x08000000);
+        powerctrl_enter_bootloader(0x70ad0080, MBOOT_VTOR);
     }
     #endif
 

From cf7e71fa4377e30c8612fa19032ae3004670c7e3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 29 Apr 2021 12:08:20 +1000
Subject: [PATCH 035/349] stm32/sdcard: Allow configuring the SDMMC periph used
 for SD/MMC card.

This can now be selected by setting MICROPY_HW_SDCARD_SDMMC, which defaults
to 1, ie SDMMC1.  This commit also renames the SD pin configuration macros
from MICROPY_HW_SDMMC2_xxx to MICROPY_HW_SDCARD_xxx, as well as renaming
MICROPY_HW_SDMMC_BUS_WIDTH to MICROPY_HW_SDCARD_BUS_WIDTH.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/PYBD_SF2/mpconfigboard.h   | 13 +--
 .../boards/STM32F769DISC/mpconfigboard.h      | 15 +--
 ports/stm32/mpconfigboard_common.h            | 20 +++-
 ports/stm32/sdcard.c                          | 97 ++++++++-----------
 4 files changed, 75 insertions(+), 70 deletions(-)

diff --git a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
index dc42751fff..7d89e17cf4 100644
--- a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
+++ b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
@@ -165,12 +165,13 @@ extern struct _spi_bdev_t spi_bdev2;
 #define MICROPY_HW_LED_OFF(pin)     (mp_hal_pin_high(pin))
 
 // SD card
-#define MICROPY_HW_SDMMC2_CK                (pyb_pin_SD_CK)
-#define MICROPY_HW_SDMMC2_CMD               (pyb_pin_SD_CMD)
-#define MICROPY_HW_SDMMC2_D0                (pyb_pin_SD_D0)
-#define MICROPY_HW_SDMMC2_D1                (pyb_pin_SD_D1)
-#define MICROPY_HW_SDMMC2_D2                (pyb_pin_SD_D2)
-#define MICROPY_HW_SDMMC2_D3                (pyb_pin_SD_D3)
+#define MICROPY_HW_SDCARD_SDMMC             (2)
+#define MICROPY_HW_SDCARD_CK                (pyb_pin_SD_CK)
+#define MICROPY_HW_SDCARD_CMD               (pyb_pin_SD_CMD)
+#define MICROPY_HW_SDCARD_D0                (pyb_pin_SD_D0)
+#define MICROPY_HW_SDCARD_D1                (pyb_pin_SD_D1)
+#define MICROPY_HW_SDCARD_D2                (pyb_pin_SD_D2)
+#define MICROPY_HW_SDCARD_D3                (pyb_pin_SD_D3)
 #define MICROPY_HW_SDCARD_DETECT_PIN        (pyb_pin_SD_SW)
 #define MICROPY_HW_SDCARD_DETECT_PULL       (GPIO_PULLUP)
 #define MICROPY_HW_SDCARD_DETECT_PRESENT    (GPIO_PIN_RESET)
diff --git a/ports/stm32/boards/STM32F769DISC/mpconfigboard.h b/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
index 843b987cee..5004a8ecac 100644
--- a/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
@@ -90,13 +90,14 @@ extern struct _spi_bdev_t spi_bdev;
 #define MICROPY_HW_LED_ON(pin)      (mp_hal_pin_high(pin))
 #define MICROPY_HW_LED_OFF(pin)     (mp_hal_pin_low(pin))
 
-// SD card detect switch
-#define MICROPY_HW_SDMMC2_CK                (pin_D6)
-#define MICROPY_HW_SDMMC2_CMD               (pin_D7)
-#define MICROPY_HW_SDMMC2_D0                (pin_G9)
-#define MICROPY_HW_SDMMC2_D1                (pin_G10)
-#define MICROPY_HW_SDMMC2_D2                (pin_B3)
-#define MICROPY_HW_SDMMC2_D3                (pin_B4)
+// SD card
+#define MICROPY_HW_SDCARD_SDMMC             (2)
+#define MICROPY_HW_SDCARD_CK                (pin_D6)
+#define MICROPY_HW_SDCARD_CMD               (pin_D7)
+#define MICROPY_HW_SDCARD_D0                (pin_G9)
+#define MICROPY_HW_SDCARD_D1                (pin_G10)
+#define MICROPY_HW_SDCARD_D2                (pin_B3)
+#define MICROPY_HW_SDCARD_D3                (pin_B4)
 #define MICROPY_HW_SDCARD_DETECT_PIN        (pin_I15)
 #define MICROPY_HW_SDCARD_DETECT_PULL       (GPIO_PULLUP)
 #define MICROPY_HW_SDCARD_DETECT_PRESENT    (GPIO_PIN_RESET)
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 6fb9289e00..37ce8bbf19 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -107,9 +107,14 @@
 #define MICROPY_HW_ENABLE_MMCARD (0)
 #endif
 
-// SD/MMC interface bus width (defaults to 4 bits)
-#ifndef MICROPY_HW_SDMMC_BUS_WIDTH
-#define MICROPY_HW_SDMMC_BUS_WIDTH (4)
+// Which SDMMC peripheral to use for the SD/MMC card driver (1 or 2)
+#ifndef MICROPY_HW_SDCARD_SDMMC
+#define MICROPY_HW_SDCARD_SDMMC (1)
+#endif
+
+// SD/MMC card driver interface bus width (defaults to 4 bits)
+#ifndef MICROPY_HW_SDCARD_BUS_WIDTH
+#define MICROPY_HW_SDCARD_BUS_WIDTH (4)
 #endif
 
 // Whether to automatically mount (and boot from) the SD card if it's present
@@ -383,6 +388,15 @@
 #define MICROPY_HW_MAX_CAN (1)
 #endif
 
+// Define MICROPY_HW_SDMMCx_CK values if that peripheral is used, so that make-pins.py
+// generates the relevant AF constants.
+#if MICROPY_HW_SDCARD_SDMMC == 1
+#define MICROPY_HW_SDMMC1_CK (1)
+#endif
+#if MICROPY_HW_SDCARD_SDMMC == 2
+#define MICROPY_HW_SDMMC2_CK (1)
+#endif
+
 // Whether the USB peripheral is device-only, or multiple OTG
 #if defined(STM32L0) || defined(STM32L432xx) || defined(STM32WB)
 #define MICROPY_HW_USB_IS_MULTI_OTG (0)
diff --git a/ports/stm32/sdcard.c b/ports/stm32/sdcard.c
index b255ee82ca..ea69e7285b 100644
--- a/ports/stm32/sdcard.c
+++ b/ports/stm32/sdcard.c
@@ -42,30 +42,39 @@
 
 #if defined(STM32F7) || defined(STM32H7) || defined(STM32L4)
 
-// The F7 has 2 SDMMC units but at the moment we only support using one of them in
-// a given build.  If a boards config file defines MICROPY_HW_SDMMC2_CK then SDMMC2
-// is used, otherwise SDMMC1 is used.
+// The H7/F7/L4 have 2 SDMMC peripherals, but at the moment this driver only supports
+// using one of them in a given build, selected by MICROPY_HW_SDCARD_SDMMC.
 
-#if defined(MICROPY_HW_SDMMC2_CK)
+#if MICROPY_HW_SDCARD_SDMMC == 2
 #define SDIO SDMMC2
 #define SDMMC_IRQHandler SDMMC2_IRQHandler
 #define SDMMC_CLK_ENABLE() __HAL_RCC_SDMMC2_CLK_ENABLE()
 #define SDMMC_CLK_DISABLE() __HAL_RCC_SDMMC2_CLK_DISABLE()
+#define SDMMC_FORCE_RESET() __HAL_RCC_SDMMC2_FORCE_RESET()
+#define SDMMC_RELEASE_RESET() __HAL_RCC_SDMMC2_RELEASE_RESET()
 #define SDMMC_IRQn SDMMC2_IRQn
 #define SDMMC_DMA dma_SDMMC_2
+#define STATIC_AF_SDCARD_CK STATIC_AF_SDMMC2_CK
+#define STATIC_AF_SDCARD_CMD STATIC_AF_SDMMC2_CMD
+#define STATIC_AF_SDCARD_D0 STATIC_AF_SDMMC2_D0
+#define STATIC_AF_SDCARD_D1 STATIC_AF_SDMMC2_D1
+#define STATIC_AF_SDCARD_D2 STATIC_AF_SDMMC2_D2
+#define STATIC_AF_SDCARD_D3 STATIC_AF_SDMMC2_D3
 #else
 #define SDIO SDMMC1
 #define SDMMC_IRQHandler SDMMC1_IRQHandler
 #define SDMMC_CLK_ENABLE() __HAL_RCC_SDMMC1_CLK_ENABLE()
 #define SDMMC_CLK_DISABLE() __HAL_RCC_SDMMC1_CLK_DISABLE()
+#define SDMMC_FORCE_RESET() __HAL_RCC_SDMMC1_FORCE_RESET()
+#define SDMMC_RELEASE_RESET() __HAL_RCC_SDMMC1_RELEASE_RESET()
 #define SDMMC_IRQn SDMMC1_IRQn
 #define SDMMC_DMA dma_SDIO_0
-#define STATIC_AF_SDMMC_CK STATIC_AF_SDMMC1_CK
-#define STATIC_AF_SDMMC_CMD STATIC_AF_SDMMC1_CMD
-#define STATIC_AF_SDMMC_D0 STATIC_AF_SDMMC1_D0
-#define STATIC_AF_SDMMC_D1 STATIC_AF_SDMMC1_D1
-#define STATIC_AF_SDMMC_D2 STATIC_AF_SDMMC1_D2
-#define STATIC_AF_SDMMC_D3 STATIC_AF_SDMMC1_D3
+#define STATIC_AF_SDCARD_CK STATIC_AF_SDMMC1_CK
+#define STATIC_AF_SDCARD_CMD STATIC_AF_SDMMC1_CMD
+#define STATIC_AF_SDCARD_D0 STATIC_AF_SDMMC1_D0
+#define STATIC_AF_SDCARD_D1 STATIC_AF_SDMMC1_D1
+#define STATIC_AF_SDCARD_D2 STATIC_AF_SDMMC1_D2
+#define STATIC_AF_SDCARD_D3 STATIC_AF_SDMMC1_D3
 #endif
 
 // The F7 & L4 series calls the peripheral SDMMC rather than SDIO, so provide some
@@ -105,25 +114,23 @@
 #define SDMMC_IRQHandler SDIO_IRQHandler
 #define SDMMC_DMA dma_SDIO_0
 #define SDIO_USE_GPDMA 1
-#define STATIC_AF_SDMMC_CK STATIC_AF_SDIO_CK
-#define STATIC_AF_SDMMC_CMD STATIC_AF_SDIO_CMD
-#define STATIC_AF_SDMMC_D0 STATIC_AF_SDIO_D0
-#define STATIC_AF_SDMMC_D1 STATIC_AF_SDIO_D1
-#define STATIC_AF_SDMMC_D2 STATIC_AF_SDIO_D2
-#define STATIC_AF_SDMMC_D3 STATIC_AF_SDIO_D3
+#define STATIC_AF_SDCARD_CK STATIC_AF_SDIO_CK
+#define STATIC_AF_SDCARD_CMD STATIC_AF_SDIO_CMD
+#define STATIC_AF_SDCARD_D0 STATIC_AF_SDIO_D0
+#define STATIC_AF_SDCARD_D1 STATIC_AF_SDIO_D1
+#define STATIC_AF_SDCARD_D2 STATIC_AF_SDIO_D2
+#define STATIC_AF_SDCARD_D3 STATIC_AF_SDIO_D3
 
 #endif
 
 // If no custom SDIO pins defined, use the default ones
-#ifndef MICROPY_HW_SDMMC_CK
-
-#define MICROPY_HW_SDMMC_D0 (pin_C8)
-#define MICROPY_HW_SDMMC_D1 (pin_C9)
-#define MICROPY_HW_SDMMC_D2 (pin_C10)
-#define MICROPY_HW_SDMMC_D3 (pin_C11)
-#define MICROPY_HW_SDMMC_CK (pin_C12)
-#define MICROPY_HW_SDMMC_CMD (pin_D2)
-
+#ifndef MICROPY_HW_SDCARD_CK
+#define MICROPY_HW_SDCARD_D0 (pin_C8)
+#define MICROPY_HW_SDCARD_D1 (pin_C9)
+#define MICROPY_HW_SDCARD_D2 (pin_C10)
+#define MICROPY_HW_SDCARD_D3 (pin_C11)
+#define MICROPY_HW_SDCARD_CK (pin_C12)
+#define MICROPY_HW_SDCARD_CMD (pin_D2)
 #endif
 
 #define PYB_SDMMC_FLAG_SD       (0x01)
@@ -152,26 +159,13 @@ void sdcard_init(void) {
     // Note: the mp_hal_pin_config function will configure the GPIO in
     // fast mode which can do up to 50MHz.  This should be plenty for SDIO
     // which clocks up to 25MHz maximum.
-    #if defined(MICROPY_HW_SDMMC2_CK)
-    // Use SDMMC2 peripheral with pins provided by the board's config
-    mp_hal_pin_config_alt_static(MICROPY_HW_SDMMC2_CK, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC2_CK);
-    mp_hal_pin_config_alt_static(MICROPY_HW_SDMMC2_CMD, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC2_CMD);
-    mp_hal_pin_config_alt_static(MICROPY_HW_SDMMC2_D0, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC2_D0);
-    #if MICROPY_HW_SDMMC_BUS_WIDTH == 4
-    mp_hal_pin_config_alt_static(MICROPY_HW_SDMMC2_D1, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC2_D1);
-    mp_hal_pin_config_alt_static(MICROPY_HW_SDMMC2_D2, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC2_D2);
-    mp_hal_pin_config_alt_static(MICROPY_HW_SDMMC2_D3, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC2_D3);
-    #endif
-    #else
-    // Default SDIO/SDMMC1 config
-    mp_hal_pin_config_alt_static(MICROPY_HW_SDMMC_CK, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC_CK);
-    mp_hal_pin_config_alt_static(MICROPY_HW_SDMMC_CMD, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC_CMD);
-    mp_hal_pin_config_alt_static(MICROPY_HW_SDMMC_D0, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC_D0);
-    #if MICROPY_HW_SDMMC_BUS_WIDTH == 4
-    mp_hal_pin_config_alt_static(MICROPY_HW_SDMMC_D1, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC_D1);
-    mp_hal_pin_config_alt_static(MICROPY_HW_SDMMC_D2, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC_D2);
-    mp_hal_pin_config_alt_static(MICROPY_HW_SDMMC_D3, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC_D3);
-    #endif
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDCARD_CK, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDCARD_CK);
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDCARD_CMD, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDCARD_CMD);
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDCARD_D0, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDCARD_D0);
+    #if MICROPY_HW_SDCARD_BUS_WIDTH == 4
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDCARD_D1, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDCARD_D1);
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDCARD_D2, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDCARD_D2);
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDCARD_D3, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDCARD_D3);
     #endif
 
     // configure the SD card detect pin
@@ -187,13 +181,8 @@ STATIC void sdmmc_msp_init(void) {
 
     #if defined(STM32H7)
     // Reset SDMMC
-    #if defined(MICROPY_HW_SDMMC2_CK)
-    __HAL_RCC_SDMMC2_FORCE_RESET();
-    __HAL_RCC_SDMMC2_RELEASE_RESET();
-    #else
-    __HAL_RCC_SDMMC1_FORCE_RESET();
-    __HAL_RCC_SDMMC1_RELEASE_RESET();
-    #endif
+    SDMMC_FORCE_RESET();
+    SDMMC_RELEASE_RESET();
     #endif
 
     // NVIC configuration for SDIO interrupts
@@ -263,7 +252,7 @@ STATIC HAL_StatusTypeDef sdmmc_init_sd(void) {
         mp_hal_delay_ms(50);
     }
 
-    #if MICROPY_HW_SDMMC_BUS_WIDTH == 4
+    #if MICROPY_HW_SDCARD_BUS_WIDTH == 4
     // configure the SD bus width for 4-bit wide operation
     status = HAL_SD_ConfigWideBusOperation(&sdmmc_handle.sd, SDIO_BUS_WIDE_4B);
     if (status != HAL_OK) {
@@ -298,7 +287,7 @@ STATIC HAL_StatusTypeDef sdmmc_init_mmc(void) {
     // As this is an eMMC card, overwrite LogBlockNbr with actual value
     sdmmc_handle.mmc.MmcCard.LogBlockNbr = 7469056 + 2048;
 
-    #if MICROPY_HW_SDMMC_BUS_WIDTH == 4
+    #if MICROPY_HW_SDCARD_BUS_WIDTH == 4
     // Configure the SDIO bus width for 4-bit wide operation
     #ifdef STM32F7
     sdmmc_handle.mmc.Init.ClockBypass = SDIO_CLOCK_BYPASS_ENABLE;

From 4d967868238e3c359187921edab8e6fc164f357d Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 28 Apr 2021 20:49:29 +0200
Subject: [PATCH 036/349] stm32/uart: Enable HW flow control for UART 1/5/7/8.

---
 ports/stm32/uart.c | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index babdf63d96..a2b69967b6 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -223,6 +223,16 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
             irqn = USART1_IRQn;
             pins[0] = MICROPY_HW_UART1_TX;
             pins[1] = MICROPY_HW_UART1_RX;
+            #if defined(MICROPY_HW_UART1_RTS)
+            if (flow & UART_HWCONTROL_RTS) {
+                pins[2] = MICROPY_HW_UART1_RTS;
+            }
+            #endif
+            #if defined(MICROPY_HW_UART1_CTS)
+            if (flow & UART_HWCONTROL_CTS) {
+                pins[3] = MICROPY_HW_UART1_CTS;
+            }
+            #endif
             __HAL_RCC_USART1_CLK_ENABLE();
             break;
         #endif
@@ -322,6 +332,16 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
             #endif
             pins[0] = MICROPY_HW_UART5_TX;
             pins[1] = MICROPY_HW_UART5_RX;
+            #if defined(MICROPY_HW_UART5_RTS)
+            if (flow & UART_HWCONTROL_RTS) {
+                pins[2] = MICROPY_HW_UART5_RTS;
+            }
+            #endif
+            #if defined(MICROPY_HW_UART5_CTS)
+            if (flow & UART_HWCONTROL_CTS) {
+                pins[3] = MICROPY_HW_UART5_CTS;
+            }
+            #endif
             break;
         #endif
 
@@ -364,6 +384,16 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
             #endif
             pins[0] = MICROPY_HW_UART7_TX;
             pins[1] = MICROPY_HW_UART7_RX;
+            #if defined(MICROPY_HW_UART7_RTS)
+            if (flow & UART_HWCONTROL_RTS) {
+                pins[2] = MICROPY_HW_UART7_RTS;
+            }
+            #endif
+            #if defined(MICROPY_HW_UART7_CTS)
+            if (flow & UART_HWCONTROL_CTS) {
+                pins[3] = MICROPY_HW_UART7_CTS;
+            }
+            #endif
             break;
         #endif
 
@@ -381,6 +411,16 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
             #endif
             pins[0] = MICROPY_HW_UART8_TX;
             pins[1] = MICROPY_HW_UART8_RX;
+            #if defined(MICROPY_HW_UART8_RTS)
+            if (flow & UART_HWCONTROL_RTS) {
+                pins[2] = MICROPY_HW_UART8_RTS;
+            }
+            #endif
+            #if defined(MICROPY_HW_UART8_CTS)
+            if (flow & UART_HWCONTROL_CTS) {
+                pins[3] = MICROPY_HW_UART8_CTS;
+            }
+            #endif
             break;
         #endif
 

From 80788154b31c6097fd152e6e2e971319e8e3da1e Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 28 Apr 2021 21:32:57 +0200
Subject: [PATCH 037/349] stm32/sdio: Add functions to re/enable SDIO/SDIOIT.

---
 ports/stm32/sdio.c | 15 +++++++++++++++
 ports/stm32/sdio.h |  2 ++
 2 files changed, 17 insertions(+)

diff --git a/ports/stm32/sdio.c b/ports/stm32/sdio.c
index 87f550e3a6..3ebd4947f4 100644
--- a/ports/stm32/sdio.c
+++ b/ports/stm32/sdio.c
@@ -93,6 +93,21 @@ void sdio_deinit(void) {
     #endif
 }
 
+void sdio_reenable(void) {
+    if (__HAL_RCC_SDMMC1_IS_CLK_DISABLED()) {
+        __HAL_RCC_SDMMC1_CLK_ENABLE(); // enable SDIO peripheral
+        sdio_enable_high_speed_4bit();
+    }
+}
+
+void sdio_enable_irq(bool enable) {
+    if (enable) {
+        SDMMC1->MASK |= SDMMC_MASK_SDIOITIE;
+    } else {
+        SDMMC1->MASK &= ~SDMMC_MASK_SDIOITIE;
+    }
+}
+
 void sdio_enable_high_speed_4bit(void) {
     SDMMC_TypeDef *SDIO = SDMMC1;
     SDIO->POWER = 0; // power off
diff --git a/ports/stm32/sdio.h b/ports/stm32/sdio.h
index e7115e6f80..7cbf024ca8 100644
--- a/ports/stm32/sdio.h
+++ b/ports/stm32/sdio.h
@@ -31,6 +31,8 @@
 
 void sdio_init(uint32_t irq_pri);
 void sdio_deinit(void);
+void sdio_reenable(void);
+void sdio_enable_irq(bool enable);
 void sdio_enable_high_speed_4bit(void);
 int sdio_transfer(uint32_t cmd, uint32_t arg, uint32_t *resp);
 int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t len, uint8_t *buf);

From d3eb6d68a377c42bd37e609ce667bea815fecd4f Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 28 Apr 2021 21:35:10 +0200
Subject: [PATCH 038/349] drivers/cyw43/cyw43_ctrl: Use new sdio enable API
 functions.

This removes any references to a specific SDMMC instance, making the driver
more generic/portable.
---
 drivers/cyw43/cyw43_ctrl.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/cyw43/cyw43_ctrl.c b/drivers/cyw43/cyw43_ctrl.c
index cc1fbecde8..aaa266b0d8 100644
--- a/drivers/cyw43/cyw43_ctrl.c
+++ b/drivers/cyw43/cyw43_ctrl.c
@@ -112,7 +112,7 @@ void cyw43_deinit(cyw43_t *self) {
     self->itf_state = 0;
 
     // Disable async polling
-    SDMMC1->MASK &= ~SDMMC_MASK_SDIOITIE;
+    sdio_enable_irq(false);
     cyw43_poll = NULL;
 
     #ifdef pyb_pin_WL_RFSW_VDD
@@ -164,7 +164,7 @@ STATIC int cyw43_ensure_up(cyw43_t *self) {
     cyw43_sleep = CYW43_SLEEP_MAX;
     cyw43_poll = cyw43_poll_func;
     #if USE_SDIOIT
-    SDMMC1->MASK |= SDMMC_MASK_SDIOITIE;
+    sdio_enable_irq(true);
     #else
     extern void extint_set(const pin_obj_t *pin, uint32_t mode);
     extint_set(pyb_pin_WL_HOST_WAKE, GPIO_MODE_IT_FALLING);
@@ -209,7 +209,7 @@ STATIC void cyw43_poll_func(void) {
     }
 
     #if USE_SDIOIT
-    SDMMC1->MASK |= SDMMC_MASK_SDIOITIE;
+    sdio_enable_irq(true);
     #endif
 }
 
@@ -227,10 +227,7 @@ int cyw43_cb_read_host_interrupt_pin(void *cb_data) {
 void cyw43_cb_ensure_awake(void *cb_data) {
     cyw43_sleep = CYW43_SLEEP_MAX;
     #if !USE_SDIOIT
-    if (__HAL_RCC_SDMMC1_IS_CLK_DISABLED()) {
-        __HAL_RCC_SDMMC1_CLK_ENABLE(); // enable SDIO peripheral
-        sdio_enable_high_speed_4bit();
-    }
+    sdio_reenable();
     #endif
 }
 

From d74e2aca3e30ff1d424e97ac0d37d07694d69b7d Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 28 Apr 2021 20:09:34 +0200
Subject: [PATCH 039/349] drivers/cyw43/cywbt: Add compile option for RF
 switch.

---
 drivers/cyw43/cywbt.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/cyw43/cywbt.c b/drivers/cyw43/cywbt.c
index defe670683..c4fecca81b 100644
--- a/drivers/cyw43/cywbt.c
+++ b/drivers/cyw43/cywbt.c
@@ -149,10 +149,14 @@ STATIC int cywbt_download_firmware(const uint8_t *firmware) {
     }
 
     // RF switch must select high path during BT patch boot
+    #if MICROPY_HW_ENABLE_RF_SWITCH
     mp_hal_pin_config(pyb_pin_WL_GPIO_1, MP_HAL_PIN_MODE_INPUT, MP_HAL_PIN_PULL_UP, 0);
+    #endif
     mp_hal_delay_ms(10); // give some time for CTS to go high
     cywbt_wait_cts_low();
+    #if MICROPY_HW_ENABLE_RF_SWITCH
     mp_hal_pin_config(pyb_pin_WL_GPIO_1, MP_HAL_PIN_MODE_INPUT, MP_HAL_PIN_PULL_DOWN, 0); // Select chip antenna (could also select external)
+    #endif
 
     mp_bluetooth_hci_uart_set_baudrate(115200);
     cywbt_set_baudrate(3000000);
@@ -170,9 +174,11 @@ int mp_bluetooth_hci_controller_init(void) {
     mp_hal_pin_output(pyb_pin_BT_DEV_WAKE);
     mp_hal_pin_low(pyb_pin_BT_DEV_WAKE);
 
+    #if MICROPY_HW_ENABLE_RF_SWITCH
     // TODO don't select antenna if wifi is enabled
     mp_hal_pin_config(pyb_pin_WL_GPIO_4, MP_HAL_PIN_MODE_OUTPUT, MP_HAL_PIN_PULL_NONE, 0); // RF-switch power
     mp_hal_pin_high(pyb_pin_WL_GPIO_4); // Turn the RF-switch on
+    #endif
 
     uint8_t buf[256];
 

From baa712b7f093fdeec3ddd4122be9e2f171d35a33 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 28 Apr 2021 20:10:30 +0200
Subject: [PATCH 040/349] stm32/boards/PYBD_SF2: Enable RF switch compile
 option.

---
 ports/stm32/boards/PYBD_SF2/mpconfigboard.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
index 7d89e17cf4..57cc75efc6 100644
--- a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
+++ b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
@@ -39,6 +39,7 @@
 #define MICROPY_HW_ENABLE_USB       (1)
 #define MICROPY_HW_ENABLE_SDCARD    (1)
 #define MICROPY_HW_ENABLE_MMCARD    (1)
+#define MICROPY_HW_ENABLE_RF_SWITCH (1)
 
 #define MICROPY_BOARD_EARLY_INIT    board_early_init
 #define MICROPY_BOARD_ENTER_STOP    board_sleep(1);

From 0d4eb15392dfeee8c2113e46eb21f27800872524 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 28 Apr 2021 20:11:48 +0200
Subject: [PATCH 041/349] drivers/cyw43/cywbt: Remove hard-coded UART6
 alternate function setting.

---
 drivers/cyw43/cywbt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/cyw43/cywbt.c b/drivers/cyw43/cywbt.c
index c4fecca81b..64aeb871c3 100644
--- a/drivers/cyw43/cywbt.c
+++ b/drivers/cyw43/cywbt.c
@@ -55,7 +55,7 @@ STATIC void cywbt_wait_cts_low(void) {
         }
         mp_hal_delay_ms(1);
     }
-    mp_hal_pin_config_alt_static(pyb_pin_BT_CTS, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_USART6_CTS);
+    mp_hal_pin_config_alt(pyb_pin_BT_CTS, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, AF_FN_UART, mp_bluetooth_hci_uart_obj.uart_id);
 }
 
 STATIC int cywbt_hci_cmd_raw(size_t len, uint8_t *buf) {

From a1111b83ed00542b4f5651d3aae9d38ecbbb6dd6 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 29 Apr 2021 23:18:54 +0200
Subject: [PATCH 042/349] stm32/sdio: Allow configuring the SDMMC periph used
 for SDIO.

This can now be selected by setting MICROPY_HW_SDIO_SDMMC, which defaults
to 1, ie SDMMC1.  The pins can also be selected and default to the standard
C8/C9/C10/C11/C12/D2.
---
 ports/stm32/mpconfigboard_common.h |   9 +-
 ports/stm32/sdio.c                 | 195 ++++++++++++++++++-----------
 2 files changed, 127 insertions(+), 77 deletions(-)

diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 37ce8bbf19..0df35918be 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -122,6 +122,11 @@
 #define MICROPY_HW_SDCARD_MOUNT_AT_BOOT (MICROPY_HW_ENABLE_SDCARD)
 #endif
 
+// Which SDMMC peripheral to use for the SDIO driver (1 or 2)
+#ifndef MICROPY_HW_SDIO_SDMMC
+#define MICROPY_HW_SDIO_SDMMC (1)
+#endif
+
 // Whether to enable the MMA7660 driver, exposed as pyb.Accel
 #ifndef MICROPY_HW_HAS_MMA7660
 #define MICROPY_HW_HAS_MMA7660 (0)
@@ -390,10 +395,10 @@
 
 // Define MICROPY_HW_SDMMCx_CK values if that peripheral is used, so that make-pins.py
 // generates the relevant AF constants.
-#if MICROPY_HW_SDCARD_SDMMC == 1
+#if MICROPY_HW_SDCARD_SDMMC == 1 || MICROPY_HW_SDIO_SDMMC == 1
 #define MICROPY_HW_SDMMC1_CK (1)
 #endif
-#if MICROPY_HW_SDCARD_SDMMC == 2
+#if MICROPY_HW_SDCARD_SDMMC == 2 || MICROPY_HW_SDIO_SDMMC == 2
 #define MICROPY_HW_SDMMC2_CK (1)
 #endif
 
diff --git a/ports/stm32/sdio.c b/ports/stm32/sdio.c
index 3ebd4947f4..dfd4092577 100644
--- a/ports/stm32/sdio.c
+++ b/ports/stm32/sdio.c
@@ -28,7 +28,8 @@
 
 #include "py/mperrno.h"
 #include "py/mphal.h"
-#include "genhdr/pins.h"
+#include "pin.h"
+#include "pin_static_af.h"
 #include "pendsv.h"
 #include "sdio.h"
 
@@ -50,18 +51,62 @@ static volatile uint32_t sdmmc_error;
 static volatile uint8_t *sdmmc_buf_cur;
 static volatile uint8_t *sdmmc_buf_top;
 
+// The H7/F7/L4 have 2 SDMMC peripherals, but at the moment this driver only supports
+// using one of them in a given build, selected by MICROPY_HW_SDIO_SDMMC.
+
+#if MICROPY_HW_SDIO_SDMMC == 1
+#define SDMMC                   SDMMC1
+#define SDMMC_IRQn              SDMMC1_IRQn
+#define SDMMC_IRQHandler        SDMMC1_IRQHandler
+#define SDMMC_CLK_ENABLE()      __HAL_RCC_SDMMC1_CLK_ENABLE()
+#define SDMMC_CLK_DISABLE()     __HAL_RCC_SDMMC1_CLK_DISABLE()
+#define SDMMC_IS_CLK_DISABLED() __HAL_RCC_SDMMC1_IS_CLK_DISABLED()
+#define STATIC_AF_SDMMC_CK      STATIC_AF_SDMMC1_CK
+#define STATIC_AF_SDMMC_CMD     STATIC_AF_SDMMC1_CMD
+#define STATIC_AF_SDMMC_D0      STATIC_AF_SDMMC1_D0
+#define STATIC_AF_SDMMC_D1      STATIC_AF_SDMMC1_D1
+#define STATIC_AF_SDMMC_D2      STATIC_AF_SDMMC1_D2
+#define STATIC_AF_SDMMC_D3      STATIC_AF_SDMMC1_D3
+#else
+#if defined(STM32F7)
+#error Due to DMA configuration, only SDMMC1 is currently supported on F7
+#endif
+#define SDMMC                   SDMMC2
+#define SDMMC_IRQn              SDMMC2_IRQn
+#define SDMMC_IRQHandler        SDMMC2_IRQHandler
+#define SDMMC_CLK_ENABLE()      __HAL_RCC_SDMMC2_CLK_ENABLE()
+#define SDMMC_CLK_DISABLE()     __HAL_RCC_SDMMC2_CLK_DISABLE()
+#define SDMMC_IS_CLK_DISABLED() __HAL_RCC_SDMMC2_IS_CLK_DISABLED()
+#define STATIC_AF_SDMMC_CK      STATIC_AF_SDMMC2_CK
+#define STATIC_AF_SDMMC_CMD     STATIC_AF_SDMMC2_CMD
+#define STATIC_AF_SDMMC_D0      STATIC_AF_SDMMC2_D0
+#define STATIC_AF_SDMMC_D1      STATIC_AF_SDMMC2_D1
+#define STATIC_AF_SDMMC_D2      STATIC_AF_SDMMC2_D2
+#define STATIC_AF_SDMMC_D3      STATIC_AF_SDMMC2_D3
+#endif
+
+// If no custom SDIO pins defined, use the default ones
+#ifndef MICROPY_HW_SDIO_CK
+#define MICROPY_HW_SDIO_D0      (pin_C8)
+#define MICROPY_HW_SDIO_D1      (pin_C9)
+#define MICROPY_HW_SDIO_D2      (pin_C10)
+#define MICROPY_HW_SDIO_D3      (pin_C11)
+#define MICROPY_HW_SDIO_CK      (pin_C12)
+#define MICROPY_HW_SDIO_CMD     (pin_D2)
+#endif
+
 void sdio_init(uint32_t irq_pri) {
     // configure IO pins
-    mp_hal_pin_config(pin_C8, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, 12);
-    mp_hal_pin_config(pin_C9, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, 12);
-    mp_hal_pin_config(pin_C10, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, 12);
-    mp_hal_pin_config(pin_C11, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, 12);
-    mp_hal_pin_config(pin_C12, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, 12); // CLK doesn't need pull-up
-    mp_hal_pin_config(pin_D2, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, 12);
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDIO_D0, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC_D0);
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDIO_D1, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC_D1);
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDIO_D2, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC_D2);
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDIO_D3, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC_D3);
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDIO_CK, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_SDMMC_CK);
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDIO_CMD, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC_CMD);
 
-    __HAL_RCC_SDMMC1_CLK_ENABLE(); // enable SDIO peripheral
+    SDMMC_CLK_ENABLE(); // enable SDIO peripheral
 
-    SDMMC_TypeDef *SDIO = SDMMC1;
+    SDMMC_TypeDef *SDIO = SDMMC;
     #if defined(STM32F7)
     SDIO->CLKCR = SDMMC_CLKCR_HWFC_EN | SDMMC_CLKCR_PWRSAV | (120 - 2); // 1-bit, 400kHz
     #else
@@ -80,36 +125,36 @@ void sdio_init(uint32_t irq_pri) {
     __HAL_RCC_DMA2_CLK_ENABLE(); // enable DMA2 peripheral
     #endif
 
-    NVIC_SetPriority(SDMMC1_IRQn, irq_pri);
+    NVIC_SetPriority(SDMMC_IRQn, irq_pri);
 
     SDIO->MASK = 0;
-    HAL_NVIC_EnableIRQ(SDMMC1_IRQn);
+    HAL_NVIC_EnableIRQ(SDMMC_IRQn);
 }
 
 void sdio_deinit(void) {
-    __HAL_RCC_SDMMC1_CLK_DISABLE();
+    SDMMC_CLK_DISABLE();
     #if defined(STM32F7)
     __HAL_RCC_DMA2_CLK_DISABLE();
     #endif
 }
 
 void sdio_reenable(void) {
-    if (__HAL_RCC_SDMMC1_IS_CLK_DISABLED()) {
-        __HAL_RCC_SDMMC1_CLK_ENABLE(); // enable SDIO peripheral
+    if (SDMMC_IS_CLK_DISABLED()) {
+        SDMMC_CLK_ENABLE(); // enable SDIO peripheral
         sdio_enable_high_speed_4bit();
     }
 }
 
 void sdio_enable_irq(bool enable) {
     if (enable) {
-        SDMMC1->MASK |= SDMMC_MASK_SDIOITIE;
+        SDMMC->MASK |= SDMMC_MASK_SDIOITIE;
     } else {
-        SDMMC1->MASK &= ~SDMMC_MASK_SDIOITIE;
+        SDMMC->MASK &= ~SDMMC_MASK_SDIOITIE;
     }
 }
 
 void sdio_enable_high_speed_4bit(void) {
-    SDMMC_TypeDef *SDIO = SDMMC1;
+    SDMMC_TypeDef *SDIO = SDMMC;
     SDIO->POWER = 0; // power off
     mp_hal_delay_us(10);
     #if defined(STM32F7)
@@ -128,33 +173,33 @@ void sdio_enable_high_speed_4bit(void) {
     mp_hal_delay_us(10);
 }
 
-void SDMMC1_IRQHandler(void) {
-    if (SDMMC1->STA & SDMMC_STA_CMDREND) {
-        SDMMC1->ICR = SDMMC_ICR_CMDRENDC;
-        uint32_t r1 = SDMMC1->RESP1;
-        if (SDMMC1->RESPCMD == 53 && r1 & 0x800) {
-            printf("bad RESP1: %lu %lx\n", SDMMC1->RESPCMD, r1);
+void SDMMC_IRQHandler(void) {
+    if (SDMMC->STA & SDMMC_STA_CMDREND) {
+        SDMMC->ICR = SDMMC_ICR_CMDRENDC;
+        uint32_t r1 = SDMMC->RESP1;
+        if (SDMMC->RESPCMD == 53 && r1 & 0x800) {
+            printf("bad RESP1: %lu %lx\n", SDMMC->RESPCMD, r1);
             sdmmc_error = 0xffffffff;
-            SDMMC1->MASK &= SDMMC_MASK_SDIOITIE;
+            SDMMC->MASK &= SDMMC_MASK_SDIOITIE;
             sdmmc_irq_state = SDMMC_IRQ_STATE_DONE;
             return;
         }
         #if defined(STM32H7)
         if (!sdmmc_dma) {
-            while (sdmmc_buf_cur < sdmmc_buf_top && (SDMMC1->STA & SDMMC_STA_DPSMACT) && !(SDMMC1->STA & SDMMC_STA_RXFIFOE)) {
-                *(uint32_t *)sdmmc_buf_cur = SDMMC1->FIFO;
+            while (sdmmc_buf_cur < sdmmc_buf_top && (SDMMC->STA & SDMMC_STA_DPSMACT) && !(SDMMC->STA & SDMMC_STA_RXFIFOE)) {
+                *(uint32_t *)sdmmc_buf_cur = SDMMC->FIFO;
                 sdmmc_buf_cur += 4;
             }
         }
         #endif
         if (sdmmc_buf_cur >= sdmmc_buf_top) {
             // data transfer finished, so we are done
-            SDMMC1->MASK &= SDMMC_MASK_SDIOITIE;
+            SDMMC->MASK &= SDMMC_MASK_SDIOITIE;
             sdmmc_irq_state = SDMMC_IRQ_STATE_DONE;
             return;
         }
         if (sdmmc_write) {
-            SDMMC1->DCTRL =
+            SDMMC->DCTRL =
                 SDMMC_DCTRL_SDIOEN
                 | SDMMC_DCTRL_RWMOD
                 | sdmmc_block_size_log2 << SDMMC_DCTRL_DBLOCKSIZE_Pos
@@ -165,51 +210,51 @@ void SDMMC1_IRQHandler(void) {
                     | SDMMC_DCTRL_DTEN
             ;
             if (!sdmmc_dma) {
-                SDMMC1->MASK |= SDMMC_MASK_TXFIFOHEIE;
+                SDMMC->MASK |= SDMMC_MASK_TXFIFOHEIE;
             }
         }
         sdmmc_irq_state = SDMMC_IRQ_STATE_CMD_DONE;
-    } else if (SDMMC1->STA & SDMMC_STA_DATAEND) {
+    } else if (SDMMC->STA & SDMMC_STA_DATAEND) {
         // data transfer complete
         // note: it's possible to get DATAEND before CMDREND
-        SDMMC1->ICR = SDMMC_ICR_DATAENDC;
+        SDMMC->ICR = SDMMC_ICR_DATAENDC;
         #if defined(STM32F7)
         // check if there is some remaining data in RXFIFO
         if (!sdmmc_dma) {
-            while (SDMMC1->STA & SDMMC_STA_RXDAVL) {
-                *(uint32_t *)sdmmc_buf_cur = SDMMC1->FIFO;
+            while (SDMMC->STA & SDMMC_STA_RXDAVL) {
+                *(uint32_t *)sdmmc_buf_cur = SDMMC->FIFO;
                 sdmmc_buf_cur += 4;
             }
         }
         #endif
         if (sdmmc_irq_state == SDMMC_IRQ_STATE_CMD_DONE) {
             // command and data finished, so we are done
-            SDMMC1->MASK &= SDMMC_MASK_SDIOITIE;
+            SDMMC->MASK &= SDMMC_MASK_SDIOITIE;
             sdmmc_irq_state = SDMMC_IRQ_STATE_DONE;
         }
-    } else if (SDMMC1->STA & SDMMC_STA_TXFIFOHE) {
+    } else if (SDMMC->STA & SDMMC_STA_TXFIFOHE) {
         if (!sdmmc_dma && sdmmc_write) {
             // write up to 8 words to fifo
             for (size_t i = 8; i && sdmmc_buf_cur < sdmmc_buf_top; --i) {
-                SDMMC1->FIFO = *(uint32_t *)sdmmc_buf_cur;
+                SDMMC->FIFO = *(uint32_t *)sdmmc_buf_cur;
                 sdmmc_buf_cur += 4;
             }
             if (sdmmc_buf_cur >= sdmmc_buf_top) {
                 // finished, disable IRQ
-                SDMMC1->MASK &= ~SDMMC_MASK_TXFIFOHEIE;
+                SDMMC->MASK &= ~SDMMC_MASK_TXFIFOHEIE;
             }
         }
-    } else if (SDMMC1->STA & SDMMC_STA_RXFIFOHF) {
+    } else if (SDMMC->STA & SDMMC_STA_RXFIFOHF) {
         if (!sdmmc_dma && !sdmmc_write) {
             // read up to 8 words from fifo
             for (size_t i = 8; i && sdmmc_buf_cur < sdmmc_buf_top; --i) {
-                *(uint32_t *)sdmmc_buf_cur = SDMMC1->FIFO;
+                *(uint32_t *)sdmmc_buf_cur = SDMMC->FIFO;
                 sdmmc_buf_cur += 4;
             }
         }
-    } else if (SDMMC1->STA & SDMMC_STA_SDIOIT) {
-        SDMMC1->MASK &= ~SDMMC_MASK_SDIOITIE;
-        SDMMC1->ICR = SDMMC_ICR_SDIOITC;
+    } else if (SDMMC->STA & SDMMC_STA_SDIOIT) {
+        SDMMC->MASK &= ~SDMMC_MASK_SDIOITIE;
+        SDMMC->ICR = SDMMC_ICR_SDIOITC;
 
         #if MICROPY_PY_NETWORK_CYW43
         extern void (*cyw43_poll)(void);
@@ -217,11 +262,11 @@ void SDMMC1_IRQHandler(void) {
             pendsv_schedule_dispatch(PENDSV_DISPATCH_CYW43, cyw43_poll);
         }
         #endif
-    } else if (SDMMC1->STA & 0x3f) {
+    } else if (SDMMC->STA & 0x3f) {
         // an error
-        sdmmc_error = SDMMC1->STA;
-        SDMMC1->ICR = SDMMC_STATIC_FLAGS;
-        SDMMC1->MASK &= SDMMC_MASK_SDIOITIE;
+        sdmmc_error = SDMMC->STA;
+        SDMMC->ICR = SDMMC_STATIC_FLAGS;
+        SDMMC->MASK &= SDMMC_MASK_SDIOITIE;
         sdmmc_irq_state = SDMMC_IRQ_STATE_DONE;
     }
 }
@@ -229,22 +274,22 @@ void SDMMC1_IRQHandler(void) {
 int sdio_transfer(uint32_t cmd, uint32_t arg, uint32_t *resp) {
     #if defined(STM32F7)
     // Wait for any outstanding TX to complete
-    while (SDMMC1->STA & SDMMC_STA_TXACT) {
+    while (SDMMC->STA & SDMMC_STA_TXACT) {
     }
     #endif
 
     #if defined(STM32F7)
     DMA2_Stream3->CR = 0; // ensure DMA is reset
     #endif
-    SDMMC1->ICR = SDMMC_STATIC_FLAGS; // clear interrupts
-    SDMMC1->ARG = arg;
-    SDMMC1->CMD = cmd | SDMMC_CMD_WAITRESP_0 | SDMMC_CMD_CPSMEN;
+    SDMMC->ICR = SDMMC_STATIC_FLAGS; // clear interrupts
+    SDMMC->ARG = arg;
+    SDMMC->CMD = cmd | SDMMC_CMD_WAITRESP_0 | SDMMC_CMD_CPSMEN;
 
     sdmmc_irq_state = SDMMC_IRQ_STATE_CMD_DATA_PENDING;
     sdmmc_error = 0;
     sdmmc_buf_cur = NULL;
     sdmmc_buf_top = NULL;
-    SDMMC1->MASK = (SDMMC1->MASK & SDMMC_MASK_SDIOITIE) | SDMMC_MASK_CMDRENDIE | 0x3f;
+    SDMMC->MASK = (SDMMC->MASK & SDMMC_MASK_SDIOITIE) | SDMMC_MASK_CMDRENDIE | 0x3f;
 
     uint32_t start = mp_hal_ticks_ms();
     for (;;) {
@@ -253,13 +298,13 @@ int sdio_transfer(uint32_t cmd, uint32_t arg, uint32_t *resp) {
             break;
         }
         if (mp_hal_ticks_ms() - start > 1000) {
-            SDMMC1->MASK = DEFAULT_MASK;
-            printf("sdio_transfer timeout STA=0x%08x\n", (uint)SDMMC1->STA);
+            SDMMC->MASK = DEFAULT_MASK;
+            printf("sdio_transfer timeout STA=0x%08x\n", (uint)SDMMC->STA);
             return -MP_ETIMEDOUT;
         }
     }
 
-    SDMMC1->MASK &= SDMMC_MASK_SDIOITIE;
+    SDMMC->MASK &= SDMMC_MASK_SDIOITIE;
 
     if (sdmmc_error == SDMMC_STA_CCRCFAIL && cmd == 5) {
         // Errata: CMD CRC error is incorrectly generated for CMD 5
@@ -268,13 +313,13 @@ int sdio_transfer(uint32_t cmd, uint32_t arg, uint32_t *resp) {
         return -(0x1000000 | sdmmc_error);
     }
 
-    uint32_t rcmd = SDMMC1->RESPCMD;
+    uint32_t rcmd = SDMMC->RESPCMD;
     if (rcmd != cmd) {
         printf("sdio_transfer: cmd=%lu rcmd=%lu\n", cmd, rcmd);
         return -MP_EIO;
     }
     if (resp != NULL) {
-        *resp = SDMMC1->RESP1;
+        *resp = SDMMC->RESP1;
     }
     return 0;
 }
@@ -282,7 +327,7 @@ int sdio_transfer(uint32_t cmd, uint32_t arg, uint32_t *resp) {
 int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t len, uint8_t *buf) {
     #if defined(STM32F7)
     // Wait for any outstanding TX to complete
-    while (SDMMC1->STA & SDMMC_STA_TXACT) {
+    while (SDMMC->STA & SDMMC_STA_TXACT) {
     }
     #endif
 
@@ -309,11 +354,11 @@ int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t le
 
     bool dma = (len > 16);
 
-    SDMMC1->ICR = SDMMC_STATIC_FLAGS; // clear interrupts
-    SDMMC1->MASK &= SDMMC_MASK_SDIOITIE;
+    SDMMC->ICR = SDMMC_STATIC_FLAGS; // clear interrupts
+    SDMMC->MASK &= SDMMC_MASK_SDIOITIE;
 
-    SDMMC1->DTIMER = 0x2000000; // about 700ms running at 48MHz
-    SDMMC1->DLEN = (len + block_size - 1) & ~(block_size - 1);
+    SDMMC->DTIMER = 0x2000000; // about 700ms running at 48MHz
+    SDMMC->DLEN = (len + block_size - 1) & ~(block_size - 1);
 
     #if defined(STM32F7)
     DMA2_Stream3->CR = 0;
@@ -339,7 +384,7 @@ int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t le
         #if defined(STM32F7)
         DMA2->LIFCR = 0x3f << 22;
         DMA2_Stream3->FCR = 0x07; // ?
-        DMA2_Stream3->PAR = (uint32_t)&SDMMC1->FIFO;
+        DMA2_Stream3->PAR = (uint32_t)&SDMMC->FIFO;
         if ((uint32_t)buf & 3) {
             printf("sdio_transfer_cmd53: buf=%p is not aligned for DMA\n", buf);
             return -MP_EINVAL;
@@ -359,12 +404,12 @@ int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t le
             | 1 << 0 // EN
         ;
         #else
-        SDMMC1->IDMABASE0 = (uint32_t)buf;
-        SDMMC1->IDMACTRL = SDMMC_IDMA_IDMAEN;
+        SDMMC->IDMABASE0 = (uint32_t)buf;
+        SDMMC->IDMACTRL = SDMMC_IDMA_IDMAEN;
         #endif
     } else {
         #if defined(STM32H7)
-        SDMMC1->IDMACTRL = 0;
+        SDMMC->IDMACTRL = 0;
         #endif
     }
 
@@ -373,7 +418,7 @@ int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t le
     // (and in case we get a long-running unrelated IRQ here on the host just
     // after writing to CMD to initiate the command)
     if (!write) {
-        SDMMC1->DCTRL =
+        SDMMC->DCTRL =
             SDMMC_DCTRL_SDIOEN
             | SDMMC_DCTRL_RWMOD
             | block_size_log2 << SDMMC_DCTRL_DBLOCKSIZE_Pos
@@ -385,8 +430,8 @@ int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t le
         ;
     }
 
-    SDMMC1->ARG = arg;
-    SDMMC1->CMD = 53 | SDMMC_CMD_WAITRESP_0 | SDMMC_CMD_CPSMEN;
+    SDMMC->ARG = arg;
+    SDMMC->CMD = 53 | SDMMC_CMD_WAITRESP_0 | SDMMC_CMD_CPSMEN;
 
     sdmmc_irq_state = SDMMC_IRQ_STATE_CMD_DATA_PENDING;
     sdmmc_block_size_log2 = block_size_log2;
@@ -395,7 +440,7 @@ int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t le
     sdmmc_error = 0;
     sdmmc_buf_cur = (uint8_t *)buf;
     sdmmc_buf_top = (uint8_t *)buf + len;
-    SDMMC1->MASK = (SDMMC1->MASK & SDMMC_MASK_SDIOITIE) | SDMMC_MASK_CMDRENDIE | SDMMC_MASK_DATAENDIE | SDMMC_MASK_RXFIFOHFIE | 0x3f;
+    SDMMC->MASK = (SDMMC->MASK & SDMMC_MASK_SDIOITIE) | SDMMC_MASK_CMDRENDIE | SDMMC_MASK_DATAENDIE | SDMMC_MASK_RXFIFOHFIE | 0x3f;
 
     // wait to complete transfer
     uint32_t start = mp_hal_ticks_ms();
@@ -405,23 +450,23 @@ int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t le
             break;
         }
         if (mp_hal_ticks_ms() - start > 200) {
-            SDMMC1->MASK &= SDMMC_MASK_SDIOITIE;
+            SDMMC->MASK &= SDMMC_MASK_SDIOITIE;
             #if defined(STM32F7)
-            printf("sdio_transfer_cmd53: timeout wr=%d len=%u dma=%u buf_idx=%u STA=%08x SDMMC=%08x:%08x DMA=%08x:%08x:%08x RCC=%08x\n", write, (uint)len, (uint)dma, sdmmc_buf_cur - buf, (uint)SDMMC1->STA, (uint)SDMMC1->DCOUNT, (uint)SDMMC1->FIFOCNT, (uint)DMA2->LISR, (uint)DMA2->HISR, (uint)DMA2_Stream3->NDTR, (uint)RCC->AHB1ENR);
+            printf("sdio_transfer_cmd53: timeout wr=%d len=%u dma=%u buf_idx=%u STA=%08x SDMMC=%08x:%08x DMA=%08x:%08x:%08x RCC=%08x\n", write, (uint)len, (uint)dma, sdmmc_buf_cur - buf, (uint)SDMMC->STA, (uint)SDMMC->DCOUNT, (uint)SDMMC->FIFOCNT, (uint)DMA2->LISR, (uint)DMA2->HISR, (uint)DMA2_Stream3->NDTR, (uint)RCC->AHB1ENR);
             #else
-            printf("sdio_transfer_cmd53: timeout wr=%d len=%u dma=%u buf_idx=%u STA=%08x SDMMC=%08x:%08x IDMA=%08x\n", write, (uint)len, (uint)dma, sdmmc_buf_cur - buf, (uint)SDMMC1->STA, (uint)SDMMC1->DCOUNT, (uint)SDMMC1->DCTRL, (uint)SDMMC1->IDMACTRL);
+            printf("sdio_transfer_cmd53: timeout wr=%d len=%u dma=%u buf_idx=%u STA=%08x SDMMC=%08x:%08x IDMA=%08x\n", write, (uint)len, (uint)dma, sdmmc_buf_cur - buf, (uint)SDMMC->STA, (uint)SDMMC->DCOUNT, (uint)SDMMC->DCTRL, (uint)SDMMC->IDMACTRL);
             #endif
             return -MP_ETIMEDOUT;
         }
     }
 
-    SDMMC1->MASK &= SDMMC_MASK_SDIOITIE;
+    SDMMC->MASK &= SDMMC_MASK_SDIOITIE;
 
     if (sdmmc_error) {
         #if defined(STM32F7)
-        printf("sdio_transfer_cmd53: error=%08lx wr=%d len=%u dma=%u buf_idx=%u STA=%08x SDMMC=%08x:%08x DMA=%08x:%08x:%08x RCC=%08x\n", sdmmc_error, write, (uint)len, (uint)dma, sdmmc_buf_cur - buf, (uint)SDMMC1->STA, (uint)SDMMC1->DCOUNT, (uint)SDMMC1->FIFOCNT, (uint)DMA2->LISR, (uint)DMA2->HISR, (uint)DMA2_Stream3->NDTR, (uint)RCC->AHB1ENR);
+        printf("sdio_transfer_cmd53: error=%08lx wr=%d len=%u dma=%u buf_idx=%u STA=%08x SDMMC=%08x:%08x DMA=%08x:%08x:%08x RCC=%08x\n", sdmmc_error, write, (uint)len, (uint)dma, sdmmc_buf_cur - buf, (uint)SDMMC->STA, (uint)SDMMC->DCOUNT, (uint)SDMMC->FIFOCNT, (uint)DMA2->LISR, (uint)DMA2->HISR, (uint)DMA2_Stream3->NDTR, (uint)RCC->AHB1ENR);
         #else
-        printf("sdio_transfer_cmd53: error=%08lx wr=%d len=%u dma=%u buf_idx=%u STA=%08x SDMMC=%08x:%08x IDMA=%08x\n", sdmmc_error, write, (uint)len, (uint)dma, sdmmc_buf_cur - buf, (uint)SDMMC1->STA, (uint)SDMMC1->DCOUNT, (uint)SDMMC1->DCTRL, (uint)SDMMC1->IDMACTRL);
+        printf("sdio_transfer_cmd53: error=%08lx wr=%d len=%u dma=%u buf_idx=%u STA=%08x SDMMC=%08x:%08x IDMA=%08x\n", sdmmc_error, write, (uint)len, (uint)dma, sdmmc_buf_cur - buf, (uint)SDMMC->STA, (uint)SDMMC->DCOUNT, (uint)SDMMC->DCTRL, (uint)SDMMC->IDMACTRL);
         #endif
         return -(0x1000000 | sdmmc_error);
     }

From a41cd150be01adc59828ead26a01a9d9324773e1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Apr 2021 10:48:04 +1000
Subject: [PATCH 043/349] esp8266/modnetwork: Use mp_handle_pending() to raise
 pending exception.

If MICROPY_ENABLE_SCHEDULER is enabled then MP_STATE_VM(sched_state) must
be updated after handling the pending exception, which is done by the
mp_handle_pending() function.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/modnetwork.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ports/esp8266/modnetwork.c b/ports/esp8266/modnetwork.c
index cad53d912c..3b8ef4b21f 100644
--- a/ports/esp8266/modnetwork.c
+++ b/ports/esp8266/modnetwork.c
@@ -239,9 +239,7 @@ STATIC mp_obj_t esp_scan(mp_obj_t self_in) {
         // esp_scan_list variable to NULL without disabling interrupts
         if (MP_STATE_VM(mp_pending_exception) != NULL) {
             esp_scan_list = NULL;
-            mp_obj_t obj = MP_STATE_VM(mp_pending_exception);
-            MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL;
-            nlr_raise(obj);
+            mp_handle_pending(true);
         }
         ets_loop_iter();
     }

From 7e549b6718e80136b03074765f1d4add209a21a5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Apr 2021 10:50:09 +1000
Subject: [PATCH 044/349] py/profile: Use mp_handle_pending() to raise pending
 exception.

If MICROPY_ENABLE_SCHEDULER is enabled then MP_STATE_VM(sched_state) must
be updated after handling the pending exception, which is done by the
mp_handle_pending() function.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/profile.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/py/profile.c b/py/profile.c
index 9cf8c4b7ba..e5fb35f0ed 100644
--- a/py/profile.c
+++ b/py/profile.c
@@ -298,9 +298,7 @@ STATIC mp_obj_t mp_prof_callback_invoke(mp_obj_t callback, prof_callback_args_t
     mp_prof_is_executing = false;
 
     if (MP_STATE_VM(mp_pending_exception) != MP_OBJ_NULL) {
-        mp_obj_t obj = MP_STATE_VM(mp_pending_exception);
-        MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL;
-        nlr_raise(obj);
+        mp_handle_pending(true);
     }
     return top;
 }

From 7cbf826a9575e18ce1b7fe11b0f0997509153260 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Apr 2021 10:52:19 +1000
Subject: [PATCH 045/349] py/scheduler: Add mp_sched_exception() to schedule a
 pending exception.

This helper is added to properly set a pending exception, to mirror
mp_sched_schedule(), which schedules a function.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/mpconfigport.h   |  1 +
 ports/esp8266/mpconfigport.h |  1 +
 py/mpconfig.h                |  4 ++++
 py/runtime.h                 |  1 +
 py/scheduler.c               | 14 +++++++++-----
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 8788963cb3..0c7d42210e 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -264,6 +264,7 @@ void *esp_native_code_commit(void *, size_t, void *);
 #endif
 
 // Functions that should go in IRAM
+#define MICROPY_WRAP_MP_SCHED_EXCEPTION(f) IRAM_ATTR f
 #define MICROPY_WRAP_MP_KEYBOARD_INTERRUPT(f) IRAM_ATTR f
 
 #define UINT_FMT "%u"
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 2c56b4188f..52028e833a 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -195,6 +195,7 @@ extern const struct _mp_obj_module_t mp_module_onewire;
 #define MICROPY_PY_SYS_PLATFORM "esp8266"
 
 #define MP_FASTCODE(n) __attribute__((section(".iram0.text." #n))) n
+#define MICROPY_WRAP_MP_SCHED_EXCEPTION(f) MP_FASTCODE(f)
 #define MICROPY_WRAP_MP_KEYBOARD_INTERRUPT(f) MP_FASTCODE(f)
 #define MICROPY_WRAP_MP_SCHED_SCHEDULE(f) MP_FASTCODE(f)
 
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 5c7212fd1f..2934f8ec89 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1504,6 +1504,10 @@ typedef double mp_float_t;
 /*****************************************************************************/
 /* Hooks for a port to wrap functions with attributes                        */
 
+#ifndef MICROPY_WRAP_MP_SCHED_EXCEPTION
+#define MICROPY_WRAP_MP_SCHED_EXCEPTION(f) f
+#endif
+
 #ifndef MICROPY_WRAP_MP_KEYBOARD_INTERRUPT
 #define MICROPY_WRAP_MP_KEYBOARD_INTERRUPT(f) f
 #endif
diff --git a/py/runtime.h b/py/runtime.h
index 0cbbb287ac..9ad4bc0242 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -64,6 +64,7 @@ extern const byte mp_binary_op_method_name[];
 void mp_init(void);
 void mp_deinit(void);
 
+void mp_sched_exception(mp_obj_t exc);
 void mp_keyboard_interrupt(void);
 void mp_handle_pending(bool raise_exc);
 void mp_handle_pending_tail(mp_uint_t atomic_state);
diff --git a/py/scheduler.c b/py/scheduler.c
index 6b138a631b..f37f8c3f86 100644
--- a/py/scheduler.c
+++ b/py/scheduler.c
@@ -28,17 +28,21 @@
 
 #include "py/runtime.h"
 
-#if MICROPY_KBD_EXCEPTION
-// This function may be called asynchronously at any time so only do the bare minimum.
-void MICROPY_WRAP_MP_KEYBOARD_INTERRUPT(mp_keyboard_interrupt)(void) {
-    MP_STATE_VM(mp_kbd_exception).traceback_data = NULL;
-    MP_STATE_VM(mp_pending_exception) = MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception));
+void mp_sched_exception(mp_obj_t exc) {
+    MP_STATE_VM(mp_pending_exception) = exc;
     #if MICROPY_ENABLE_SCHEDULER
     if (MP_STATE_VM(sched_state) == MP_SCHED_IDLE) {
         MP_STATE_VM(sched_state) = MP_SCHED_PENDING;
     }
     #endif
 }
+
+#if MICROPY_KBD_EXCEPTION
+// This function may be called asynchronously at any time so only do the bare minimum.
+void MICROPY_WRAP_MP_KEYBOARD_INTERRUPT(mp_keyboard_interrupt)(void) {
+    MP_STATE_VM(mp_kbd_exception).traceback_data = NULL;
+    mp_sched_exception(MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception)));
+}
 #endif
 
 #if MICROPY_ENABLE_SCHEDULER

From bd54eb566f85293279d02d0a663c7e4d9f59e660 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Apr 2021 10:53:54 +1000
Subject: [PATCH 046/349] nrf/boards/microbit: Use mp_sched_exception() where
 appropriate.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/nrf/boards/microbit/modules/microbitdisplay.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/nrf/boards/microbit/modules/microbitdisplay.c b/ports/nrf/boards/microbit/modules/microbitdisplay.c
index 979a4ddd08..c2eaf4179b 100644
--- a/ports/nrf/boards/microbit/modules/microbitdisplay.c
+++ b/ports/nrf/boards/microbit/modules/microbitdisplay.c
@@ -305,7 +305,7 @@ static void draw_object(mp_obj_t obj) {
             async_stop();
         }
     } else {
-        MP_STATE_VM(mp_pending_exception) = mp_obj_new_exception_msg(&mp_type_TypeError, MP_ERROR_TEXT("not an image."));
+        mp_sched_exception(mp_obj_new_exception_msg(&mp_type_TypeError, MP_ERROR_TEXT("not an image.")));
         async_stop();
     }
 }
@@ -341,7 +341,7 @@ static void microbit_display_update(void) {
                     if (mp_obj_get_type(nlr.ret_val) == &mp_type_MemoryError) {
                         mp_printf(&mp_plat_print, "Allocation in interrupt handler");
                     }
-                    MP_STATE_VM(mp_pending_exception) = MP_OBJ_FROM_PTR(nlr.ret_val);
+                    mp_sched_exception(MP_OBJ_FROM_PTR(nlr.ret_val));
                 }
                 obj = MP_OBJ_STOP_ITERATION;
             }

From e9e9c76ddf131f8e50b0ae2d44501d3cd88537ef Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Apr 2021 10:57:34 +1000
Subject: [PATCH 047/349] all: Rename mp_keyboard_interrupt to
 mp_sched_keyboard_interrupt.

To match mp_sched_exception() and mp_sched_schedule().

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/uos_dupterm.c                   | 2 +-
 ports/cc3200/mods/pybuart.c            | 2 +-
 ports/cc3200/telnet/telnet.c           | 2 +-
 ports/esp32/mpconfigport.h             | 2 +-
 ports/esp32/uart.c                     | 2 +-
 ports/esp32/usb.c                      | 2 +-
 ports/esp8266/esp_mphal.h              | 2 +-
 ports/esp8266/mpconfigport.h           | 2 +-
 ports/esp8266/uart.c                   | 6 +++---
 ports/javascript/Makefile              | 2 +-
 ports/javascript/library.js            | 2 +-
 ports/mimxrt/mphalport.c               | 2 +-
 ports/nrf/drivers/bluetooth/ble_uart.c | 2 +-
 ports/nrf/modules/machine/uart.c       | 2 +-
 ports/rp2/mphalport.c                  | 2 +-
 ports/rp2/uart.c                       | 2 +-
 ports/samd/mphalport.c                 | 2 +-
 ports/stm32/pendsv.c                   | 2 +-
 ports/unix/coverage.c                  | 8 ++++----
 ports/unix/unix_mphal.c                | 2 +-
 ports/windows/windows_mphal.c          | 2 +-
 ports/zephyr/src/zephyr_getchar.c      | 4 ++--
 py/mpconfig.h                          | 4 ++--
 py/runtime.h                           | 2 +-
 py/scheduler.c                         | 2 +-
 25 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/extmod/uos_dupterm.c b/extmod/uos_dupterm.c
index ad706d5246..b661803875 100644
--- a/extmod/uos_dupterm.c
+++ b/extmod/uos_dupterm.c
@@ -133,7 +133,7 @@ int mp_uos_dupterm_rx_chr(void) {
                 nlr_pop();
                 if (buf[0] == mp_interrupt_char) {
                     // Signal keyboard interrupt to be raised as soon as the VM resumes
-                    mp_keyboard_interrupt();
+                    mp_sched_keyboard_interrupt();
                     return -2;
                 }
                 return buf[0];
diff --git a/ports/cc3200/mods/pybuart.c b/ports/cc3200/mods/pybuart.c
index 98adf1c398..ac2af7032e 100644
--- a/ports/cc3200/mods/pybuart.c
+++ b/ports/cc3200/mods/pybuart.c
@@ -250,7 +250,7 @@ STATIC void UARTGenericIntHandler(uint32_t uart_id) {
             int data = MAP_UARTCharGetNonBlocking(self->reg);
             if (MP_STATE_PORT(os_term_dup_obj) && MP_STATE_PORT(os_term_dup_obj)->stream_o == self && data == mp_interrupt_char) {
                 // raise an exception when interrupts are finished
-                mp_keyboard_interrupt();
+                mp_sched_keyboard_interrupt();
             } else { // there's always a read buffer available
                 uint16_t next_head = (self->read_buf_head + 1) % PYBUART_RX_BUFFER_LEN;
                 if (next_head != self->read_buf_tail) {
diff --git a/ports/cc3200/telnet/telnet.c b/ports/cc3200/telnet/telnet.c
index 401e8a8cc9..9f51d4cd85 100644
--- a/ports/cc3200/telnet/telnet.c
+++ b/ports/cc3200/telnet/telnet.c
@@ -446,7 +446,7 @@ static void telnet_parse_input (uint8_t *str, int16_t *len) {
         if (*_str <= 127) {
             if (telnet_data.state == E_TELNET_STE_LOGGED_IN && *_str == mp_interrupt_char) {
                 // raise a keyboard exception
-                mp_keyboard_interrupt();
+                mp_sched_keyboard_interrupt();
                 (*len)--;
                 _str++;
             }
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 0c7d42210e..a06c910470 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -265,7 +265,7 @@ void *esp_native_code_commit(void *, size_t, void *);
 
 // Functions that should go in IRAM
 #define MICROPY_WRAP_MP_SCHED_EXCEPTION(f) IRAM_ATTR f
-#define MICROPY_WRAP_MP_KEYBOARD_INTERRUPT(f) IRAM_ATTR f
+#define MICROPY_WRAP_MP_SCHED_KEYBOARD_INTERRUPT(f) IRAM_ATTR f
 
 #define UINT_FMT "%u"
 #define INT_FMT "%d"
diff --git a/ports/esp32/uart.c b/ports/esp32/uart.c
index bd3eea9f6b..c4fe41eaff 100644
--- a/ports/esp32/uart.c
+++ b/ports/esp32/uart.c
@@ -55,7 +55,7 @@ STATIC void IRAM_ATTR uart_irq_handler(void *arg) {
         uint8_t c = READ_PERI_REG(UART_FIFO_AHB_REG(0)); // UART0
         #endif
         if (c == mp_interrupt_char) {
-            mp_keyboard_interrupt();
+            mp_sched_keyboard_interrupt();
         } else {
             // this is an inline function so will be in IRAM
             ringbuf_put(&stdin_ringbuf, c);
diff --git a/ports/esp32/usb.c b/ports/esp32/usb.c
index aa76321a7e..85a7a11c9e 100644
--- a/ports/esp32/usb.c
+++ b/ports/esp32/usb.c
@@ -50,7 +50,7 @@ static void usb_callback_rx(int itf, cdcacm_event_t *event) {
         }
         for (size_t i = 0; i < len; ++i) {
             if (usb_rx_buf[i] == mp_interrupt_char) {
-                mp_keyboard_interrupt();
+                mp_sched_keyboard_interrupt();
             } else {
                 ringbuf_put(&stdin_ringbuf, usb_rx_buf[i]);
             }
diff --git a/ports/esp8266/esp_mphal.h b/ports/esp8266/esp_mphal.h
index 89f4e0ff08..e9cf7e548d 100644
--- a/ports/esp8266/esp_mphal.h
+++ b/ports/esp8266/esp_mphal.h
@@ -29,7 +29,7 @@
 #include "lib/utils/interrupt_char.h"
 #include "xtirq.h"
 
-void mp_keyboard_interrupt(void);
+void mp_sched_keyboard_interrupt(void);
 
 struct _mp_print_t;
 // Structure for UART-only output via mp_printf()
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 52028e833a..ac47f0aa29 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -196,7 +196,7 @@ extern const struct _mp_obj_module_t mp_module_onewire;
 
 #define MP_FASTCODE(n) __attribute__((section(".iram0.text." #n))) n
 #define MICROPY_WRAP_MP_SCHED_EXCEPTION(f) MP_FASTCODE(f)
-#define MICROPY_WRAP_MP_KEYBOARD_INTERRUPT(f) MP_FASTCODE(f)
+#define MICROPY_WRAP_MP_SCHED_KEYBOARD_INTERRUPT(f) MP_FASTCODE(f)
 #define MICROPY_WRAP_MP_SCHED_SCHEDULE(f) MP_FASTCODE(f)
 
 #define WDEV_HWRNG ((volatile uint32_t *)0x3ff20e44)
diff --git a/ports/esp8266/uart.c b/ports/esp8266/uart.c
index 7d88555c05..5ac71da07d 100644
--- a/ports/esp8266/uart.c
+++ b/ports/esp8266/uart.c
@@ -42,7 +42,7 @@ static ringbuf_t uart_ringbuf = {uart_ringbuf_array, sizeof(uart_ringbuf_array),
 static void uart0_rx_intr_handler(void *para);
 
 void soft_reset(void);
-void mp_keyboard_interrupt(void);
+void mp_sched_keyboard_interrupt(void);
 
 /******************************************************************************
  * FunctionName : uart_config
@@ -179,7 +179,7 @@ static void uart0_rx_intr_handler(void *para) {
             // directly on stdin_ringbuf, rather than going via uart_ringbuf
             if (uart_attached_to_dupterm) {
                 if (RcvChar == mp_interrupt_char) {
-                    mp_keyboard_interrupt();
+                    mp_sched_keyboard_interrupt();
                 } else {
                     ringbuf_put(&stdin_ringbuf, RcvChar);
                 }
@@ -303,7 +303,7 @@ void ICACHE_FLASH_ATTR uart_task_handler(os_event_t *evt) {
     int c, ret = 0;
     while ((c = ringbuf_get(&stdin_ringbuf)) >= 0) {
         if (c == mp_interrupt_char) {
-            mp_keyboard_interrupt();
+            mp_sched_keyboard_interrupt();
         }
         ret = pyexec_event_repl_process_char(c);
         if (ret & PYEXEC_FORCED_EXIT) {
diff --git a/ports/javascript/Makefile b/ports/javascript/Makefile
index 3962e93f5f..9723675546 100644
--- a/ports/javascript/Makefile
+++ b/ports/javascript/Makefile
@@ -51,7 +51,7 @@ OBJ = $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_LIB:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 
-JSFLAGS = -O0 -s EXPORTED_FUNCTIONS="['_mp_js_init', '_mp_js_init_repl', '_mp_js_do_str', '_mp_js_process_char', '_mp_hal_get_interrupt_char', '_mp_keyboard_interrupt']" -s EXTRA_EXPORTED_RUNTIME_METHODS="['ccall', 'cwrap']" -s "BINARYEN_TRAP_MODE='clamp'" --memory-init-file 0 --js-library library.js
+JSFLAGS = -O0 -s EXPORTED_FUNCTIONS="['_mp_js_init', '_mp_js_init_repl', '_mp_js_do_str', '_mp_js_process_char', '_mp_hal_get_interrupt_char', '_mp_sched_keyboard_interrupt']" -s EXTRA_EXPORTED_RUNTIME_METHODS="['ccall', 'cwrap']" -s "BINARYEN_TRAP_MODE='clamp'" --memory-init-file 0 --js-library library.js
 
 all: $(BUILD)/micropython.js
 
diff --git a/ports/javascript/library.js b/ports/javascript/library.js
index 9aab3e4320..a8e54aaaca 100644
--- a/ports/javascript/library.js
+++ b/ports/javascript/library.js
@@ -55,7 +55,7 @@ mergeInto(LibraryManager.library, {
                 var n = fs.readSync(process.stdin.fd, buf, 0, 1);
                 if (n > 0) {
                     if (buf[0] == mp_interrupt_char) {
-                        Module.ccall('mp_keyboard_interrupt', 'null', ['null'], ['null']);
+                        Module.ccall('mp_sched_keyboard_interrupt', 'null', ['null'], ['null']);
                     } else {
                         process.stdout.write(String.fromCharCode(buf[0]));
                     }
diff --git a/ports/mimxrt/mphalport.c b/ports/mimxrt/mphalport.c
index 3032464d39..9fee3e85d0 100644
--- a/ports/mimxrt/mphalport.c
+++ b/ports/mimxrt/mphalport.c
@@ -37,7 +37,7 @@ void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char) {
     (void)itf;
     (void)wanted_char;
     tud_cdc_read_char(); // discard interrupt char
-    mp_keyboard_interrupt();
+    mp_sched_keyboard_interrupt();
 }
 
 void mp_hal_set_interrupt_char(int c) {
diff --git a/ports/nrf/drivers/bluetooth/ble_uart.c b/ports/nrf/drivers/bluetooth/ble_uart.c
index 64e3a05f93..96c2025d0f 100644
--- a/ports/nrf/drivers/bluetooth/ble_uart.c
+++ b/ports/nrf/drivers/bluetooth/ble_uart.c
@@ -193,7 +193,7 @@ STATIC void gatts_event_handler(mp_obj_t self_in, uint16_t event_id, uint16_t at
             for (uint16_t i = 0; i < length; i++) {
                 #if MICROPY_KBD_EXCEPTION
                 if (data[i] == mp_interrupt_char) {
-                    mp_keyboard_interrupt();
+                    mp_sched_keyboard_interrupt();
                     m_rx_ring_buffer.start = 0;
                     m_rx_ring_buffer.end = 0;
                 } else
diff --git a/ports/nrf/modules/machine/uart.c b/ports/nrf/modules/machine/uart.c
index 4f69bfc620..af95ae4b8d 100644
--- a/ports/nrf/modules/machine/uart.c
+++ b/ports/nrf/modules/machine/uart.c
@@ -128,7 +128,7 @@ STATIC void uart_event_handler(nrfx_uart_event_t const *p_event, void *p_context
         nrfx_uart_rx(self->p_uart, &self->buf->rx_buf[0], 1);
         #if !MICROPY_PY_BLE_NUS && MICROPY_KBD_EXCEPTION
         if (chr == mp_interrupt_char) {
-            mp_keyboard_interrupt();
+            mp_sched_keyboard_interrupt();
         } else
         #endif
         {
diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index 1122afcef7..1d77bc8f5d 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -52,7 +52,7 @@ void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char) {
     (void)itf;
     (void)wanted_char;
     tud_cdc_read_char(); // discard interrupt char
-    mp_keyboard_interrupt();
+    mp_sched_keyboard_interrupt();
 }
 
 void mp_hal_set_interrupt_char(int c) {
diff --git a/ports/rp2/uart.c b/ports/rp2/uart.c
index b7991563af..bcc41bfaf5 100644
--- a/ports/rp2/uart.c
+++ b/ports/rp2/uart.c
@@ -41,7 +41,7 @@ void uart_irq(void) {
         int c = uart_getc(uart_default);
         #if MICROPY_KBD_EXCEPTION
         if (c == mp_interrupt_char) {
-            mp_keyboard_interrupt();
+            mp_sched_keyboard_interrupt();
             return;
         }
         #endif
diff --git a/ports/samd/mphalport.c b/ports/samd/mphalport.c
index 357ec93a68..a87b7d2125 100644
--- a/ports/samd/mphalport.c
+++ b/ports/samd/mphalport.c
@@ -35,7 +35,7 @@ void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char) {
     (void)itf;
     (void)wanted_char;
     tud_cdc_read_char(); // discard interrupt char
-    mp_keyboard_interrupt();
+    mp_sched_keyboard_interrupt();
 }
 
 void mp_hal_set_interrupt_char(int c) {
diff --git a/ports/stm32/pendsv.c b/ports/stm32/pendsv.c
index 60b8709be3..3181ba616a 100644
--- a/ports/stm32/pendsv.c
+++ b/ports/stm32/pendsv.c
@@ -61,7 +61,7 @@ void pendsv_init(void) {
 // thread.
 void pendsv_kbd_intr(void) {
     if (MP_STATE_VM(mp_pending_exception) == MP_OBJ_NULL) {
-        mp_keyboard_interrupt();
+        mp_sched_keyboard_interrupt();
     } else {
         MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL;
         pendsv_object = &MP_STATE_VM(mp_kbd_exception);
diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index ef66c4fb59..220666e381 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -483,7 +483,7 @@ STATIC mp_obj_t extra_coverage(void) {
         }
 
         // setting the keyboard interrupt and raising it during mp_handle_pending
-        mp_keyboard_interrupt();
+        mp_sched_keyboard_interrupt();
         nlr_buf_t nlr;
         if (nlr_push(&nlr) == 0) {
             mp_handle_pending(true);
@@ -493,13 +493,13 @@ STATIC mp_obj_t extra_coverage(void) {
         }
 
         // setting the keyboard interrupt (twice) and cancelling it during mp_handle_pending
-        mp_keyboard_interrupt();
-        mp_keyboard_interrupt();
+        mp_sched_keyboard_interrupt();
+        mp_sched_keyboard_interrupt();
         mp_handle_pending(false);
 
         // setting keyboard interrupt and a pending event (intr should be handled first)
         mp_sched_schedule(MP_OBJ_FROM_PTR(&mp_builtin_print_obj), MP_OBJ_NEW_SMALL_INT(10));
-        mp_keyboard_interrupt();
+        mp_sched_keyboard_interrupt();
         if (nlr_push(&nlr) == 0) {
             mp_handle_pending(true);
             nlr_pop();
diff --git a/ports/unix/unix_mphal.c b/ports/unix/unix_mphal.c
index 28a4ca2c4a..d62991d34d 100644
--- a/ports/unix/unix_mphal.c
+++ b/ports/unix/unix_mphal.c
@@ -58,7 +58,7 @@ STATIC void sighandler(int signum) {
             // this is the second time we are called, so die straight away
             exit(1);
         }
-        mp_keyboard_interrupt();
+        mp_sched_keyboard_interrupt();
         #endif
     }
 }
diff --git a/ports/windows/windows_mphal.c b/ports/windows/windows_mphal.c
index 49daa05428..dd196f67af 100644
--- a/ports/windows/windows_mphal.c
+++ b/ports/windows/windows_mphal.c
@@ -84,7 +84,7 @@ BOOL WINAPI console_sighandler(DWORD evt) {
             // this is the second time we are called, so die straight away
             exit(1);
         }
-        mp_keyboard_interrupt();
+        mp_sched_keyboard_interrupt();
         return TRUE;
     }
     return FALSE;
diff --git a/ports/zephyr/src/zephyr_getchar.c b/ports/zephyr/src/zephyr_getchar.c
index 40dc1c3201..d75a8a76e3 100644
--- a/ports/zephyr/src/zephyr_getchar.c
+++ b/ports/zephyr/src/zephyr_getchar.c
@@ -21,7 +21,7 @@
 #include "zephyr_getchar.h"
 
 extern int mp_interrupt_char;
-void mp_keyboard_interrupt(void);
+void mp_sched_keyboard_interrupt(void);
 
 static struct k_sem uart_sem;
 #define UART_BUFSIZE 256
@@ -36,7 +36,7 @@ static int console_irq_input_hook(uint8_t ch)
         return 1;
     }
     if (ch == mp_interrupt_char) {
-        mp_keyboard_interrupt();
+        mp_sched_keyboard_interrupt();
         return 1;
     } else {
         uart_ringbuf[i_put] = ch;
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 2934f8ec89..4445e9aee2 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1508,8 +1508,8 @@ typedef double mp_float_t;
 #define MICROPY_WRAP_MP_SCHED_EXCEPTION(f) f
 #endif
 
-#ifndef MICROPY_WRAP_MP_KEYBOARD_INTERRUPT
-#define MICROPY_WRAP_MP_KEYBOARD_INTERRUPT(f) f
+#ifndef MICROPY_WRAP_MP_SCHED_KEYBOARD_INTERRUPT
+#define MICROPY_WRAP_MP_SCHED_KEYBOARD_INTERRUPT(f) f
 #endif
 
 #ifndef MICROPY_WRAP_MP_SCHED_SCHEDULE
diff --git a/py/runtime.h b/py/runtime.h
index 9ad4bc0242..7d2cb94e84 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -65,7 +65,7 @@ void mp_init(void);
 void mp_deinit(void);
 
 void mp_sched_exception(mp_obj_t exc);
-void mp_keyboard_interrupt(void);
+void mp_sched_keyboard_interrupt(void);
 void mp_handle_pending(bool raise_exc);
 void mp_handle_pending_tail(mp_uint_t atomic_state);
 
diff --git a/py/scheduler.c b/py/scheduler.c
index f37f8c3f86..9ff930007e 100644
--- a/py/scheduler.c
+++ b/py/scheduler.c
@@ -39,7 +39,7 @@ void mp_sched_exception(mp_obj_t exc) {
 
 #if MICROPY_KBD_EXCEPTION
 // This function may be called asynchronously at any time so only do the bare minimum.
-void MICROPY_WRAP_MP_KEYBOARD_INTERRUPT(mp_keyboard_interrupt)(void) {
+void MICROPY_WRAP_MP_SCHED_KEYBOARD_INTERRUPT(mp_sched_keyboard_interrupt)(void) {
     MP_STATE_VM(mp_kbd_exception).traceback_data = NULL;
     mp_sched_exception(MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception)));
 }

From 916c3fd23fc4b636a8007525c3bd6308d01509d0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 25 Apr 2021 22:24:49 +1000
Subject: [PATCH 048/349] py/scheduler: Add optional port hook for when
 something is scheduled.

So that a port can "wake up" when there is work to do.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mpconfig.h  | 6 ++++++
 py/scheduler.c | 1 +
 2 files changed, 7 insertions(+)

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 4445e9aee2..7337994a5e 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -550,6 +550,12 @@
 #define MICROPY_VM_HOOK_RETURN
 #endif
 
+// Hook for mp_sched_schedule when a function gets scheduled on sched_queue
+// (this macro executes within an atomic section)
+#ifndef MICROPY_SCHED_HOOK_SCHEDULED
+#define MICROPY_SCHED_HOOK_SCHEDULED
+#endif
+
 // Whether to include the garbage collector
 #ifndef MICROPY_ENABLE_GC
 #define MICROPY_ENABLE_GC (0)
diff --git a/py/scheduler.c b/py/scheduler.c
index 9ff930007e..947510c68b 100644
--- a/py/scheduler.c
+++ b/py/scheduler.c
@@ -134,6 +134,7 @@ bool MICROPY_WRAP_MP_SCHED_SCHEDULE(mp_sched_schedule)(mp_obj_t function, mp_obj
         uint8_t iput = IDX_MASK(MP_STATE_VM(sched_idx) + MP_STATE_VM(sched_len)++);
         MP_STATE_VM(sched_queue)[iput].func = function;
         MP_STATE_VM(sched_queue)[iput].arg = arg;
+        MICROPY_SCHED_HOOK_SCHEDULED;
         ret = true;
     } else {
         // schedule queue is full

From d120859857e9e34bded146977f18a2be8c53ce7b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 25 Apr 2021 22:28:55 +1000
Subject: [PATCH 049/349] zephyr: Run scheduled callbacks at REPL and during
 mp_hal_delay_ms.

And ctrl-C can now interrupt a time.sleep call.  This uses Zephyr's k_poll
API to wait efficiently for an event signal, and an optional semaphore.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/CMakeLists.txt       |  1 +
 ports/zephyr/main.c               |  2 +
 ports/zephyr/mpconfigport.h       |  3 ++
 ports/zephyr/mphalport.c          | 74 +++++++++++++++++++++++++++++++
 ports/zephyr/mphalport.h          |  5 ++-
 ports/zephyr/prj.conf             |  1 +
 ports/zephyr/prj_minimal.conf     |  1 +
 ports/zephyr/src/zephyr_getchar.c |  4 ++
 8 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 ports/zephyr/mphalport.c

diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index 716642979a..e30759e064 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -46,6 +46,7 @@ set(MICROPY_SOURCE_PORT
     modutime.c
     modzephyr.c
     modzsensor.c
+    mphalport.c
     uart_core.c
     zephyr_storage.c
 )
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index 74785cc830..f8ec0a0d27 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -45,6 +45,7 @@
 #include "py/runtime.h"
 #include "py/repl.h"
 #include "py/gc.h"
+#include "py/mphal.h"
 #include "py/stackctrl.h"
 #include "lib/utils/pyexec.h"
 #include "lib/mp-readline/readline.h"
@@ -123,6 +124,7 @@ int real_main(void) {
     mp_stack_set_limit(CONFIG_MAIN_STACK_SIZE - 512);
 
     init_zephyr();
+    mp_hal_init();
 
     #ifdef TEST
     static const char *argv[] = {"test"};
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 966f7f7e94..162ac8a576 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -96,6 +96,9 @@
 #define MICROPY_COMP_CONST (0)
 #define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN (0)
 
+void mp_hal_signal_event(void);
+#define MICROPY_SCHED_HOOK_SCHEDULED mp_hal_signal_event()
+
 #define MICROPY_PY_SYS_PLATFORM "zephyr"
 
 #ifdef CONFIG_BOARD
diff --git a/ports/zephyr/mphalport.c b/ports/zephyr/mphalport.c
new file mode 100644
index 0000000000..4f00cbd26c
--- /dev/null
+++ b/ports/zephyr/mphalport.c
@@ -0,0 +1,74 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ *
+ * 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/runtime.h"
+#include "py/mphal.h"
+
+static struct k_poll_signal wait_signal;
+static struct k_poll_event wait_events[2] = {
+    K_POLL_EVENT_INITIALIZER(K_POLL_TYPE_SIGNAL,
+        K_POLL_MODE_NOTIFY_ONLY,
+        &wait_signal),
+    K_POLL_EVENT_STATIC_INITIALIZER(K_POLL_TYPE_SEM_AVAILABLE,
+        K_POLL_MODE_NOTIFY_ONLY,
+        NULL, 0),
+};
+
+void mp_hal_init(void) {
+    k_poll_signal_init(&wait_signal);
+}
+
+void mp_hal_signal_event(void) {
+    k_poll_signal_raise(&wait_signal, 0);
+}
+
+void mp_hal_wait_sem(struct k_sem *sem, uint32_t timeout_ms) {
+    mp_uint_t t0 = mp_hal_ticks_ms();
+    if (sem) {
+        k_poll_event_init(&wait_events[1], K_POLL_TYPE_SEM_AVAILABLE, K_POLL_MODE_NOTIFY_ONLY, sem);
+    }
+    for (;;) {
+        k_timeout_t wait;
+        if (timeout_ms == (uint32_t)-1) {
+            wait = K_FOREVER;
+        } else {
+            uint32_t dt = mp_hal_ticks_ms() - t0;
+            if (dt >= timeout_ms) {
+                return;
+            }
+            wait = K_MSEC(timeout_ms - dt);
+        }
+        k_poll(wait_events, sem ? 2 : 1, wait);
+        if (wait_events[0].state == K_POLL_STATE_SIGNALED) {
+            wait_events[0].signal->signaled = 0;
+            wait_events[0].state = K_POLL_STATE_NOT_READY;
+            mp_handle_pending(true);
+        } else if (sem && wait_events[1].state == K_POLL_STATE_SEM_AVAILABLE) {
+            wait_events[1].state = K_POLL_STATE_NOT_READY;
+            return;
+        }
+    }
+}
diff --git a/ports/zephyr/mphalport.h b/ports/zephyr/mphalport.h
index b3154b649b..63a18e1388 100644
--- a/ports/zephyr/mphalport.h
+++ b/ports/zephyr/mphalport.h
@@ -1,6 +1,9 @@
 #include <zephyr.h>
 #include "lib/utils/interrupt_char.h"
 
+void mp_hal_init(void);
+void mp_hal_wait_sem(struct k_sem *sem, uint32_t timeout_ms);
+
 static inline mp_uint_t mp_hal_ticks_us(void) {
     return k_cyc_to_ns_floor64(k_cycle_get_32()) / 1000;
 }
@@ -21,7 +24,7 @@ static inline void mp_hal_delay_us(mp_uint_t delay) {
 }
 
 static inline void mp_hal_delay_ms(mp_uint_t delay) {
-    k_msleep(delay);
+    mp_hal_wait_sem(NULL, delay);
 }
 
 static inline uint64_t mp_hal_time_ns(void) {
diff --git a/ports/zephyr/prj.conf b/ports/zephyr/prj.conf
index c9c2e96da9..9e855036d2 100644
--- a/ports/zephyr/prj.conf
+++ b/ports/zephyr/prj.conf
@@ -13,6 +13,7 @@ CONFIG_CONSOLE_PUTCHAR_BUFSIZE=128
 CONFIG_NEWLIB_LIBC=y
 CONFIG_FPU=y
 CONFIG_MAIN_STACK_SIZE=4736
+CONFIG_POLL=y
 
 # Enable sensor subsystem (doesn't add code if not used).
 # Specific sensors should be enabled per-board.
diff --git a/ports/zephyr/prj_minimal.conf b/ports/zephyr/prj_minimal.conf
index 8b2104925a..806e26af77 100644
--- a/ports/zephyr/prj_minimal.conf
+++ b/ports/zephyr/prj_minimal.conf
@@ -1,6 +1,7 @@
 CONFIG_NEWLIB_LIBC=y
 CONFIG_FPU=y
 CONFIG_MAIN_STACK_SIZE=4096
+CONFIG_POLL=y
 
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_CONSOLE_SUBSYS=y
diff --git a/ports/zephyr/src/zephyr_getchar.c b/ports/zephyr/src/zephyr_getchar.c
index d75a8a76e3..95d0b49959 100644
--- a/ports/zephyr/src/zephyr_getchar.c
+++ b/ports/zephyr/src/zephyr_getchar.c
@@ -22,6 +22,8 @@
 
 extern int mp_interrupt_char;
 void mp_sched_keyboard_interrupt(void);
+void mp_hal_signal_event(void);
+void mp_hal_wait_sem(struct k_sem *sem, uint32_t timeout_ms);
 
 static struct k_sem uart_sem;
 #define UART_BUFSIZE 256
@@ -36,6 +38,7 @@ static int console_irq_input_hook(uint8_t ch)
         return 1;
     }
     if (ch == mp_interrupt_char) {
+        mp_hal_signal_event();
         mp_sched_keyboard_interrupt();
         return 1;
     } else {
@@ -49,6 +52,7 @@ static int console_irq_input_hook(uint8_t ch)
 }
 
 uint8_t zephyr_getchar(void) {
+    mp_hal_wait_sem(&uart_sem, -1);
     k_sem_take(&uart_sem, K_FOREVER);
     unsigned int key = irq_lock();
     uint8_t c = uart_ringbuf[i_get++];

From b46a033e25eef64b8ef52a8408f99b666d32daae Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 26 Apr 2021 00:36:27 +1000
Subject: [PATCH 050/349] zephyr/modmachine: Add machine.idle().

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/modmachine.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c
index 107895bea0..4353083eeb 100644
--- a/ports/zephyr/modmachine.c
+++ b/ports/zephyr/modmachine.c
@@ -53,12 +53,19 @@ STATIC mp_obj_t machine_reset_cause(void) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause);
 
+STATIC mp_obj_t machine_idle(void) {
+    k_yield();
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_idle_obj, machine_idle);
+
 STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_umachine) },
     #ifdef CONFIG_REBOOT
     { MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&machine_reset_obj) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_reset_cause), MP_ROM_PTR(&machine_reset_cause_obj) },
+    { MP_ROM_QSTR(MP_QSTR_idle), MP_ROM_PTR(&machine_idle_obj) },
 
     #if MICROPY_PY_MACHINE_I2C
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&machine_hard_i2c_type) },

From 888664130c6605f333a6901e821589dee43f6ebb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Apr 2021 11:12:14 +1000
Subject: [PATCH 051/349] zephyr/boards: Add config for nucleo_wb55rg board.

This board does not work with CONFIG_NETWORKING enabled.  And
CONFIG_CONSOLE_SUBSYS is enabled so that ctrl-C works.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/boards/nucleo_wb55rg.conf | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 ports/zephyr/boards/nucleo_wb55rg.conf

diff --git a/ports/zephyr/boards/nucleo_wb55rg.conf b/ports/zephyr/boards/nucleo_wb55rg.conf
new file mode 100644
index 0000000000..369dabddeb
--- /dev/null
+++ b/ports/zephyr/boards/nucleo_wb55rg.conf
@@ -0,0 +1,2 @@
+CONFIG_CONSOLE_SUBSYS=n
+CONFIG_NETWORKING=n

From 76dab3bf31617e707a874a6c0dfc49af97640980 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 30 Apr 2021 10:12:04 +1000
Subject: [PATCH 052/349] tests/run-multitests.py: Provide some convenient
 serial device shorcuts.

It's now possible to specify a device serial port using shorcuts like:

    $ ./run-multitests.py -i pyb:a0 -i pyb:u1 multi_bluetooth/*.py

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-multitests.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/run-multitests.py b/tests/run-multitests.py
index cdb2730eda..3163a48e63 100755
--- a/tests/run-multitests.py
+++ b/tests/run-multitests.py
@@ -160,7 +160,17 @@ class PyInstanceSubProcess(PyInstance):
 
 
 class PyInstancePyboard(PyInstance):
+    @staticmethod
+    def map_device_shortcut(device):
+        if device[0] == "a" and device[1:].isdigit():
+            return "/dev/ttyACM" + device[1:]
+        elif device[0] == "u" and device[1:].isdigit():
+            return "/dev/ttyUSB" + device[1:]
+        else:
+            return device
+
     def __init__(self, device):
+        device = self.map_device_shortcut(device)
         self.device = device
         self.pyb = pyboard.Pyboard(device)
         self.pyb.enter_raw_repl()

From 1d9528210b8a29be7e799be37224706633f7a4d5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 10 Mar 2021 23:32:59 +1100
Subject: [PATCH 053/349] tests/multi_bluetooth: Add performance test for gatt
 char writes.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/multi_bluetooth/perf_gatt_char_write.py | 151 ++++++++++++++++++
 .../perf_gatt_char_write.py.exp               |  24 +++
 2 files changed, 175 insertions(+)
 create mode 100644 tests/multi_bluetooth/perf_gatt_char_write.py
 create mode 100644 tests/multi_bluetooth/perf_gatt_char_write.py.exp

diff --git a/tests/multi_bluetooth/perf_gatt_char_write.py b/tests/multi_bluetooth/perf_gatt_char_write.py
new file mode 100644
index 0000000000..00607f0090
--- /dev/null
+++ b/tests/multi_bluetooth/perf_gatt_char_write.py
@@ -0,0 +1,151 @@
+# Write characteristic from central to peripheral and time data rate.
+
+from micropython import const
+import time, machine, bluetooth
+
+TIMEOUT_MS = 2000
+
+_IRQ_CENTRAL_CONNECT = const(1)
+_IRQ_CENTRAL_DISCONNECT = const(2)
+_IRQ_GATTS_WRITE = const(3)
+_IRQ_PERIPHERAL_CONNECT = const(7)
+_IRQ_PERIPHERAL_DISCONNECT = const(8)
+_IRQ_GATTC_CHARACTERISTIC_RESULT = const(11)
+_IRQ_GATTC_CHARACTERISTIC_DONE = const(12)
+_IRQ_GATTC_WRITE_DONE = const(17)
+_IRQ_MTU_EXCHANGED = const(21)
+
+# How long to run the test for.
+_NUM_NOTIFICATIONS = const(40)
+_MTU_SIZE = const(131)
+_CHAR_SIZE = const(_MTU_SIZE - 3)
+
+SERVICE_UUID = bluetooth.UUID("A5A5A5A5-FFFF-9999-1111-5A5A5A5A5A5A")
+CHAR_UUID = bluetooth.UUID("00000000-1111-2222-3333-444444444444")
+CHAR = (CHAR_UUID, bluetooth.FLAG_WRITE | bluetooth.FLAG_WRITE_NO_RESPONSE)
+SERVICE = (SERVICE_UUID, (CHAR,))
+SERVICES = (SERVICE,)
+
+packet_sequence = 0
+waiting_events = {}
+
+
+def irq(event, data):
+    if event == _IRQ_CENTRAL_CONNECT:
+        waiting_events[event] = data[0]
+    elif event == _IRQ_PERIPHERAL_CONNECT:
+        waiting_events[event] = data[0]
+    elif event == _IRQ_GATTS_WRITE:
+        global packet_sequence
+        conn_handle, attr_handle = data
+        data = ble.gatts_read(attr_handle)
+        if not (data[0] == packet_sequence and data[-1] == (256 - packet_sequence) & 0xFF):
+            print("_IRQ_GATTS_WRITE data invalid:", packet_sequence, data)
+        elif packet_sequence % 10 == 0:
+            print("_IRQ_GATTS_WRITE", packet_sequence)
+        packet_sequence += 1
+    elif event == _IRQ_GATTC_CHARACTERISTIC_RESULT:
+        # conn_handle, def_handle, value_handle, properties, uuid = data
+        if data[-1] == CHAR_UUID:
+            waiting_events[event] = data[2]
+        else:
+            return
+    elif event == _IRQ_MTU_EXCHANGED:
+        # ATT MTU exchange complete (either initiated by us or the remote device).
+        conn_handle, mtu = data
+        print("_IRQ_MTU_EXCHANGED:", mtu)
+
+    if event not in waiting_events:
+        waiting_events[event] = None
+
+
+def wait_for_event(event, timeout_ms):
+    t0 = time.ticks_ms()
+    while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
+        if event in waiting_events:
+            return waiting_events.pop(event)
+        machine.idle()
+    raise ValueError("Timeout waiting for {}".format(event))
+
+
+# Acting in peripheral role.
+def instance0():
+    multitest.globals(BDADDR=ble.config("mac"))
+    ((char_handle,),) = ble.gatts_register_services(SERVICES)
+    ble.gatts_set_buffer(char_handle, _CHAR_SIZE)
+    print("gap_advertise")
+    ble.gap_advertise(20_000, b"\x02\x01\x06\x04\xffMPY")
+    multitest.next()
+    try:
+        # Wait for central to connect to us.
+        conn_handle = wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS)
+        # Wait for central to disconnect us.
+        wait_for_event(_IRQ_CENTRAL_DISCONNECT, 30000)
+        print("final packet_sequence:", packet_sequence)
+    finally:
+        ble.active(0)
+
+
+# Acting in central role.
+def instance1():
+    global packet_sequence
+    ((char_handle,),) = ble.gatts_register_services(SERVICES)
+    multitest.next()
+    try:
+        # Connect to peripheral and then disconnect.
+        print("gap_connect")
+        ble.config(mtu=_MTU_SIZE)
+        ble.gap_connect(*BDADDR)
+        conn_handle = wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS)
+        ble.gattc_exchange_mtu(conn_handle)
+
+        # Discover characteristics.
+        ble.gattc_discover_characteristics(conn_handle, 1, 65535)
+        value_handle = wait_for_event(_IRQ_GATTC_CHARACTERISTIC_RESULT, TIMEOUT_MS)
+        wait_for_event(_IRQ_GATTC_CHARACTERISTIC_DONE, TIMEOUT_MS)
+
+        # Send data!
+        data = bytearray(ord("A") + (i % 64) for i in range(_CHAR_SIZE))
+        for mode in (0, 1):
+            ticks_start = time.ticks_ms()
+            for i in range(_NUM_NOTIFICATIONS):
+                data[0] = packet_sequence
+                data[-1] = 256 - packet_sequence
+                if packet_sequence % 10 == 0:
+                    print("gattc_write", packet_sequence)
+                if mode == 0:
+                    while True:
+                        try:
+                            ble.gattc_write(conn_handle, value_handle, data, mode)
+                            break
+                        except OSError:
+                            pass
+                else:
+                    ble.gattc_write(conn_handle, value_handle, data, mode)
+                    wait_for_event(_IRQ_GATTC_WRITE_DONE, TIMEOUT_MS)
+                packet_sequence += 1
+
+            ticks_end = time.ticks_ms()
+            ticks_total = time.ticks_diff(ticks_end, ticks_start)
+
+            print(
+                "Did {} writes in {} ms. {} ms/write, {} bytes/sec".format(
+                    _NUM_NOTIFICATIONS,
+                    ticks_total,
+                    ticks_total / _NUM_NOTIFICATIONS,
+                    _NUM_NOTIFICATIONS * len(data) * 1000 // ticks_total,
+                )
+            )
+
+            time.sleep_ms(100)
+
+        # DIsconnect the peripheral.
+        print("gap_disconnect:", ble.gap_disconnect(conn_handle))
+        wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, 20000)
+    finally:
+        ble.active(0)
+
+
+ble = bluetooth.BLE()
+ble.active(1)
+ble.irq(irq)
diff --git a/tests/multi_bluetooth/perf_gatt_char_write.py.exp b/tests/multi_bluetooth/perf_gatt_char_write.py.exp
new file mode 100644
index 0000000000..4dda5e04f0
--- /dev/null
+++ b/tests/multi_bluetooth/perf_gatt_char_write.py.exp
@@ -0,0 +1,24 @@
+--- instance0 ---
+gap_advertise
+_IRQ_MTU_EXCHANGED: 131
+_IRQ_GATTS_WRITE 0
+_IRQ_GATTS_WRITE 10
+_IRQ_GATTS_WRITE 20
+_IRQ_GATTS_WRITE 30
+_IRQ_GATTS_WRITE 40
+_IRQ_GATTS_WRITE 50
+_IRQ_GATTS_WRITE 60
+_IRQ_GATTS_WRITE 70
+final packet_sequence: 80
+--- instance1 ---
+gap_connect
+_IRQ_MTU_EXCHANGED: 131
+gattc_write 0
+gattc_write 10
+gattc_write 20
+gattc_write 30
+gattc_write 40
+gattc_write 50
+gattc_write 60
+gattc_write 70
+gap_disconnect: True

From 6b7c8d3e7283a6c94687ba7dcb8beb94c2dc9eef Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 30 Apr 2021 16:26:42 +1000
Subject: [PATCH 054/349] py/runtime: Remove commented-out code from
 mp_deinit().

These commented-out lines of code have been unused for a long time, so
remove them to avoid confusion as to why they are there.

mp_obj_dict_free() never existed, this line was converted from
mp_map_deinit() and commented out as soon as it was added.  The call to
mp_map_deinit(mp_loaded_modules_map) was commented in
1a1d11fa32ba043d22995d28cbc039cfa5f3cc46.

Fixes issue #3507.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/runtime.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/py/runtime.c b/py/runtime.c
index 18a7c8565d..1ca0702e19 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -155,9 +155,6 @@ void mp_deinit(void) {
     #ifdef MICROPY_PORT_DEINIT_FUNC
     MICROPY_PORT_DEINIT_FUNC;
     #endif
-
-    // mp_obj_dict_free(&dict_main);
-    // mp_map_deinit(&MP_STATE_VM(mp_loaded_modules_map));
 }
 
 mp_obj_t mp_load_name(qstr qst) {

From 9e1b25a99e9107619c6ed607c730ea2869582799 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 30 Apr 2021 16:42:51 +1000
Subject: [PATCH 055/349] docs/library/machine: Specify initial machine.PWM
 class.

This adds an initial specification of the machine.PWM class, to provide a
way to generate PWM output that is portable across the different ports.
Such functionality may already be available in one way or another (eg
through a Timer object), but because configuring PWM via a Timer is very
port-specific, and because it's a common thing to do, it's beneficial to
have a top-level construct for it.

The specification in this commit aims to provide core functionality in a
minimal way.  It also somewhat matches most existing ad-hoc implementations
of machine.PWM.

See discussion in #2283 and #4237.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/machine.PWM.rst | 79 ++++++++++++++++++++++++++++++++++++
 docs/library/machine.rst     |  1 +
 2 files changed, 80 insertions(+)
 create mode 100644 docs/library/machine.PWM.rst

diff --git a/docs/library/machine.PWM.rst b/docs/library/machine.PWM.rst
new file mode 100644
index 0000000000..f2273d8b45
--- /dev/null
+++ b/docs/library/machine.PWM.rst
@@ -0,0 +1,79 @@
+.. currentmodule:: machine
+.. _machine.PWM:
+
+class PWM -- pulse width modulation
+===================================
+
+This class provides pulse width modulation output.
+
+Example usage::
+
+    from machine import PWM
+
+    pwm = PWM(pin)          # create a PWM object on a pin
+    pwm.duty_u16(32768)     # set duty to 50%
+
+    # reinitialise with a period of 200us, duty of 5us
+    pwm.init(freq=5000, duty_ns=5000)
+
+    pwm.duty_ns(3000)       # set pulse width to 3us
+
+    pwm.deinit()
+
+Constructors
+------------
+
+.. class:: PWM(dest, \*, freq, duty_u16, duty_ns)
+
+   Construct and return a new PWM object using the following parameters:
+
+      - *dest* is the entity on which the PWM is output, which is usually a
+        :ref:`machine.Pin <machine.Pin>` object, but a port may allow other values,
+        like integers.
+      - *freq* should be an integer which sets the frequency in Hz for the
+        PWM cycle.
+      - *duty_u16* sets the duty cycle as a ratio ``duty_u16 / 65535``.
+      - *duty_ns* sets the pulse width in nanoseconds.
+
+   Setting *freq* may affect other PWM objects if the objects share the same
+   underlying PWM generator (this is hardware specific).
+   Only one of *duty_u16* and *duty_ns* should be specified at a time.
+
+Methods
+-------
+
+.. method:: PWM.init(\*, freq, duty_u16, duty_ns)
+
+   Modify settings for the PWM object.  See the above constructor for details
+   about the parameters.
+
+.. method:: PWM.deinit()
+
+   Disable the PWM output.
+
+.. method:: PWM.freq([value])
+
+   Get or set the current frequency of the PWM output.
+
+   With no arguments the frequency in Hz is returned.
+
+   With a single *value* argument the frequency is set to that value in Hz.  The
+   method may raise a ``ValueError`` if the frequency is outside the valid range.
+
+.. method:: PWM.duty_u16([value])
+
+   Get or set the current duty cycle of the PWM output, as an unsigned 16-bit
+   value in the range 0 to 65535 inclusive.
+
+   With no arguments the duty cycle is returned.
+
+   With a single *value* argument the duty cycle is set to that value, measured
+   as the ratio ``value / 65535``.
+
+.. method:: PWM.duty_ns([value])
+
+   Get or set the current pulse width of the PWM output, as a value in nanoseconds.
+
+   With no arguments the pulse width in nanoseconds is returned.
+
+   With a single *value* argument the pulse width is set to that value.
diff --git a/docs/library/machine.rst b/docs/library/machine.rst
index 18dc6f2afa..5076dc30e0 100644
--- a/docs/library/machine.rst
+++ b/docs/library/machine.rst
@@ -167,6 +167,7 @@ Classes
    machine.Pin.rst
    machine.Signal.rst
    machine.ADC.rst
+   machine.PWM.rst
    machine.UART.rst
    machine.SPI.rst
    machine.I2C.rst

From dd5c831a0b0c960b638109f1886edc10178f51a1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 30 Apr 2021 16:55:55 +1000
Subject: [PATCH 056/349] docs/library/machine: Add machine.bootloader docs.

This is provide by a few ports now, and is very useful.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/machine.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/library/machine.rst b/docs/library/machine.rst
index 5076dc30e0..f831049f88 100644
--- a/docs/library/machine.rst
+++ b/docs/library/machine.rst
@@ -37,6 +37,14 @@ Reset related functions
 
    Get the reset cause. See :ref:`constants <machine_constants>` for the possible return values.
 
+.. function:: bootloader([value])
+
+   Reset the device and enter its bootloader.  This is typically used to put the
+   device into a state where it can be programmed with new firmware.
+
+   Some ports support passing in an optional *value* argument which can control
+   which bootloader to enter, what to pass to it, or other things.
+
 Interrupt related functions
 ---------------------------
 

From aa061ae391f2a8fbb16ace31ae0e4ae35b6ad5e9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 30 Apr 2021 16:48:29 +1000
Subject: [PATCH 057/349] py/scheduler: Add missing
 MICROPY_WRAP_MP_SCHED_EXCEPTION usage.

This was missed in commit 7cbf826a9575e18ce1b7fe11b0f0997509153260.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/scheduler.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/scheduler.c b/py/scheduler.c
index 947510c68b..0671a34a8c 100644
--- a/py/scheduler.c
+++ b/py/scheduler.c
@@ -28,7 +28,7 @@
 
 #include "py/runtime.h"
 
-void mp_sched_exception(mp_obj_t exc) {
+void MICROPY_WRAP_MP_SCHED_EXCEPTION(mp_sched_exception)(mp_obj_t exc) {
     MP_STATE_VM(mp_pending_exception) = exc;
     #if MICROPY_ENABLE_SCHEDULER
     if (MP_STATE_VM(sched_state) == MP_SCHED_IDLE) {

From 1f1a54d0b1371efcfec6ca1b03d21b07a908c70d Mon Sep 17 00:00:00 2001
From: Kathryn Lingel <kathryn@lingel.net>
Date: Mon, 6 May 2019 12:16:29 -0700
Subject: [PATCH 058/349] py/repl: Filter private methods from tab completion.

Anything beginning with "_" will now only be tab-completed if there is
already a partial match for such an entry.  In other words, entering
foo.<tab> will no longer complete/list anything beginning with "_".

Originally at adafruit#1850

Signed-off-by: Kathryn Lingel <kathryn@lingel.net>
---
 py/repl.c                        |  5 +++++
 tests/unix/extra_coverage.py.exp | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/py/repl.c b/py/repl.c
index c758fc067b..3b1837031b 100644
--- a/py/repl.c
+++ b/py/repl.c
@@ -197,6 +197,11 @@ size_t mp_repl_autocomplete(const char *str, size_t len, const mp_print_t *print
             for (qstr q = MP_QSTR_ + 1; q < nqstr; ++q) {
                 size_t d_len;
                 const char *d_str = (const char *)qstr_data(q, &d_len);
+                // special case; filter out words that begin with underscore
+                // unless there's already a partial match
+                if (s_len == 0 && d_str[0] == '_') {
+                    continue;
+                }
                 if (s_len <= d_len && strncmp(s_start, d_str, s_len) == 0) {
                     mp_load_method_protected(obj, q, dest, true);
                     if (dest[0] != MP_OBJ_NULL) {
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index d97de2c0ef..ab4d977741 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -28,11 +28,11 @@ RuntimeError:
 # repl
 ame__
 
-__class__       __name__        argv            atexit
-byteorder       exc_info        exit            getsizeof
-implementation  maxsize         modules         path
-platform        print_exception                 stderr
-stdin           stdout          version         version_info
+argv            atexit          byteorder       exc_info
+exit            getsizeof       implementation  maxsize
+modules         path            platform        print_exception
+stderr          stdin           stdout          version
+version_info
 ementation
 # attrtuple
 (start=1, stop=2, step=3)

From befbff31b73d5373b5933a3762a3a3c6e871e8da Mon Sep 17 00:00:00 2001
From: scottbelden <scottabelden@gmail.com>
Date: Tue, 7 May 2019 13:55:20 -0400
Subject: [PATCH 059/349] py/repl: Enter four spaces when there are no matches.

Originally at adafruit#1859

Signed-off-by: scottbelden <scottabelden@gmail.com>
---
 py/repl.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/py/repl.c b/py/repl.c
index 3b1837031b..a8ae1d0695 100644
--- a/py/repl.c
+++ b/py/repl.c
@@ -228,6 +228,10 @@ size_t mp_repl_autocomplete(const char *str, size_t len, const mp_print_t *print
 
             // nothing found
             if (q_first == 0) {
+                if (s_len == 0) {
+                    *compl_str = "    ";
+                    return 4;
+                }
                 // If there're no better alternatives, and if it's first word
                 // in the line, try to complete "import".
                 if (s_start == org_str) {

From f85ea8d4fe12251100989287f1cfe14af8650217 Mon Sep 17 00:00:00 2001
From: Artyom Skrobov <tyomitch@gmail.com>
Date: Wed, 7 Apr 2021 13:09:39 -0400
Subject: [PATCH 060/349] py/repl: Refactor autocomplete to reduce nesting.

Originally at adafruit#4548

Signed-off-by: Artyom Skrobov <tyomitch@gmail.com>
---
 py/repl.c | 219 +++++++++++++++++++++++++++---------------------------
 1 file changed, 111 insertions(+), 108 deletions(-)

diff --git a/py/repl.c b/py/repl.c
index a8ae1d0695..b5ff145197 100644
--- a/py/repl.c
+++ b/py/repl.c
@@ -161,131 +161,134 @@ size_t mp_repl_autocomplete(const char *str, size_t len, const mp_print_t *print
     mp_obj_t obj = MP_OBJ_FROM_PTR(&mp_module___main__);
     mp_obj_t dest[2];
 
+    const char *s_start;
+    size_t s_len;
+
     for (;;) {
         // get next word in string to complete
-        const char *s_start = str;
+        s_start = str;
         while (str < top && *str != '.') {
             ++str;
         }
-        size_t s_len = str - s_start;
+        s_len = str - s_start;
 
-        if (str < top) {
-            // a complete word, lookup in current object
-            qstr q = qstr_find_strn(s_start, s_len);
-            if (q == MP_QSTRnull) {
-                // lookup will fail
-                return 0;
-            }
-            mp_load_method_protected(obj, q, dest, true);
-            obj = dest[0]; // attribute, method, or MP_OBJ_NULL if nothing found
-
-            if (obj == MP_OBJ_NULL) {
-                // lookup failed
-                return 0;
-            }
-
-            // skip '.' to move to next word
-            ++str;
-
-        } else {
+        if (str == top) {
             // end of string, do completion on this partial name
+            break;
+        }
 
-            // look for matches
-            const char *match_str = NULL;
-            size_t match_len = 0;
-            qstr q_first = 0, q_last = 0;
-            for (qstr q = MP_QSTR_ + 1; q < nqstr; ++q) {
-                size_t d_len;
-                const char *d_str = (const char *)qstr_data(q, &d_len);
-                // special case; filter out words that begin with underscore
-                // unless there's already a partial match
-                if (s_len == 0 && d_str[0] == '_') {
-                    continue;
-                }
-                if (s_len <= d_len && strncmp(s_start, d_str, s_len) == 0) {
-                    mp_load_method_protected(obj, q, dest, true);
-                    if (dest[0] != MP_OBJ_NULL) {
-                        if (match_str == NULL) {
-                            match_str = d_str;
-                            match_len = d_len;
-                        } else {
-                            // search for longest common prefix of match_str and d_str
-                            // (assumes these strings are null-terminated)
-                            for (size_t j = s_len; j <= match_len && j <= d_len; ++j) {
-                                if (match_str[j] != d_str[j]) {
-                                    match_len = j;
-                                    break;
-                                }
-                            }
-                        }
-                        if (q_first == 0) {
-                            q_first = q;
-                        }
-                        q_last = q;
-                    }
-                }
-            }
+        // a complete word, lookup in current object
+        qstr q = qstr_find_strn(s_start, s_len);
+        if (q == MP_QSTRnull) {
+            // lookup will fail
+            return 0;
+        }
+        mp_load_method_protected(obj, q, dest, true);
+        obj = dest[0]; // attribute, method, or MP_OBJ_NULL if nothing found
 
-            // nothing found
-            if (q_first == 0) {
-                if (s_len == 0) {
-                    *compl_str = "    ";
-                    return 4;
-                }
-                // If there're no better alternatives, and if it's first word
-                // in the line, try to complete "import".
-                if (s_start == org_str) {
-                    static const char import_str[] = "import ";
-                    if (memcmp(s_start, import_str, s_len) == 0) {
-                        *compl_str = import_str + s_len;
-                        return sizeof(import_str) - 1 - s_len;
-                    }
-                }
+        if (obj == MP_OBJ_NULL) {
+            // lookup failed
+            return 0;
+        }
 
-                return 0;
-            }
+        // skip '.' to move to next word
+        ++str;
+    }
 
-            // 1 match found, or multiple matches with a common prefix
-            if (q_first == q_last || match_len > s_len) {
-                *compl_str = match_str + s_len;
-                return match_len - s_len;
-            }
-
-            // multiple matches found, print them out
-
-            #define WORD_SLOT_LEN (16)
-            #define MAX_LINE_LEN  (4 * WORD_SLOT_LEN)
-
-            int line_len = MAX_LINE_LEN; // force a newline for first word
-            for (qstr q = q_first; q <= q_last; ++q) {
-                size_t d_len;
-                const char *d_str = (const char *)qstr_data(q, &d_len);
-                if (s_len <= d_len && strncmp(s_start, d_str, s_len) == 0) {
-                    mp_load_method_protected(obj, q, dest, true);
-                    if (dest[0] != MP_OBJ_NULL) {
-                        int gap = (line_len + WORD_SLOT_LEN - 1) / WORD_SLOT_LEN * WORD_SLOT_LEN - line_len;
-                        if (gap < 2) {
-                            gap += WORD_SLOT_LEN;
-                        }
-                        if (line_len + gap + d_len <= MAX_LINE_LEN) {
-                            // TODO optimise printing of gap?
-                            for (int j = 0; j < gap; ++j) {
-                                mp_print_str(print, " ");
-                            }
-                            mp_print_str(print, d_str);
-                            line_len += gap + d_len;
-                        } else {
-                            mp_printf(print, "\n%s", d_str);
-                            line_len = d_len;
+    // look for matches
+    const char *match_str = NULL;
+    size_t match_len = 0;
+    qstr q_first = 0, q_last = 0;
+    for (qstr q = MP_QSTR_ + 1; q < nqstr; ++q) {
+        size_t d_len;
+        const char *d_str = (const char *)qstr_data(q, &d_len);
+        // special case; filter out words that begin with underscore
+        // unless there's already a partial match
+        if (s_len == 0 && d_str[0] == '_') {
+            continue;
+        }
+        if (s_len <= d_len && strncmp(s_start, d_str, s_len) == 0) {
+            mp_load_method_protected(obj, q, dest, true);
+            if (dest[0] != MP_OBJ_NULL) {
+                if (match_str == NULL) {
+                    match_str = d_str;
+                    match_len = d_len;
+                } else {
+                    // search for longest common prefix of match_str and d_str
+                    // (assumes these strings are null-terminated)
+                    for (size_t j = s_len; j <= match_len && j <= d_len; ++j) {
+                        if (match_str[j] != d_str[j]) {
+                            match_len = j;
+                            break;
                         }
                     }
                 }
+                if (q_first == 0) {
+                    q_first = q;
+                }
+                q_last = q;
             }
-            mp_print_str(print, "\n");
-
-            return (size_t)(-1); // indicate many matches
         }
     }
+
+    // nothing found
+    if (q_first == 0) {
+        if (s_len == 0) {
+            *compl_str = "    ";
+            return 4;
+        }
+        // If there're no better alternatives, and if it's first word
+        // in the line, try to complete "import".
+        if (s_start == org_str) {
+            static const char import_str[] = "import ";
+            if (memcmp(s_start, import_str, s_len) == 0) {
+                *compl_str = import_str + s_len;
+                return sizeof(import_str) - 1 - s_len;
+            }
+        }
+
+        return 0;
+    }
+
+    // 1 match found, or multiple matches with a common prefix
+    if (q_first == q_last || match_len > s_len) {
+        *compl_str = match_str + s_len;
+        return match_len - s_len;
+    }
+
+    // multiple matches found, print them out
+
+    #define WORD_SLOT_LEN (16)
+    #define MAX_LINE_LEN  (4 * WORD_SLOT_LEN)
+
+    int line_len = MAX_LINE_LEN; // force a newline for first word
+    for (qstr q = q_first; q <= q_last; ++q) {
+        size_t d_len;
+        const char *d_str = (const char *)qstr_data(q, &d_len);
+        if (s_len <= d_len && strncmp(s_start, d_str, s_len) == 0) {
+            mp_load_method_protected(obj, q, dest, true);
+            if (dest[0] != MP_OBJ_NULL) {
+                int gap = (line_len + WORD_SLOT_LEN - 1) / WORD_SLOT_LEN * WORD_SLOT_LEN - line_len;
+                if (gap < 2) {
+                    gap += WORD_SLOT_LEN;
+                }
+                if (line_len + gap + d_len <= MAX_LINE_LEN) {
+                    // TODO optimise printing of gap?
+                    for (int j = 0; j < gap; ++j) {
+                        mp_print_str(print, " ");
+                    }
+                    mp_print_str(print, d_str);
+                    line_len += gap + d_len;
+                } else {
+                    mp_printf(print, "\n%s", d_str);
+                    line_len = d_len;
+                }
+            }
+        }
+    }
+    mp_print_str(print, "\n");
+
+    return (size_t)(-1); // indicate many matches
 }
 
 #endif // MICROPY_HELPER_REPL

From 7556e01f14bb9f0ae32eff1d191985d302f1183e Mon Sep 17 00:00:00 2001
From: Artyom Skrobov <tyomitch@gmail.com>
Date: Sat, 3 Apr 2021 16:18:41 -0400
Subject: [PATCH 061/349] py/repl: Refactor autocomplete, extracting reusable
 parts.

Originally at adafruit#4548

Signed-off-by: Artyom Skrobov <tyomitch@gmail.com>
---
 py/repl.c | 152 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 86 insertions(+), 66 deletions(-)

diff --git a/py/repl.c b/py/repl.c
index b5ff145197..c8bb715e90 100644
--- a/py/repl.c
+++ b/py/repl.c
@@ -143,6 +143,87 @@ bool mp_repl_continue_with_input(const char *input) {
     return false;
 }
 
+STATIC bool test_qstr(mp_obj_t obj, qstr name) {
+    // try object member
+    mp_obj_t dest[2];
+    mp_load_method_protected(obj, name, dest, true);
+    return dest[0] != MP_OBJ_NULL;
+}
+
+STATIC const char *find_completions(const char *s_start, size_t s_len,
+    mp_obj_t obj, size_t *match_len, qstr *q_first, qstr *q_last) {
+
+    const char *match_str = NULL;
+    *match_len = 0;
+    *q_first = *q_last = 0;
+    size_t nqstr = QSTR_TOTAL();
+    for (qstr q = MP_QSTR_ + 1; q < nqstr; ++q) {
+        size_t d_len;
+        const char *d_str = (const char *)qstr_data(q, &d_len);
+        // special case; filter out words that begin with underscore
+        // unless there's already a partial match
+        if (s_len == 0 && d_str[0] == '_') {
+            continue;
+        }
+        if (s_len <= d_len && strncmp(s_start, d_str, s_len) == 0) {
+            if (test_qstr(obj, q)) {
+                if (match_str == NULL) {
+                    match_str = d_str;
+                    *match_len = d_len;
+                } else {
+                    // search for longest common prefix of match_str and d_str
+                    // (assumes these strings are null-terminated)
+                    for (size_t j = s_len; j <= *match_len && j <= d_len; ++j) {
+                        if (match_str[j] != d_str[j]) {
+                            *match_len = j;
+                            break;
+                        }
+                    }
+                }
+                if (*q_first == 0) {
+                    *q_first = q;
+                }
+                *q_last = q;
+            }
+        }
+    }
+    return match_str;
+}
+
+STATIC void print_completions(const mp_print_t *print,
+    const char *s_start, size_t s_len,
+    mp_obj_t obj, qstr q_first, qstr q_last) {
+
+    #define WORD_SLOT_LEN (16)
+    #define MAX_LINE_LEN  (4 * WORD_SLOT_LEN)
+
+    int line_len = MAX_LINE_LEN; // force a newline for first word
+    for (qstr q = q_first; q <= q_last; ++q) {
+        size_t d_len;
+        const char *d_str = (const char *)qstr_data(q, &d_len);
+        if (s_len <= d_len && strncmp(s_start, d_str, s_len) == 0) {
+            if (test_qstr(obj, q)) {
+                int gap = (line_len + WORD_SLOT_LEN - 1) / WORD_SLOT_LEN * WORD_SLOT_LEN - line_len;
+                if (gap < 2) {
+                    gap += WORD_SLOT_LEN;
+                }
+                if (line_len + gap + d_len <= MAX_LINE_LEN) {
+                    // TODO optimise printing of gap?
+                    for (int j = 0; j < gap; ++j) {
+                        mp_print_str(print, " ");
+                    }
+                    mp_print_str(print, d_str);
+                    line_len += gap + d_len;
+                } else {
+                    mp_printf(print, "\n%s", d_str);
+                    line_len = d_len;
+                }
+            }
+        }
+    }
+    mp_print_str(print, "\n");
+}
+
 size_t mp_repl_autocomplete(const char *str, size_t len, const mp_print_t *print, const char **compl_str) {
     // scan backwards to find start of "a.b.c" chain
     const char *org_str = str;
@@ -155,8 +236,6 @@ size_t mp_repl_autocomplete(const char *str, size_t len, const mp_print_t *print
         }
     }
 
-    size_t nqstr = QSTR_TOTAL();
-
     // begin search in outer global dict which is accessed from __main__
     mp_obj_t obj = MP_OBJ_FROM_PTR(&mp_module___main__);
     mp_obj_t dest[2];
@@ -196,40 +275,10 @@ size_t mp_repl_autocomplete(const char *str, size_t len, const mp_print_t *print
     }
 
     // look for matches
-    const char *match_str = NULL;
-    size_t match_len = 0;
-    qstr q_first = 0, q_last = 0;
-    for (qstr q = MP_QSTR_ + 1; q < nqstr; ++q) {
-        size_t d_len;
-        const char *d_str = (const char *)qstr_data(q, &d_len);
-        // special case; filter out words that begin with underscore
-        // unless there's already a partial match
-        if (s_len == 0 && d_str[0] == '_') {
-            continue;
-        }
-        if (s_len <= d_len && strncmp(s_start, d_str, s_len) == 0) {
-            mp_load_method_protected(obj, q, dest, true);
-            if (dest[0] != MP_OBJ_NULL) {
-                if (match_str == NULL) {
-                    match_str = d_str;
-                    match_len = d_len;
-                } else {
-                    // search for longest common prefix of match_str and d_str
-                    // (assumes these strings are null-terminated)
-                    for (size_t j = s_len; j <= match_len && j <= d_len; ++j) {
-                        if (match_str[j] != d_str[j]) {
-                            match_len = j;
-                            break;
-                        }
-                    }
-                }
-                if (q_first == 0) {
-                    q_first = q;
-                }
-                q_last = q;
-            }
-        }
-    }
+    size_t match_len;
+    qstr q_first, q_last;
+    const char *match_str =
+        find_completions(s_start, s_len, obj, &match_len, &q_first, &q_last);
 
     // nothing found
     if (q_first == 0) {
@@ -257,36 +306,7 @@ size_t mp_repl_autocomplete(const char *str, size_t len, const mp_print_t *print
     }
 
     // multiple matches found, print them out
-
-    #define WORD_SLOT_LEN (16)
-    #define MAX_LINE_LEN  (4 * WORD_SLOT_LEN)
-
-    int line_len = MAX_LINE_LEN; // force a newline for first word
-    for (qstr q = q_first; q <= q_last; ++q) {
-        size_t d_len;
-        const char *d_str = (const char *)qstr_data(q, &d_len);
-        if (s_len <= d_len && strncmp(s_start, d_str, s_len) == 0) {
-            mp_load_method_protected(obj, q, dest, true);
-            if (dest[0] != MP_OBJ_NULL) {
-                int gap = (line_len + WORD_SLOT_LEN - 1) / WORD_SLOT_LEN * WORD_SLOT_LEN - line_len;
-                if (gap < 2) {
-                    gap += WORD_SLOT_LEN;
-                }
-                if (line_len + gap + d_len <= MAX_LINE_LEN) {
-                    // TODO optimise printing of gap?
-                    for (int j = 0; j < gap; ++j) {
-                        mp_print_str(print, " ");
-                    }
-                    mp_print_str(print, d_str);
-                    line_len += gap + d_len;
-                } else {
-                    mp_printf(print, "\n%s", d_str);
-                    line_len = d_len;
-                }
-            }
-        }
-    }
-    mp_print_str(print, "\n");
+    print_completions(print, s_start, s_len, obj, q_first, q_last);
 
     return (size_t)(-1); // indicate many matches
 }

From ca35c0059c8895839809f3e11873f96fc8cb4ab5 Mon Sep 17 00:00:00 2001
From: Artyom Skrobov <tyomitch@gmail.com>
Date: Sat, 3 Apr 2021 16:56:02 -0400
Subject: [PATCH 062/349] py/repl: Autocomplete builtin modules.

Doing "import <tab>" will now complete/list built-in modules.

Originally at adafruit#4548 and adafruit#4608

Signed-off-by: Artyom Skrobov <tyomitch@gmail.com>
---
 ports/unix/coverage.c            |  7 +++++++
 py/repl.c                        | 34 +++++++++++++++++++++-----------
 tests/unix/extra_coverage.py.exp | 14 +++++++++++++
 3 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index 220666e381..d5b5d8dd76 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -268,6 +268,13 @@ STATIC mp_obj_t extra_coverage(void) {
         size_t len = mp_repl_autocomplete("__n", 3, &mp_plat_print, &str);
         mp_printf(&mp_plat_print, "%.*s\n", (int)len, str);
 
+        len = mp_repl_autocomplete("i", 1,  &mp_plat_print, &str);
+        mp_printf(&mp_plat_print, "%.*s\n", (int)len, str);
+        mp_repl_autocomplete("import ", 7,  &mp_plat_print, &str);
+        len = mp_repl_autocomplete("import ut", 9,  &mp_plat_print, &str);
+        mp_printf(&mp_plat_print, "%.*s\n", (int)len, str);
+        mp_repl_autocomplete("import utime", 12,  &mp_plat_print, &str);
+
         mp_store_global(MP_QSTR_sys, mp_import_name(MP_QSTR_sys, mp_const_none, MP_OBJ_NEW_SMALL_INT(0)));
         mp_repl_autocomplete("sys.", 4, &mp_plat_print, &str);
         len = mp_repl_autocomplete("sys.impl", 8, &mp_plat_print, &str);
diff --git a/py/repl.c b/py/repl.c
index c8bb715e90..57bc21eff0 100644
--- a/py/repl.c
+++ b/py/repl.c
@@ -26,6 +26,7 @@
 
 #include <string.h>
 #include "py/obj.h"
+#include "py/objmodule.h"
 #include "py/runtime.h"
 #include "py/builtin.h"
 #include "py/repl.h"
@@ -144,10 +145,16 @@ bool mp_repl_continue_with_input(const char *input) {
 }
 
 STATIC bool test_qstr(mp_obj_t obj, qstr name) {
-    // try object member
-    mp_obj_t dest[2];
-    mp_load_method_protected(obj, name, dest, true);
-    return dest[0] != MP_OBJ_NULL;
+    if (obj) {
+        // try object member
+        mp_obj_t dest[2];
+        mp_load_method_protected(obj, name, dest, true);
+        return dest[0] != MP_OBJ_NULL;
+    } else {
+        // try builtin module
+        return mp_map_lookup((mp_map_t *)&mp_builtin_module_map,
+            MP_OBJ_NEW_QSTR(name), MP_MAP_LOOKUP);
+    }
 }
 
 STATIC const char *find_completions(const char *s_start, size_t s_len,
@@ -274,6 +281,12 @@ size_t mp_repl_autocomplete(const char *str, size_t len, const mp_print_t *print
         ++str;
     }
 
+    // after "import", suggest built-in modules
+    static const char import_str[] = "import ";
+    if (len >= 7 && !memcmp(org_str, import_str, 7)) {
+        obj = MP_OBJ_NULL;
+    }
+
     // look for matches
     size_t match_len;
     qstr q_first, q_last;
@@ -282,21 +295,18 @@ size_t mp_repl_autocomplete(const char *str, size_t len, const mp_print_t *print
 
     // nothing found
     if (q_first == 0) {
-        if (s_len == 0) {
-            *compl_str = "    ";
-            return 4;
-        }
         // If there're no better alternatives, and if it's first word
         // in the line, try to complete "import".
-        if (s_start == org_str) {
-            static const char import_str[] = "import ";
+        if (s_start == org_str && s_len > 0) {
             if (memcmp(s_start, import_str, s_len) == 0) {
                 *compl_str = import_str + s_len;
                 return sizeof(import_str) - 1 - s_len;
             }
         }
-
-        return 0;
+        if (q_first == 0) {
+            *compl_str = "    ";
+            return s_len ? 0 : 4;
+        }
     }
 
     // 1 match found, or multiple matches with a common prefix
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index ab4d977741..ea91813fc6 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -27,6 +27,20 @@ RuntimeError:
 RuntimeError: 
 # repl
 ame__
+mport 
+
+builtins        micropython     _thread         _uasyncio
+btree           cexample        cmath           cppexample
+ffi             framebuf        gc              math
+termios         uarray          ubinascii       ucollections
+ucryptolib      uctypes         uerrno          uhashlib
+uheapq          uio             ujson           umachine
+uos             urandom         ure             uselect
+usocket         ussl            ustruct         usys
+utime           utimeq          uwebsocket      uzlib
+ime
+
+utime           utimeq
 
 argv            atexit          byteorder       exc_info
 exit            getsizeof       implementation  maxsize

From 3c918d0f5817a32acf28831017b0873771810f06 Mon Sep 17 00:00:00 2001
From: Jan Jurgen Griesfeller <jang@met.no>
Date: Thu, 29 Apr 2021 09:26:38 +0200
Subject: [PATCH 063/349] rp2/boards: Add board definition for SparkFun Thing
 Plus RP2040.

---
 ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.cmake | 1 +
 ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.h     | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.h

diff --git a/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.cmake b/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.cmake
new file mode 100644
index 0000000000..b9090bbcec
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.cmake
@@ -0,0 +1 @@
+# cmake file for SparkFun Thing Plus RP2040
diff --git a/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.h b/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.h
new file mode 100644
index 0000000000..9749acd25a
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.h
@@ -0,0 +1,3 @@
+// Board and hardware specific configuration
+#define MICROPY_HW_BOARD_NAME                   "SparkFun Thing Plus RP2040"
+#define MICROPY_HW_FLASH_STORAGE_BYTES          (15 * 1024 * 1024)

From d80a037e6bdcc78fbda76ce04e9ded41f335c635 Mon Sep 17 00:00:00 2001
From: Jan Jurgen Griesfeller <jang@met.no>
Date: Thu, 29 Apr 2021 11:26:38 +0200
Subject: [PATCH 064/349] rp2/boards: Add board definition for SparkFun Pro
 Micro board.

---
 ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.cmake | 1 +
 ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.h     | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.h

diff --git a/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.cmake b/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.cmake
new file mode 100644
index 0000000000..6ac8d7a446
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.cmake
@@ -0,0 +1 @@
+# cmake file for SparkFun Pro Micro RP2040
diff --git a/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.h b/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.h
new file mode 100644
index 0000000000..d6c8007ba0
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.h
@@ -0,0 +1,3 @@
+// Board and hardware specific configuration
+#define MICROPY_HW_BOARD_NAME                   "SparkFun Pro Micro RP2040"
+#define MICROPY_HW_FLASH_STORAGE_BYTES          (15 * 1024 * 1024)

From 1e2f0d2809c5431c9baf1d6f447162013f58baac Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 29 Apr 2021 16:56:28 +0200
Subject: [PATCH 065/349] rp2/tusb_port: Add the device unique-id to the USB
 id.

The number shown in the USB id is now the same as that returned by
machine.unique_id().  All 8 bytes are inserted as hex into the USB id.  A
usb id at /dev/serial/by-id then looks like:

    usb-MicroPython_Board_in_FS_mode_e469b03567342f37-if00
---
 ports/rp2/tusb_port.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/ports/rp2/tusb_port.c b/ports/rp2/tusb_port.c
index 94856ab452..874d837b9b 100644
--- a/ports/rp2/tusb_port.c
+++ b/ports/rp2/tusb_port.c
@@ -25,6 +25,7 @@
  */
 
 #include "tusb.h"
+#include "pico/unique_id.h"
 
 #define USBD_VID (0x2E8A) // Raspberry Pi
 #define USBD_PID (0x0005) // RP2 MicroPython
@@ -77,7 +78,7 @@ static const uint8_t usbd_desc_cfg[USBD_DESC_LEN] = {
 static const char *const usbd_desc_str[] = {
     [USBD_STR_MANUF] = "MicroPython",
     [USBD_STR_PRODUCT] = "Board in FS mode",
-    [USBD_STR_SERIAL] = "000000000000", // TODO
+    [USBD_STR_SERIAL] = NULL, // generated dynamically
     [USBD_STR_CDC] = "Board CDC",
 };
 
@@ -102,9 +103,21 @@ const uint16_t *tud_descriptor_string_cb(uint8_t index, uint16_t langid) {
         if (index >= sizeof(usbd_desc_str) / sizeof(usbd_desc_str[0])) {
             return NULL;
         }
-        const char *str = usbd_desc_str[index];
-        for (len = 0; len < DESC_STR_MAX - 1 && str[len]; ++len) {
-            desc_str[1 + len] = str[len];
+        // check, if serial is requested
+        if (index == USBD_STR_SERIAL) {
+            pico_unique_board_id_t id;
+            pico_get_unique_board_id(&id);
+            // byte by byte conversion
+            for (len = 0; len < 16; len += 2) {
+                const char *hexdig = "0123456789abcdef";
+                desc_str[1 + len] = hexdig[id.id[len >> 1] >> 4];
+                desc_str[1 + len + 1] = hexdig[id.id[len >> 1] & 0x0f];
+            }
+        } else {
+            const char *str = usbd_desc_str[index];
+            for (len = 0; len < DESC_STR_MAX - 1 && str[len]; ++len) {
+                desc_str[1 + len] = str[len];
+            }
         }
     }
 

From 4154ffbcba48822338ece6bbdb42f4a0498f237e Mon Sep 17 00:00:00 2001
From: Chris Liechti <cliechti@gmx.net>
Date: Tue, 8 Nov 2016 21:53:03 +0100
Subject: [PATCH 066/349] docs/esp8266: Add note about simultaneous use of
 STA_IF and AP_IF.

See also https://github.com/esp8266/Arduino/issues/1624
---
 docs/esp8266/general.rst | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/esp8266/general.rst b/docs/esp8266/general.rst
index fbe8fe1c3c..ce51f531b9 100644
--- a/docs/esp8266/general.rst
+++ b/docs/esp8266/general.rst
@@ -125,6 +125,16 @@ will overflow every 7:45h.  If a long-term working RTC time is required then
 ``time()`` or ``localtime()`` must be called at least once within 7 hours.
 MicroPython will then handle the overflow.
 
+Simultaneous operation of STA_IF and AP_IF
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Simultaneous operation of STA_IF and AP_IF interfaces is supported.
+
+However, due to restrictions of the hardware, there may be performance
+issues in the AP_IF, if the STA_IF is not connected and searching.
+An application should manage these interfaces and for example
+deactivate the STA_IF in environments where only the AP_IF is used.
+
 Sockets and WiFi buffers overflow
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

From 2bf1beef5ce2edde80ba7a24dde781fe1b1692a4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 4 May 2021 14:24:17 +1000
Subject: [PATCH 067/349] docs/esp8266: Add instructions on entering
 programming mode manually.

This adds to the ESP8266 tutorial instructions explaining which pins to
pull low to enter programming mode.

Commit made originally by @ARF1 in #2910.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/esp8266/tutorial/intro.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/esp8266/tutorial/intro.rst b/docs/esp8266/tutorial/intro.rst
index 711db3fceb..bbf0457fff 100644
--- a/docs/esp8266/tutorial/intro.rst
+++ b/docs/esp8266/tutorial/intro.rst
@@ -75,6 +75,10 @@ the DTR and RTS pins wired in a special way then deploying the firmware should
 be easy as all steps can be done automatically.  Boards that have such features
 include the Adafruit Feather HUZZAH and NodeMCU boards.
 
+If you do not have such a board, you need keep GPIO0 pulled to ground and reset
+the device by pulling the reset pin to ground and releasing it again to enter
+programming mode.
+
 For best results it is recommended to first erase the entire flash of your
 device before putting on new MicroPython firmware.
 
@@ -113,6 +117,10 @@ the firmware (note the ``-fm dio`` option)::
 If the above commands run without error then MicroPython should be installed on
 your board!
 
+If you pulled GPIO0 manually to ground to enter programming mode, release it
+now and reset the device by again pulling the reset pin to ground for a short
+duration.
+
 Serial prompt
 -------------
 

From d70ab87b2b108aa9d5321c272911f759ad3ee8a9 Mon Sep 17 00:00:00 2001
From: Mordy Ovits <mordyovits@users.noreply.github.com>
Date: Thu, 2 Nov 2017 14:31:17 -0400
Subject: [PATCH 068/349] docs/esp8266: Clarify limitations of SSL in esp8266
 and fix typos.

---
 docs/esp8266/general.rst | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/docs/esp8266/general.rst b/docs/esp8266/general.rst
index ce51f531b9..4999bc2e9b 100644
--- a/docs/esp8266/general.rst
+++ b/docs/esp8266/general.rst
@@ -163,25 +163,26 @@ SSL/TLS limitations
 ~~~~~~~~~~~~~~~~~~~
 
 ESP8266 uses `axTLS <http://axtls.sourceforge.net/>`_ library, which is one
-of the smallest TLS libraries with the compatible licensing. However, it
+of the smallest TLS libraries with compatible licensing. However, it
 also has some known issues/limitations:
 
 1. No support for Diffie-Hellman (DH) key exchange and Elliptic-curve
-   cryptography (ECC). This means it can't work with sites which force
-   the use of these features (it works ok with classic RSA certificates).
+   cryptography (ECC). This means it can't work with sites which require
+   the use of these features (it works ok with the typical sites that use
+   RSA certificates).
 2. Half-duplex communication nature. axTLS uses a single buffer for both
    sending and receiving, which leads to considerable memory saving and
    works well with protocols like HTTP. But there may be problems with
    protocols which don't follow classic request-response model.
 
-Besides axTLS own limitations, the configuration used for MicroPython is
+Besides axTLS's own limitations, the configuration used for MicroPython is
 highly optimized for code size, which leads to additional limitations
 (these may be lifted in the future):
 
 3. Optimized RSA algorithms are not enabled, which may lead to slow
    SSL handshakes.
-4. Stored sessions are not supported (may allow faster repeated connections
-   to the same site in some circumstances).
+4. Session Reuse is not enabled, which means every connection must undergo
+   the full, expensive SSL handshake.
 
 Besides axTLS specific limitations described above, there's another generic
 limitation with usage of TLS on the low-memory devices:
@@ -195,13 +196,16 @@ limitation with usage of TLS on the low-memory devices:
    accessing various REST APIs, which usually require much smaller messages.
    The buffers size is on the order of 5KB, and is adjusted from time to
    time, taking as a reference being able to access https://google.com .
-   The smaller buffer hower means that some sites can't be accessed using
-   it, and it's not possible to stream large amounts of data.
+   The smaller buffer however means that some sites can't be accessed using
+   it, and it's not possible to stream large amounts of data. axTLS does
+   have support for TLS's Max Fragment Size extension, but no HTTPS website
+   does, so use of the extension is really only effective for local
+   communication with other devices.
 
 There are also some not implemented features specifically in MicroPython's
 ``ussl`` module based on axTLS:
 
-6. Certificates are not validated (this may make connections susceptible
+6. Certificates are not validated (this makes connections susceptible
    to man-in-the-middle attacks).
 7. There is no support for client certificates (scheduled to be fixed in
    1.9.4 release).

From ca0c75f5042cdf602585b08184f132d7ab4713f3 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 30 Apr 2021 14:41:20 -0500
Subject: [PATCH 069/349] stm32/boards: Change default LSI_VALUE to 32000 for
 F4 MCUs.

In the STM32 HAL libraries, the default value for LSI_VALUE for F4 MCUs is
32 kHz.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/stm32/boards/stm32f4xx_hal_conf_base.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/boards/stm32f4xx_hal_conf_base.h b/ports/stm32/boards/stm32f4xx_hal_conf_base.h
index 134a30018c..f09990fd95 100644
--- a/ports/stm32/boards/stm32f4xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32f4xx_hal_conf_base.h
@@ -88,7 +88,7 @@
 
 // Oscillator values in Hz
 #define HSI_VALUE (16000000)
-#define LSI_VALUE (40000)
+#define LSI_VALUE (32000)
 
 // SysTick has the highest priority
 #define TICK_INT_PRIORITY (0x00)

From 6e776a671061130d86a300fcd72173d9b93f521a Mon Sep 17 00:00:00 2001
From: Nicko van Someren <nicko@nicko.org>
Date: Sun, 2 May 2021 18:12:58 -0600
Subject: [PATCH 070/349] gitignore: Ignore macOS desktop metadata files.

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index c52f59eec7..7342489927 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,7 @@ user.props
 # Generated rst files
 ######################
 genrst/
+
+# MacOS desktop metadata files
+######################
+.DS_Store

From 31ac410a4fbf18b38b6f4557045959140026680e Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 30 Apr 2021 16:53:36 +1000
Subject: [PATCH 071/349] docs: Fix some spelling mistakes.

---
 docs/develop/cmodules.rst          | 2 +-
 docs/esp32/quickref.rst            | 2 +-
 docs/esp8266/quickref.rst          | 2 +-
 docs/library/esp32.rst             | 2 +-
 docs/library/machine.Timer.rst     | 2 +-
 docs/library/machine.TimerWiPy.rst | 4 ++--
 docs/library/network.rst           | 2 +-
 docs/library/uctypes.rst           | 2 +-
 docs/library/uio.rst               | 8 ++++----
 docs/library/uselect.rst           | 4 ++--
 docs/library/usocket.rst           | 2 +-
 docs/library/utime.rst             | 2 +-
 12 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/docs/develop/cmodules.rst b/docs/develop/cmodules.rst
index 346b3e0314..38225e8686 100644
--- a/docs/develop/cmodules.rst
+++ b/docs/develop/cmodules.rst
@@ -91,7 +91,7 @@ This simple module named ``cexample`` provides a single function
 ``cexample.add_ints(a, b)`` which adds the two integer args together and returns
 the result. It can be found in the MicroPython source tree
 `in the examples directory <https://github.com/micropython/micropython/tree/master/examples/usercmodule/cexample>`_
-and has a source file and a Makefile fragment with content as descibed above::
+and has a source file and a Makefile fragment with content as described above::
 
     micropython/
     └──examples/
diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 30c9b3b95a..c29688f000 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -58,7 +58,7 @@ The :mod:`esp32` module::
     import esp32
 
     esp32.hall_sensor()     # read the internal hall sensor
-    esp32.raw_temperature() # read the internal temperature of the MCU, in Farenheit
+    esp32.raw_temperature() # read the internal temperature of the MCU, in Fahrenheit
     esp32.ULP()             # access to the Ultra-Low-Power Co-processor
 
 Note that the temperature sensor in the ESP32 will typically read higher than
diff --git a/docs/esp8266/quickref.rst b/docs/esp8266/quickref.rst
index a478b66581..b9a46ab112 100644
--- a/docs/esp8266/quickref.rst
+++ b/docs/esp8266/quickref.rst
@@ -58,7 +58,7 @@ The :mod:`network` module::
     wlan.scan()             # scan for access points
     wlan.isconnected()      # check if the station is connected to an AP
     wlan.connect('essid', 'password') # connect to an AP
-    wlan.config('mac')      # get the interface's MAC adddress
+    wlan.config('mac')      # get the interface's MAC address
     wlan.ifconfig()         # get the interface's IP/netmask/gw/DNS addresses
 
     ap = network.WLAN(network.AP_IF) # create access-point interface
diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index f179a31ef6..1cfb304c14 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -162,7 +162,7 @@ used to transmit or receive many other types of digital signals::
 The input to the RMT module is an 80MHz clock (in the future it may be able to
 configure the input clock but, for now, it's fixed). ``clock_div`` *divides*
 the clock input which determines the resolution of the RMT channel. The
-numbers specificed in ``write_pulses`` are multiplied by the resolution to
+numbers specified in ``write_pulses`` are multiplied by the resolution to
 define the pulses.
 
 ``clock_div`` is an 8-bit divider (0-255) and each pulse can be defined by
diff --git a/docs/library/machine.Timer.rst b/docs/library/machine.Timer.rst
index 9991d3aebc..77a549b40b 100644
--- a/docs/library/machine.Timer.rst
+++ b/docs/library/machine.Timer.rst
@@ -9,7 +9,7 @@ the most flexible and heterogeneous kind of hardware in MCUs and SoCs,
 differently greatly from a model to a model. MicroPython's Timer class
 defines a baseline operation of executing a callback with a given period
 (or once after some delay), and allow specific boards to define more
-non-standard behavior (which thus won't be portable to other boards).
+non-standard behaviour (which thus won't be portable to other boards).
 
 See discussion of :ref:`important constraints <machine_callbacks>` on
 Timer callbacks.
diff --git a/docs/library/machine.TimerWiPy.rst b/docs/library/machine.TimerWiPy.rst
index f5b748c62e..39afc23bc5 100644
--- a/docs/library/machine.TimerWiPy.rst
+++ b/docs/library/machine.TimerWiPy.rst
@@ -16,7 +16,7 @@ the most flexible and heterogeneous kind of hardware in MCUs and SoCs,
 differently greatly from a model to a model. MicroPython's Timer class
 defines a baseline operation of executing a callback with a given period
 (or once after some delay), and allow specific boards to define more
-non-standard behavior (which thus won't be portable to other boards).
+non-standard behaviour (which thus won't be portable to other boards).
 
 See discussion of :ref:`important constraints <machine_callbacks>` on
 Timer callbacks.
@@ -115,7 +115,7 @@ Methods
 
 .. method:: timerchannel.irq(*, trigger, priority=1, handler=None)
 
-    The behavior of this callback is heavily dependent on the operating
+    The behaviour of this callback is heavily dependent on the operating
     mode of the timer channel:
 
         - If mode is ``TimerWiPy.PERIODIC`` the callback is executed periodically
diff --git a/docs/library/network.rst b/docs/library/network.rst
index bd3bc6f34b..a20eb2ebf5 100644
--- a/docs/library/network.rst
+++ b/docs/library/network.rst
@@ -55,7 +55,7 @@ parameter should be `id`.
         Activate ("up") or deactivate ("down") the network interface, if
         a boolean argument is passed. Otherwise, query current state if
         no argument is provided. Most other methods require an active
-        interface (behavior of calling them on inactive interface is
+        interface (behaviour of calling them on inactive interface is
         undefined).
 
 .. method:: AbstractNIC.connect([service_id, key=None, *, ...])
diff --git a/docs/library/uctypes.rst b/docs/library/uctypes.rst
index 0fdc40e484..b3343beb7e 100644
--- a/docs/library/uctypes.rst
+++ b/docs/library/uctypes.rst
@@ -245,7 +245,7 @@ Module contents
 
 .. data:: VOID
 
-   ``VOID`` is an alias for ``UINT8``, and is provided to conviniently define
+   ``VOID`` is an alias for ``UINT8``, and is provided to conveniently define
    C's void pointers: ``(uctypes.PTR, uctypes.VOID)``.
 
 .. data:: PTR
diff --git a/docs/library/uio.rst b/docs/library/uio.rst
index dddb83a170..adbeef08b7 100644
--- a/docs/library/uio.rst
+++ b/docs/library/uio.rst
@@ -18,7 +18,7 @@ Conceptual hierarchy
    Conceptual hierarchy of stream base classes is simplified in MicroPython,
    as described in this section.
 
-(Abstract) base stream classes, which serve as a foundation for behavior
+(Abstract) base stream classes, which serve as a foundation for behaviour
 of all the concrete classes, adhere to few dichotomies (pair-wise
 classifications) in CPython. In MicroPython, they are somewhat simplified
 and made implicit to achieve higher efficiencies and save resources.
@@ -41,15 +41,15 @@ more concise and efficient programs - something which is highly desirable
 for MicroPython. So, while MicroPython doesn't support buffered streams,
 it still provides for no-short-operations streams. Whether there will
 be short operations or not depends on each particular class' needs, but
-developers are strongly advised to favor no-short-operations behavior
+developers are strongly advised to favour no-short-operations behaviour
 for the reasons stated above. For example, MicroPython sockets are
 guaranteed to avoid short read/writes. Actually, at this time, there is
 no example of a short-operations stream class in the core, and one would
 be a port-specific class, where such a need is governed by hardware
 peculiarities.
 
-The no-short-operations behavior gets tricky in case of non-blocking
-streams, blocking vs non-blocking behavior being another CPython dichotomy,
+The no-short-operations behaviour gets tricky in case of non-blocking
+streams, blocking vs non-blocking behaviour being another CPython dichotomy,
 fully supported by MicroPython. Non-blocking streams never wait for
 data either to arrive or be written - they read/write whatever possible,
 or signal lack of data (or ability to write data). Clearly, this conflicts
diff --git a/docs/library/uselect.rst b/docs/library/uselect.rst
index 0c3bdfdfd9..76202739c8 100644
--- a/docs/library/uselect.rst
+++ b/docs/library/uselect.rst
@@ -87,11 +87,11 @@ Methods
    `callee-owned tuple`. This function provides an efficient, allocation-free
    way to poll on streams.
 
-   If *flags* is 1, one-shot behavior for events is employed: streams for
+   If *flags* is 1, one-shot behaviour for events is employed: streams for
    which events happened will have their event masks automatically reset
    (equivalent to ``poll.modify(obj, 0)``), so new events for such a stream
    won't be processed until new mask is set with `poll.modify()`. This
-   behavior is useful for asynchronous I/O schedulers.
+   behaviour is useful for asynchronous I/O schedulers.
 
    .. admonition:: Difference to CPython
       :class: attention
diff --git a/docs/library/usocket.rst b/docs/library/usocket.rst
index bc4b4b6d5a..39b848e593 100644
--- a/docs/library/usocket.rst
+++ b/docs/library/usocket.rst
@@ -222,7 +222,7 @@ Methods
    Unlike `send()`, this method will try to send all of data, by sending data
    chunk by chunk consecutively.
 
-   The behavior of this method on non-blocking sockets is undefined. Due to this,
+   The behaviour of this method on non-blocking sockets is undefined. Due to this,
    on MicroPython, it's recommended to use `write()` method instead, which
    has the same "no short writes" policy for blocking sockets, and will return
    number of bytes sent on non-blocking sockets.
diff --git a/docs/library/utime.rst b/docs/library/utime.rst
index 86fd27b3a5..b7c604dc7b 100644
--- a/docs/library/utime.rst
+++ b/docs/library/utime.rst
@@ -173,7 +173,7 @@ Functions
    long sleep), then once you finally look again, it may seem to you that only 1 hour
    has passed. To avoid this mistake, just look at the clock regularly. Your application
    should do the same. "Too long sleep" metaphor also maps directly to application
-   behavior: don't let your application run any single task for too long. Run tasks
+   behaviour: don't let your application run any single task for too long. Run tasks
    in steps, and do time-keeping inbetween.
 
    `ticks_diff()` is designed to accommodate various usage patterns, among them:

From 0054fff840dfda50a32c653774e91b3e19464675 Mon Sep 17 00:00:00 2001
From: Gabriel M Schuyler <gms@causalloop.com>
Date: Sun, 7 Feb 2021 12:35:47 -0600
Subject: [PATCH 072/349] docs/pyboard: Fix typo in pyb.Switch tutorial.

---
 docs/pyboard/tutorial/switch.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/pyboard/tutorial/switch.rst b/docs/pyboard/tutorial/switch.rst
index 96bb3784e9..059b04d94a 100644
--- a/docs/pyboard/tutorial/switch.rst
+++ b/docs/pyboard/tutorial/switch.rst
@@ -93,7 +93,7 @@ on the pin for any changes, and the following will occur:
    running Python script.
 3. The microcontroller starts executing the special interrupt handler
    associated with the switch's external trigger.  This interrupt handler
-   get the function that you registered with ``sw.callback()`` and executes
+   gets the function that you registered with ``sw.callback()`` and executes
    it.
 4. Your callback function is executed until it finishes, returning control
    to the switch interrupt handler.

From 8172c2e9c5d5eec9a6b0a3f6cc4a2383b3d96d26 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 4 May 2021 23:36:05 +1000
Subject: [PATCH 073/349] rp2: Move manifest.py to boards directory.

To match other ports.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/CMakeLists.txt           | 2 +-
 ports/rp2/{ => boards}/manifest.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename ports/rp2/{ => boards}/manifest.py (74%)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index bd3eb74384..699520b240 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -159,7 +159,7 @@ set(PICO_SDK_COMPONENTS
 
 # Define mpy-cross flags and frozen manifest
 set(MICROPY_CROSS_FLAGS -march=armv7m)
-set(MICROPY_FROZEN_MANIFEST ${PROJECT_SOURCE_DIR}/manifest.py)
+set(MICROPY_FROZEN_MANIFEST ${PROJECT_SOURCE_DIR}/boards/manifest.py)
 
 target_sources(${MICROPY_TARGET} PRIVATE
     ${MICROPY_SOURCE_PY}
diff --git a/ports/rp2/manifest.py b/ports/rp2/boards/manifest.py
similarity index 74%
rename from ports/rp2/manifest.py
rename to ports/rp2/boards/manifest.py
index a56d4b1b09..9df589f126 100644
--- a/ports/rp2/manifest.py
+++ b/ports/rp2/boards/manifest.py
@@ -1,3 +1,3 @@
-freeze("modules")
+freeze("$(PORT_DIR)/modules")
 freeze("$(MPY_DIR)/drivers/onewire")
 include("$(MPY_DIR)/extmod/uasyncio/manifest.py")

From 9e29217c73f36802de616c05bee9bf7f9090f722 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 14 Apr 2021 15:37:33 +1000
Subject: [PATCH 074/349] unix/modffi: Use a union for passing/returning FFI
 values.

This fixes a bug where double arguments on a 32-bit architecture would not
be passed correctly because they only had 4 bytes of storage (not 8).  It
also fixes a compiler warning/error in return_ffi_value on certian
architectures: array subscript 'double[0]' is partly outside array bounds
of 'ffi_arg[1]' {aka 'long unsigned int[1]'}.

Fixes issue #7064.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/modffi.c         | 62 +++++++++++++++----------------------
 tests/unix/ffi_float.py     | 13 ++++++--
 tests/unix/ffi_float.py.exp | 20 ++++++++----
 3 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/ports/unix/modffi.c b/ports/unix/modffi.c
index 598a28cd54..5c2595ec5e 100644
--- a/ports/unix/modffi.c
+++ b/ports/unix/modffi.c
@@ -56,6 +56,13 @@
  * but may be later.
  */
 
+// This union is large enough to hold any supported argument/return value.
+typedef union _ffi_union_t {
+    ffi_arg ffi;
+    float flt;
+    double dbl;
+} ffi_union_t;
+
 typedef struct _mp_obj_opaque_t {
     mp_obj_base_t base;
     void *val;
@@ -151,10 +158,10 @@ STATIC ffi_type *get_ffi_type(mp_obj_t o_in) {
     mp_raise_TypeError(MP_ERROR_TEXT("unknown type"));
 }
 
-STATIC mp_obj_t return_ffi_value(ffi_arg val, char type) {
+STATIC mp_obj_t return_ffi_value(ffi_union_t *val, char type) {
     switch (type) {
         case 's': {
-            const char *s = (const char *)(intptr_t)val;
+            const char *s = (const char *)(intptr_t)val->ffi;
             if (!s) {
                 return mp_const_none;
             }
@@ -164,20 +171,16 @@ STATIC mp_obj_t return_ffi_value(ffi_arg val, char type) {
             return mp_const_none;
         #if MICROPY_PY_BUILTINS_FLOAT
         case 'f': {
-            union { ffi_arg ffi;
-                    float flt;
-            } val_union = { .ffi = val };
-            return mp_obj_new_float_from_f(val_union.flt);
+            return mp_obj_new_float_from_f(val->flt);
         }
         case 'd': {
-            double *p = (double *)&val;
-            return mp_obj_new_float_from_d(*p);
+            return mp_obj_new_float_from_d(val->dbl);
         }
         #endif
         case 'O':
-            return (mp_obj_t)(intptr_t)val;
+            return (mp_obj_t)(intptr_t)val->ffi;
         default:
-            return mp_obj_new_int(val);
+            return mp_obj_new_int(val->ffi);
     }
 }
 
@@ -368,28 +371,26 @@ STATIC mp_obj_t ffifunc_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
     assert(n_kw == 0);
     assert(n_args == self->cif.nargs);
 
-    ffi_arg values[n_args];
+    ffi_union_t values[n_args];
     void *valueptrs[n_args];
     const char *argtype = self->argtypes;
     for (uint i = 0; i < n_args; i++, argtype++) {
         mp_obj_t a = args[i];
         if (*argtype == 'O') {
-            values[i] = (ffi_arg)(intptr_t)a;
+            values[i].ffi = (ffi_arg)(intptr_t)a;
         #if MICROPY_PY_BUILTINS_FLOAT
         } else if (*argtype == 'f') {
-            float *p = (float *)&values[i];
-            *p = mp_obj_get_float_to_f(a);
+            values[i].flt = mp_obj_get_float_to_f(a);
         } else if (*argtype == 'd') {
-            double *p = (double *)&values[i];
-            *p = mp_obj_get_float_to_d(a);
+            values[i].dbl = mp_obj_get_float_to_d(a);
         #endif
         } else if (a == mp_const_none) {
-            values[i] = 0;
+            values[i].ffi = 0;
         } else if (mp_obj_is_int(a)) {
-            values[i] = mp_obj_int_get_truncated(a);
+            values[i].ffi = mp_obj_int_get_truncated(a);
         } else if (mp_obj_is_str(a)) {
             const char *s = mp_obj_str_get_str(a);
-            values[i] = (ffi_arg)(intptr_t)s;
+            values[i].ffi = (ffi_arg)(intptr_t)s;
         } else if (((mp_obj_base_t *)MP_OBJ_TO_PTR(a))->type->buffer_p.get_buffer != NULL) {
             mp_obj_base_t *o = (mp_obj_base_t *)MP_OBJ_TO_PTR(a);
             mp_buffer_info_t bufinfo;
@@ -397,32 +398,19 @@ STATIC mp_obj_t ffifunc_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
             if (ret != 0) {
                 goto error;
             }
-            values[i] = (ffi_arg)(intptr_t)bufinfo.buf;
+            values[i].ffi = (ffi_arg)(intptr_t)bufinfo.buf;
         } else if (mp_obj_is_type(a, &fficallback_type)) {
             mp_obj_fficallback_t *p = MP_OBJ_TO_PTR(a);
-            values[i] = (ffi_arg)(intptr_t)p->func;
+            values[i].ffi = (ffi_arg)(intptr_t)p->func;
         } else {
             goto error;
         }
         valueptrs[i] = &values[i];
     }
 
-    // If ffi_arg is not big enough to hold a double, then we must pass along a
-    // pointer to a memory location of the correct size.
-    // TODO check if this needs to be done for other types which don't fit into
-    // ffi_arg.
-    #if MICROPY_PY_BUILTINS_FLOAT
-    if (sizeof(ffi_arg) == 4 && self->rettype == 'd') {
-        double retval;
-        ffi_call(&self->cif, self->func, &retval, valueptrs);
-        return mp_obj_new_float_from_d(retval);
-    } else
-    #endif
-    {
-        ffi_arg retval;
-        ffi_call(&self->cif, self->func, &retval, valueptrs);
-        return return_ffi_value(retval, self->rettype);
-    }
+    ffi_union_t retval;
+    ffi_call(&self->cif, self->func, &retval, valueptrs);
+    return return_ffi_value(&retval, self->rettype);
 
 error:
     mp_raise_TypeError(MP_ERROR_TEXT("don't know how to pass object to native function"));
diff --git a/tests/unix/ffi_float.py b/tests/unix/ffi_float.py
index d039398965..03bd9f7f17 100644
--- a/tests/unix/ffi_float.py
+++ b/tests/unix/ffi_float.py
@@ -35,6 +35,15 @@ print("%.6f" % strtod("1.23", None))
 # test passing double and float args
 libm = ffi_open(("libm.so", "libm.so.6", "libc.so.0", "libc.so.6", "libc.dylib"))
 tgamma = libm.func("d", "tgamma", "d")
-for fun in (tgamma,):
+for fun_name in ("tgamma",):
+    fun = globals()[fun_name]
     for val in (0.5, 1, 1.0, 1.5, 4, 4.0):
-        print("%.6f" % fun(val))
+        print(fun_name, "%.5f" % fun(val))
+
+# test passing 2x float/double args
+powf = libm.func("f", "powf", "ff")
+pow = libm.func("d", "pow", "dd")
+for fun_name in ("powf", "pow"):
+    fun = globals()[fun_name]
+    for args in ((0, 1), (1, 0), (2, 0.5), (3, 4)):
+        print(fun_name, "%.5f" % fun(*args))
diff --git a/tests/unix/ffi_float.py.exp b/tests/unix/ffi_float.py.exp
index b9d7da2bdb..3d90914315 100644
--- a/tests/unix/ffi_float.py.exp
+++ b/tests/unix/ffi_float.py.exp
@@ -1,8 +1,16 @@
 1.230000
 1.230000
-1.772454
-1.000000
-1.000000
-0.886227
-6.000000
-6.000000
+tgamma 1.77245
+tgamma 1.00000
+tgamma 1.00000
+tgamma 0.88623
+tgamma 6.00000
+tgamma 6.00000
+powf 0.00000
+powf 1.00000
+powf 1.41421
+powf 81.00000
+pow 0.00000
+pow 1.00000
+pow 1.41421
+pow 81.00000

From 4791d290c61e2cc5bcd006b35ef60470920279d6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 May 2021 12:11:51 +1000
Subject: [PATCH 075/349] extmod: Remove old comments used for auto-doc
 generation.

They are no longer used, and the text in the docs is more up to date.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/moductypes.c | 70 +++++++--------------------------------------
 extmod/moduselect.c | 16 ++++-------
 extmod/vfs_fat.c    |  7 ++---
 3 files changed, 18 insertions(+), 75 deletions(-)

diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index 79a49d5c32..51626600cc 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -34,38 +34,10 @@
 
 #if MICROPY_PY_UCTYPES
 
-/// \module uctypes - Access data structures in memory
-///
-/// The module allows to define layout of raw data structure (using terms
-/// of C language), and then access memory buffers using this definition.
-/// The module also provides convenience functions to access memory buffers
-/// contained in Python objects or wrap memory buffers in Python objects.
-/// \constant UINT8_1 - uint8_t value type
-
-/// \class struct - C-like structure
-///
-/// Encapsulalation of in-memory data structure. This class doesn't define
-/// any methods, only attribute access (for structure fields) and
-/// indexing (for pointer and array fields).
-///
-/// Usage:
-///
-///     # Define layout of a structure with 2 fields
-///     # 0 and 4 are byte offsets of fields from the beginning of struct
-///     # they are logically ORed with field type
-///     FOO_STRUCT = {"a": 0 | uctypes.UINT32, "b": 4 | uctypes.UINT8}
-///
-///     # Example memory buffer to access (contained in bytes object)
-///     buf = b"\x64\0\0\0\0x14"
-///
-///     # Create structure object referring to address of
-///     # the data in the buffer above
-///     s = uctypes.struct(FOO_STRUCT, uctypes.addressof(buf))
-///
-///     # Access fields
-///     print(s.a, s.b)
-///     # Result:
-///     # 100, 20
+// The uctypes module allows defining the layout of a raw data structure (using
+// terms of the C language), and then access memory buffers using this definition.
+// The module also provides convenience functions to access memory buffers
+// contained in Python objects or wrap memory buffers in Python objects.
 
 #define LAYOUT_LITTLE_ENDIAN (0)
 #define LAYOUT_BIG_ENDIAN    (1)
@@ -647,9 +619,8 @@ STATIC mp_int_t uctypes_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo,
     return 0;
 }
 
-/// \function addressof()
-/// Return address of object's data (applies to object providing buffer
-/// interface).
+// addressof()
+// Return address of object's data (applies to objects providing the buffer interface).
 STATIC mp_obj_t uctypes_struct_addressof(mp_obj_t buf) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_READ);
@@ -657,19 +628,15 @@ STATIC mp_obj_t uctypes_struct_addressof(mp_obj_t buf) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(uctypes_struct_addressof_obj, uctypes_struct_addressof);
 
-/// \function bytearray_at()
-/// Capture memory at given address of given size as bytearray. Memory is
-/// captured by reference (and thus memory pointed by bytearray may change
-/// or become invalid at later time). Use bytes_at() to capture by value.
+// bytearray_at()
+// Capture memory at given address of given size as bytearray.
 STATIC mp_obj_t uctypes_struct_bytearray_at(mp_obj_t ptr, mp_obj_t size) {
     return mp_obj_new_bytearray_by_ref(mp_obj_int_get_truncated(size), (void *)(uintptr_t)mp_obj_int_get_truncated(ptr));
 }
 MP_DEFINE_CONST_FUN_OBJ_2(uctypes_struct_bytearray_at_obj, uctypes_struct_bytearray_at);
 
-/// \function bytes_at()
-/// Capture memory at given address of given size as bytes. Memory is
-/// captured by value, i.e. copied. Use bytearray_at() to capture by reference
-/// ("zero copy").
+// bytes_at()
+// Capture memory at given address of given size as bytes.
 STATIC mp_obj_t uctypes_struct_bytes_at(mp_obj_t ptr, mp_obj_t size) {
     return mp_obj_new_bytes((void *)(uintptr_t)mp_obj_int_get_truncated(ptr), mp_obj_int_get_truncated(size));
 }
@@ -695,36 +662,19 @@ STATIC const mp_rom_map_elem_t mp_module_uctypes_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_bytes_at), MP_ROM_PTR(&uctypes_struct_bytes_at_obj) },
     { MP_ROM_QSTR(MP_QSTR_bytearray_at), MP_ROM_PTR(&uctypes_struct_bytearray_at_obj) },
 
-    /// \moduleref uctypes
-
-    /// \constant NATIVE - Native structure layout - native endianness,
-    /// platform-specific field alignment
     { MP_ROM_QSTR(MP_QSTR_NATIVE), MP_ROM_INT(LAYOUT_NATIVE) },
-    /// \constant LITTLE_ENDIAN - Little-endian structure layout, tightly packed
-    /// (no alignment constraints)
     { MP_ROM_QSTR(MP_QSTR_LITTLE_ENDIAN), MP_ROM_INT(LAYOUT_LITTLE_ENDIAN) },
-    /// \constant BIG_ENDIAN - Big-endian structure layout, tightly packed
-    /// (no alignment constraints)
     { MP_ROM_QSTR(MP_QSTR_BIG_ENDIAN), MP_ROM_INT(LAYOUT_BIG_ENDIAN) },
 
-    /// \constant VOID - void value type, may be used only as pointer target type.
     { MP_ROM_QSTR(MP_QSTR_VOID), MP_ROM_INT(TYPE2SMALLINT(UINT8, VAL_TYPE_BITS)) },
 
-    /// \constant UINT8 - uint8_t value type
     { MP_ROM_QSTR(MP_QSTR_UINT8), MP_ROM_INT(TYPE2SMALLINT(UINT8, 4)) },
-    /// \constant INT8 - int8_t value type
     { MP_ROM_QSTR(MP_QSTR_INT8), MP_ROM_INT(TYPE2SMALLINT(INT8, 4)) },
-    /// \constant UINT16 - uint16_t value type
     { MP_ROM_QSTR(MP_QSTR_UINT16), MP_ROM_INT(TYPE2SMALLINT(UINT16, 4)) },
-    /// \constant INT16 - int16_t value type
     { MP_ROM_QSTR(MP_QSTR_INT16), MP_ROM_INT(TYPE2SMALLINT(INT16, 4)) },
-    /// \constant UINT32 - uint32_t value type
     { MP_ROM_QSTR(MP_QSTR_UINT32), MP_ROM_INT(TYPE2SMALLINT(UINT32, 4)) },
-    /// \constant INT32 - int32_t value type
     { MP_ROM_QSTR(MP_QSTR_INT32), MP_ROM_INT(TYPE2SMALLINT(INT32, 4)) },
-    /// \constant UINT64 - uint64_t value type
     { MP_ROM_QSTR(MP_QSTR_UINT64), MP_ROM_INT(TYPE2SMALLINT(UINT64, 4)) },
-    /// \constant INT64 - int64_t value type
     { MP_ROM_QSTR(MP_QSTR_INT64), MP_ROM_INT(TYPE2SMALLINT(INT64, 4)) },
 
     { MP_ROM_QSTR(MP_QSTR_BFUINT8), MP_ROM_INT(TYPE2SMALLINT(BFUINT8, 4)) },
diff --git a/extmod/moduselect.c b/extmod/moduselect.c
index 6d8249f427..fbd51960d5 100644
--- a/extmod/moduselect.c
+++ b/extmod/moduselect.c
@@ -40,10 +40,6 @@
 // Flags for poll()
 #define FLAG_ONESHOT (1)
 
-/// \module select - Provides select function to wait for events on a stream
-///
-/// This module provides the select function.
-
 typedef struct _poll_obj_t {
     mp_obj_t obj;
     mp_uint_t (*ioctl)(mp_obj_t obj, mp_uint_t request, uintptr_t arg, int *errcode);
@@ -111,7 +107,7 @@ STATIC mp_uint_t poll_map_poll(mp_map_t *poll_map, size_t *rwx_num) {
     return n_ready;
 }
 
-/// \function select(rlist, wlist, xlist[, timeout])
+// select(rlist, wlist, xlist[, timeout])
 STATIC mp_obj_t select_select(size_t n_args, const mp_obj_t *args) {
     // get array data from tuple/list arguments
     size_t rwx_len[3];
@@ -178,8 +174,6 @@ STATIC mp_obj_t select_select(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_select_select_obj, 3, 4, select_select);
 
-/// \class Poll - poll class
-
 typedef struct _mp_obj_poll_t {
     mp_obj_base_t base;
     mp_map_t poll_map;
@@ -190,7 +184,7 @@ typedef struct _mp_obj_poll_t {
     mp_obj_t ret_tuple;
 } mp_obj_poll_t;
 
-/// \method register(obj[, eventmask])
+// register(obj[, eventmask])
 STATIC mp_obj_t poll_register(size_t n_args, const mp_obj_t *args) {
     mp_obj_poll_t *self = MP_OBJ_TO_PTR(args[0]);
     mp_uint_t flags;
@@ -204,7 +198,7 @@ STATIC mp_obj_t poll_register(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(poll_register_obj, 2, 3, poll_register);
 
-/// \method unregister(obj)
+// unregister(obj)
 STATIC mp_obj_t poll_unregister(mp_obj_t self_in, mp_obj_t obj_in) {
     mp_obj_poll_t *self = MP_OBJ_TO_PTR(self_in);
     mp_map_lookup(&self->poll_map, mp_obj_id(obj_in), MP_MAP_LOOKUP_REMOVE_IF_FOUND);
@@ -213,7 +207,7 @@ STATIC mp_obj_t poll_unregister(mp_obj_t self_in, mp_obj_t obj_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(poll_unregister_obj, poll_unregister);
 
-/// \method modify(obj, eventmask)
+// modify(obj, eventmask)
 STATIC mp_obj_t poll_modify(mp_obj_t self_in, mp_obj_t obj_in, mp_obj_t eventmask_in) {
     mp_obj_poll_t *self = MP_OBJ_TO_PTR(self_in);
     mp_map_elem_t *elem = mp_map_lookup(&self->poll_map, mp_obj_id(obj_in), MP_MAP_LOOKUP);
@@ -348,7 +342,7 @@ STATIC const mp_obj_type_t mp_type_poll = {
     .locals_dict = (void *)&poll_locals_dict,
 };
 
-/// \function poll()
+// poll()
 STATIC mp_obj_t select_poll(void) {
     mp_obj_poll_t *poll = m_new_obj(mp_obj_poll_t);
     poll->base.type = &mp_type_poll;
diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index 95b7ad9944..644be57ae7 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -256,7 +256,7 @@ STATIC mp_obj_t fat_vfs_mkdir(mp_obj_t vfs_in, mp_obj_t path_o) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(fat_vfs_mkdir_obj, fat_vfs_mkdir);
 
-/// Change current directory.
+// Change current directory.
 STATIC mp_obj_t fat_vfs_chdir(mp_obj_t vfs_in, mp_obj_t path_in) {
     mp_obj_fat_vfs_t *self = MP_OBJ_TO_PTR(vfs_in);
     const char *path;
@@ -272,7 +272,7 @@ STATIC mp_obj_t fat_vfs_chdir(mp_obj_t vfs_in, mp_obj_t path_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(fat_vfs_chdir_obj, fat_vfs_chdir);
 
-/// Get the current directory.
+// Get the current directory.
 STATIC mp_obj_t fat_vfs_getcwd(mp_obj_t vfs_in) {
     mp_obj_fat_vfs_t *self = MP_OBJ_TO_PTR(vfs_in);
     char buf[MICROPY_ALLOC_PATH_MAX + 1];
@@ -284,8 +284,7 @@ STATIC mp_obj_t fat_vfs_getcwd(mp_obj_t vfs_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(fat_vfs_getcwd_obj, fat_vfs_getcwd);
 
-/// \function stat(path)
-/// Get the status of a file or directory.
+// Get the status of a file or directory.
 STATIC mp_obj_t fat_vfs_stat(mp_obj_t vfs_in, mp_obj_t path_in) {
     mp_obj_fat_vfs_t *self = MP_OBJ_TO_PTR(vfs_in);
     const char *path = mp_obj_str_get_str(path_in);

From 02dc1644b6ebf1bfd5bfa2dde4d68d7272526f51 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 May 2021 12:31:32 +1000
Subject: [PATCH 076/349] extmod/moductypes: Remove double blank lines and
 debugging printf's.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/moductypes.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index 51626600cc..f1108649aa 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -391,10 +391,8 @@ STATIC mp_obj_t uctypes_struct_attr_op(mp_obj_t self_in, qstr attr, mp_obj_t set
         mp_int_t offset = MP_OBJ_SMALL_INT_VALUE(deref);
         mp_uint_t val_type = GET_TYPE(offset, VAL_TYPE_BITS);
         offset &= VALUE_MASK(VAL_TYPE_BITS);
-// printf("scalar type=%d offset=%x\n", val_type, offset);
 
         if (val_type <= INT64 || val_type == FLOAT32 || val_type == FLOAT64) {
-//            printf("size=%d\n", GET_SCALAR_SIZE(val_type));
             if (self->flags == LAYOUT_NATIVE) {
                 if (set_val == MP_OBJ_NULL) {
                     return get_aligned(val_type, self->addr + offset, 0);
@@ -461,7 +459,6 @@ STATIC mp_obj_t uctypes_struct_attr_op(mp_obj_t self_in, qstr attr, mp_obj_t set
     mp_int_t offset = MP_OBJ_SMALL_INT_VALUE(sub->items[0]);
     mp_uint_t agg_type = GET_TYPE(offset, AGG_TYPE_BITS);
     offset &= VALUE_MASK(AGG_TYPE_BITS);
-// printf("agg type=%d offset=%x\n", agg_type, offset);
 
     switch (agg_type) {
         case STRUCT: {
@@ -486,7 +483,6 @@ STATIC mp_obj_t uctypes_struct_attr_op(mp_obj_t self_in, qstr attr, mp_obj_t set
             o->desc = MP_OBJ_FROM_PTR(sub);
             o->addr = self->addr + offset;
             o->flags = self->flags;
-// printf("PTR/ARR base addr=%p\n", o->addr);
             return MP_OBJ_FROM_PTR(o);
         }
     }
@@ -642,7 +638,6 @@ STATIC mp_obj_t uctypes_struct_bytes_at(mp_obj_t ptr, mp_obj_t size) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(uctypes_struct_bytes_at_obj, uctypes_struct_bytes_at);
 
-
 STATIC const mp_obj_type_t uctypes_struct_type = {
     { &mp_type_type },
     .name = MP_QSTR_struct,
@@ -719,7 +714,6 @@ STATIC const mp_rom_map_elem_t mp_module_uctypes_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_PTR), MP_ROM_INT(TYPE2SMALLINT(PTR, AGG_TYPE_BITS)) },
     { MP_ROM_QSTR(MP_QSTR_ARRAY), MP_ROM_INT(TYPE2SMALLINT(ARRAY, AGG_TYPE_BITS)) },
 };
-
 STATIC MP_DEFINE_CONST_DICT(mp_module_uctypes_globals, mp_module_uctypes_globals_table);
 
 const mp_obj_module_t mp_module_uctypes = {

From 350a66a86339a66bfad29e0e8a5a40a34151bfe4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 May 2021 12:40:53 +1000
Subject: [PATCH 077/349] extmod/moductypes: Replace numbers with macro
 constants.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/moductypes.c | 63 +++++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index f1108649aa..97e8d7a787 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -47,6 +47,7 @@
 #define BITF_LEN_BITS 5
 #define BITF_OFF_BITS 5
 #define OFFSET_BITS 17
+#define LEN_BITS (OFFSET_BITS + BITF_OFF_BITS)
 #if VAL_TYPE_BITS + BITF_LEN_BITS + BITF_OFF_BITS + OFFSET_BITS != 31
 #error Invalid encoding field length
 #endif
@@ -409,9 +410,9 @@ STATIC mp_obj_t uctypes_struct_attr_op(mp_obj_t self_in, qstr attr, mp_obj_t set
                 }
             }
         } else if (val_type >= BFUINT8 && val_type <= BFINT32) {
-            uint bit_offset = (offset >> 17) & 31;
-            uint bit_len = (offset >> 22) & 31;
-            offset &= (1 << 17) - 1;
+            uint bit_offset = (offset >> OFFSET_BITS) & 31;
+            uint bit_len = (offset >> LEN_BITS) & 31;
+            offset &= (1 << OFFSET_BITS) - 1;
             mp_uint_t val;
             if (self->flags == LAYOUT_NATIVE) {
                 val = get_aligned_basic(val_type & 6, self->addr + offset);
@@ -663,51 +664,51 @@ STATIC const mp_rom_map_elem_t mp_module_uctypes_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_VOID), MP_ROM_INT(TYPE2SMALLINT(UINT8, VAL_TYPE_BITS)) },
 
-    { MP_ROM_QSTR(MP_QSTR_UINT8), MP_ROM_INT(TYPE2SMALLINT(UINT8, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_INT8), MP_ROM_INT(TYPE2SMALLINT(INT8, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_UINT16), MP_ROM_INT(TYPE2SMALLINT(UINT16, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_INT16), MP_ROM_INT(TYPE2SMALLINT(INT16, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_UINT32), MP_ROM_INT(TYPE2SMALLINT(UINT32, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_INT32), MP_ROM_INT(TYPE2SMALLINT(INT32, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_UINT64), MP_ROM_INT(TYPE2SMALLINT(UINT64, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_INT64), MP_ROM_INT(TYPE2SMALLINT(INT64, 4)) },
+    { MP_ROM_QSTR(MP_QSTR_UINT8), MP_ROM_INT(TYPE2SMALLINT(UINT8, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_INT8), MP_ROM_INT(TYPE2SMALLINT(INT8, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_UINT16), MP_ROM_INT(TYPE2SMALLINT(UINT16, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_INT16), MP_ROM_INT(TYPE2SMALLINT(INT16, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_UINT32), MP_ROM_INT(TYPE2SMALLINT(UINT32, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_INT32), MP_ROM_INT(TYPE2SMALLINT(INT32, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_UINT64), MP_ROM_INT(TYPE2SMALLINT(UINT64, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_INT64), MP_ROM_INT(TYPE2SMALLINT(INT64, VAL_TYPE_BITS)) },
 
-    { MP_ROM_QSTR(MP_QSTR_BFUINT8), MP_ROM_INT(TYPE2SMALLINT(BFUINT8, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_BFINT8), MP_ROM_INT(TYPE2SMALLINT(BFINT8, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_BFUINT16), MP_ROM_INT(TYPE2SMALLINT(BFUINT16, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_BFINT16), MP_ROM_INT(TYPE2SMALLINT(BFINT16, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_BFUINT32), MP_ROM_INT(TYPE2SMALLINT(BFUINT32, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_BFINT32), MP_ROM_INT(TYPE2SMALLINT(BFINT32, 4)) },
+    { MP_ROM_QSTR(MP_QSTR_BFUINT8), MP_ROM_INT(TYPE2SMALLINT(BFUINT8, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_BFINT8), MP_ROM_INT(TYPE2SMALLINT(BFINT8, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_BFUINT16), MP_ROM_INT(TYPE2SMALLINT(BFUINT16, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_BFINT16), MP_ROM_INT(TYPE2SMALLINT(BFINT16, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_BFUINT32), MP_ROM_INT(TYPE2SMALLINT(BFUINT32, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_BFINT32), MP_ROM_INT(TYPE2SMALLINT(BFINT32, VAL_TYPE_BITS)) },
 
-    { MP_ROM_QSTR(MP_QSTR_BF_POS), MP_ROM_INT(17) },
-    { MP_ROM_QSTR(MP_QSTR_BF_LEN), MP_ROM_INT(22) },
+    { MP_ROM_QSTR(MP_QSTR_BF_POS), MP_ROM_INT(OFFSET_BITS) },
+    { MP_ROM_QSTR(MP_QSTR_BF_LEN), MP_ROM_INT(LEN_BITS) },
 
     #if MICROPY_PY_BUILTINS_FLOAT
-    { MP_ROM_QSTR(MP_QSTR_FLOAT32), MP_ROM_INT(TYPE2SMALLINT(FLOAT32, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_FLOAT64), MP_ROM_INT(TYPE2SMALLINT(FLOAT64, 4)) },
+    { MP_ROM_QSTR(MP_QSTR_FLOAT32), MP_ROM_INT(TYPE2SMALLINT(FLOAT32, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_FLOAT64), MP_ROM_INT(TYPE2SMALLINT(FLOAT64, VAL_TYPE_BITS)) },
     #endif
 
     #if MICROPY_PY_UCTYPES_NATIVE_C_TYPES
     // C native type aliases. These depend on GCC-compatible predefined
     // preprocessor macros.
     #if __SIZEOF_SHORT__ == 2
-    { MP_ROM_QSTR(MP_QSTR_SHORT), MP_ROM_INT(TYPE2SMALLINT(INT16, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_USHORT), MP_ROM_INT(TYPE2SMALLINT(UINT16, 4)) },
+    { MP_ROM_QSTR(MP_QSTR_SHORT), MP_ROM_INT(TYPE2SMALLINT(INT16, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_USHORT), MP_ROM_INT(TYPE2SMALLINT(UINT16, VAL_TYPE_BITS)) },
     #endif
     #if __SIZEOF_INT__ == 4
-    { MP_ROM_QSTR(MP_QSTR_INT), MP_ROM_INT(TYPE2SMALLINT(INT32, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_UINT), MP_ROM_INT(TYPE2SMALLINT(UINT32, 4)) },
+    { MP_ROM_QSTR(MP_QSTR_INT), MP_ROM_INT(TYPE2SMALLINT(INT32, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_UINT), MP_ROM_INT(TYPE2SMALLINT(UINT32, VAL_TYPE_BITS)) },
     #endif
     #if __SIZEOF_LONG__ == 4
-    { MP_ROM_QSTR(MP_QSTR_LONG), MP_ROM_INT(TYPE2SMALLINT(INT32, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_ULONG), MP_ROM_INT(TYPE2SMALLINT(UINT32, 4)) },
+    { MP_ROM_QSTR(MP_QSTR_LONG), MP_ROM_INT(TYPE2SMALLINT(INT32, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_ULONG), MP_ROM_INT(TYPE2SMALLINT(UINT32, VAL_TYPE_BITS)) },
     #elif __SIZEOF_LONG__ == 8
-    { MP_ROM_QSTR(MP_QSTR_LONG), MP_ROM_INT(TYPE2SMALLINT(INT64, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_ULONG), MP_ROM_INT(TYPE2SMALLINT(UINT64, 4)) },
+    { MP_ROM_QSTR(MP_QSTR_LONG), MP_ROM_INT(TYPE2SMALLINT(INT64, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_ULONG), MP_ROM_INT(TYPE2SMALLINT(UINT64, VAL_TYPE_BITS)) },
     #endif
     #if __SIZEOF_LONG_LONG__ == 8
-    { MP_ROM_QSTR(MP_QSTR_LONGLONG), MP_ROM_INT(TYPE2SMALLINT(INT64, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_ULONGLONG), MP_ROM_INT(TYPE2SMALLINT(UINT64, 4)) },
+    { MP_ROM_QSTR(MP_QSTR_LONGLONG), MP_ROM_INT(TYPE2SMALLINT(INT64, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_ULONGLONG), MP_ROM_INT(TYPE2SMALLINT(UINT64, VAL_TYPE_BITS)) },
     #endif
     #endif // MICROPY_PY_UCTYPES_NATIVE_C_TYPES
 

From 47583d8cbd251d9cb3b0f4a70c5594d1329ad930 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 May 2021 13:11:33 +1000
Subject: [PATCH 078/349] extmod/moductypes: Fix size and offset calculation
 for ARRAY of FLOAT32.

uctypes.FLOAT32 has a special value representation and
uctypes_struct_scalar_size() should be used instead of GET_SCALAR_SIZE().

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/moductypes.c                      |  4 ++--
 tests/extmod/uctypes_le_float.py         | 16 ++++++++++++++++
 tests/extmod/uctypes_le_float.py.exp     |  2 ++
 tests/extmod/uctypes_sizeof_float.py     |  2 ++
 tests/extmod/uctypes_sizeof_float.py.exp |  2 ++
 5 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index 97e8d7a787..58f0adfa4b 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -164,7 +164,7 @@ STATIC mp_uint_t uctypes_struct_agg_size(mp_obj_tuple_t *t, int layout_type, mp_
             mp_uint_t item_s;
             if (t->len == 2) {
                 // Elements of array are scalar
-                item_s = GET_SCALAR_SIZE(val_type);
+                item_s = uctypes_struct_scalar_size(val_type);
                 if (item_s > *max_field_size) {
                     *max_field_size = item_s;
                 }
@@ -541,7 +541,7 @@ STATIC mp_obj_t uctypes_struct_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_ob
                         return value; // just !MP_OBJ_NULL
                     }
                 } else {
-                    byte *p = self->addr + GET_SCALAR_SIZE(val_type) * index;
+                    byte *p = self->addr + uctypes_struct_scalar_size(val_type) * index;
                     if (value == MP_OBJ_SENTINEL) {
                         return get_unaligned(val_type, p, self->flags);
                     } else {
diff --git a/tests/extmod/uctypes_le_float.py b/tests/extmod/uctypes_le_float.py
index 89e9a9e0ab..5255632c91 100644
--- a/tests/extmod/uctypes_le_float.py
+++ b/tests/extmod/uctypes_le_float.py
@@ -22,3 +22,19 @@ print("%.4f" % S.f64)
 
 S.uf64 = 12.34
 print("%.4f" % S.uf64)
+
+# array of float/double
+desc = {
+    "af32": (uctypes.ARRAY | 0, uctypes.FLOAT32 | 2),
+    "af64": (uctypes.ARRAY | 0, uctypes.FLOAT64 | 2),
+}
+data = bytearray(16)
+S = uctypes.struct(uctypes.addressof(data), desc, uctypes.LITTLE_ENDIAN)
+
+S.af32[0] = 1
+S.af32[1] = 2
+print("%.4f %.4f" % (S.af32[0], S.af32[1]), data)
+
+S.af64[0] = 1
+S.af64[1] = 2
+print("%.4f %.4f" % (S.af64[0], S.af64[1]), data)
diff --git a/tests/extmod/uctypes_le_float.py.exp b/tests/extmod/uctypes_le_float.py.exp
index a35a1da2dc..e93fcb0d97 100644
--- a/tests/extmod/uctypes_le_float.py.exp
+++ b/tests/extmod/uctypes_le_float.py.exp
@@ -1,3 +1,5 @@
 12.3400
 12.3400
 12.3400
+1.0000 2.0000 bytearray(b'\x00\x00\x80?\x00\x00\x00@\x00\x00\x00\x00\x00\x00\x00\x00')
+1.0000 2.0000 bytearray(b'\x00\x00\x00\x00\x00\x00\xf0?\x00\x00\x00\x00\x00\x00\x00@')
diff --git a/tests/extmod/uctypes_sizeof_float.py b/tests/extmod/uctypes_sizeof_float.py
index 351632d76b..f1a4c88e2d 100644
--- a/tests/extmod/uctypes_sizeof_float.py
+++ b/tests/extmod/uctypes_sizeof_float.py
@@ -6,3 +6,5 @@ except ImportError:
 
 print(uctypes.sizeof({"f": uctypes.FLOAT32}))
 print(uctypes.sizeof({"f": uctypes.FLOAT64}))
+print(uctypes.sizeof({"f": (uctypes.ARRAY | 0, uctypes.FLOAT32 | 2)}))
+print(uctypes.sizeof({"f": (uctypes.ARRAY | 0, uctypes.FLOAT64 | 2)}))
diff --git a/tests/extmod/uctypes_sizeof_float.py.exp b/tests/extmod/uctypes_sizeof_float.py.exp
index de78180725..82776b54ab 100644
--- a/tests/extmod/uctypes_sizeof_float.py.exp
+++ b/tests/extmod/uctypes_sizeof_float.py.exp
@@ -1,2 +1,4 @@
 4
 8
+8
+16

From b98197f950b572aff2a34934e64d094e5cea6cd5 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 30 Apr 2021 14:05:33 +1000
Subject: [PATCH 079/349] docs/esp32: Add UART to quickref.

---
 docs/esp32/quickref.rst | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index c29688f000..2a9c8397c8 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -171,6 +171,33 @@ Notes:
 * The pull value of some pins can be set to ``Pin.PULL_HOLD`` to reduce power
   consumption during deepsleep.
 
+UART (serial bus)
+-----------------
+
+See :ref:`machine.UART <machine.UART>`. ::
+
+    from machine import UART
+
+    uart1 = UART(1, baudrate=9600, tx=33, rx=32)
+    uart1.write('hello')  # write 5 bytes
+    uart1.read(5)         # read up to 5 bytes
+
+The ESP32 has three hardware UARTs: UART0, UART1 and UART2.
+They each have default GPIO assigned to them, however depending on your
+ESP32 variant and board, these pins may conflict with embedded flash,
+onboard PSRAM or peripherals.
+
+Any GPIO can be used for hardware UARTs using the GPIO matrix, so to avoid
+conflicts simply provide ``tx`` and ``rx`` pins when constructing. The default
+pins listed below.
+
+=====  =====  =====  =====
+\      UART0  UART1  UART2
+=====  =====  =====  =====
+tx     1      10     17
+rx     3      9      16
+=====  =====  =====  =====
+
 PWM (pulse width modulation)
 ----------------------------
 

From a65942a41d5bedd80b0098b1578680e72bef384b Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 30 Apr 2021 14:03:16 +1000
Subject: [PATCH 080/349] docs/esp32: Add WDT to quickref.

---
 docs/esp32/quickref.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 2a9c8397c8..5e70275830 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -384,6 +384,17 @@ See :ref:`machine.RTC <machine.RTC>` ::
     rtc.datetime((2017, 8, 23, 1, 12, 48, 0, 0)) # set a specific date and time
     rtc.datetime() # get date and time
 
+WDT (Watchdog timer)
+--------------------
+
+See :ref:`machine.WDT <machine.WDT>`. ::
+
+    from machine import WDT
+
+    # enable the WDT with a timeout of 5s (1s is the minimum)
+    wdt = WDT(timeout=5000)
+    wdt.feed()
+
 Deep-sleep mode
 ---------------
 

From a111889705649465b2fd57a1f10bd34aae9b4435 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 30 Apr 2021 14:04:37 +1000
Subject: [PATCH 081/349] docs/esp32: Add SDCard to quickref.

---
 docs/esp32/quickref.rst | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 5e70275830..a569ff0a4e 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -424,6 +424,21 @@ Notes:
 
     p1 = Pin(4, Pin.OUT, None)
 
+SD card
+-------
+
+See :ref:`machine.SDCard <machine.SDCard>`. ::
+
+    import machine, uos
+
+    # Slot 2 uses pins sck=18, cs=5, miso=19, mosi=23
+    sd = machine.SDCard(slot=2)
+    uos.mount(sd, "/sd")  # mount
+
+    uos.listdir('/sd')    # list directory contents
+
+    uos.umount('/sd')     # eject
+
 RMT
 ---
 

From 64aebed70e58ecc9623231d887d9818475174081 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 30 Apr 2021 14:02:17 +1000
Subject: [PATCH 082/349] docs/esp8266: Add WDT to quickref.

---
 docs/esp8266/quickref.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/esp8266/quickref.rst b/docs/esp8266/quickref.rst
index b9a46ab112..af2ef1ca1a 100644
--- a/docs/esp8266/quickref.rst
+++ b/docs/esp8266/quickref.rst
@@ -293,6 +293,17 @@ See :ref:`machine.RTC <machine.RTC>` ::
           (using a custom handler), `RTC.init()` and `RTC.deinit()` are
           currently not supported.
 
+WDT (Watchdog timer)
+--------------------
+
+See :ref:`machine.WDT <machine.WDT>`. ::
+
+    from machine import WDT
+
+    # enable the WDT
+    wdt = WDT()
+    wdt.feed()
+
 Deep-sleep mode
 ---------------
 

From 8ff3520f67bb8f7e5509129f9f561a1217ababa4 Mon Sep 17 00:00:00 2001
From: mishafarms <github@mishafarms.us>
Date: Tue, 4 May 2021 10:50:20 -0700
Subject: [PATCH 083/349] esp32/esp32_rmt: Clear config struct before filling
 it out.

Or unset entries will have garbage in them.

Signed-off-by: mishafarms <github@mishafarms.us>
---
 ports/esp32/esp32_rmt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c
index b547af5539..9619b1dd5b 100644
--- a/ports/esp32/esp32_rmt.c
+++ b/ports/esp32/esp32_rmt.c
@@ -96,7 +96,7 @@ STATIC mp_obj_t esp32_rmt_make_new(const mp_obj_type_t *type, size_t n_args, siz
     self->carrier_freq = carrier_freq;
     self->loop_en = false;
 
-    rmt_config_t config;
+    rmt_config_t config = {0};
     config.rmt_mode = RMT_MODE_TX;
     config.channel = (rmt_channel_t)self->channel_id;
     config.gpio_num = self->pin;

From 9eea51b730532cb33fe2531a3aade734d0a0a121 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Tue, 20 Apr 2021 17:07:43 +1000
Subject: [PATCH 084/349] drivers/display/ssd1306.py: Add rotate method.

And clean up (make more efficient) display set-up commands.
---
 drivers/display/ssd1306.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/display/ssd1306.py b/drivers/display/ssd1306.py
index 6359c85eaa..85e2bf0cb5 100644
--- a/drivers/display/ssd1306.py
+++ b/drivers/display/ssd1306.py
@@ -37,12 +37,12 @@ class SSD1306(framebuf.FrameBuffer):
 
     def init_display(self):
         for cmd in (
-            SET_DISP | 0x00,  # off
+            SET_DISP,  # display off
             # address setting
             SET_MEM_ADDR,
             0x00,  # horizontal
             # resolution and layout
-            SET_DISP_START_LINE | 0x00,
+            SET_DISP_START_LINE,  # start at line 0
             SET_SEG_REMAP | 0x01,  # column addr 127 mapped to SEG0
             SET_MUX_RATIO,
             self.height - 1,
@@ -66,14 +66,14 @@ class SSD1306(framebuf.FrameBuffer):
             # charge pump
             SET_CHARGE_PUMP,
             0x10 if self.external_vcc else 0x14,
-            SET_DISP | 0x01,
+            SET_DISP | 0x01,  # display on
         ):  # on
             self.write_cmd(cmd)
         self.fill(0)
         self.show()
 
     def poweroff(self):
-        self.write_cmd(SET_DISP | 0x00)
+        self.write_cmd(SET_DISP)
 
     def poweron(self):
         self.write_cmd(SET_DISP | 0x01)
@@ -85,6 +85,10 @@ class SSD1306(framebuf.FrameBuffer):
     def invert(self, invert):
         self.write_cmd(SET_NORM_INV | (invert & 1))
 
+    def rotate(self, rotate):
+        self.write_cmd(SET_COM_OUT_DIR | ((rotate & 1) << 3))
+        self.write_cmd(SET_SEG_REMAP | (rotate & 1))
+
     def show(self):
         x0 = 0
         x1 = self.width - 1

From fd24e649fde26bcd484b30025527768d37f5c562 Mon Sep 17 00:00:00 2001
From: Tim Radvan <tim@tjvr.org>
Date: Fri, 16 Apr 2021 12:18:04 +0100
Subject: [PATCH 085/349] docs/library: Add initial API reference for rp2
 module and its classes.

All the method signatures from rp2_pio.c and friends have been taken and
converted to RST format, then explanatory notes added for each signature.

Signed-off-by: Tim Radvan <tim@tjvr.org>
---
 docs/library/index.rst            |  11 +++
 docs/library/machine.rst          |   6 +-
 docs/library/rp2.Flash.rst        |  36 ++++++++
 docs/library/rp2.PIO.rst          |  94 +++++++++++++++++++++
 docs/library/rp2.StateMachine.rst | 131 ++++++++++++++++++++++++++++++
 docs/library/rp2.rst              |  83 +++++++++++++++++++
 6 files changed, 359 insertions(+), 2 deletions(-)
 create mode 100644 docs/library/rp2.Flash.rst
 create mode 100644 docs/library/rp2.PIO.rst
 create mode 100644 docs/library/rp2.StateMachine.rst
 create mode 100644 docs/library/rp2.rst

diff --git a/docs/library/index.rst b/docs/library/index.rst
index 43d9e87f3c..2536e8dc96 100644
--- a/docs/library/index.rst
+++ b/docs/library/index.rst
@@ -165,3 +165,14 @@ The following libraries are specific to the ESP8266 and ESP32.
 
   esp.rst
   esp32.rst
+
+
+Libraries specific to the RP2040
+--------------------------------
+
+The following libraries are specific to the RP2040, as used in the Raspberry Pi Pico.
+
+.. toctree::
+  :maxdepth: 2
+
+  rp2.rst
diff --git a/docs/library/machine.rst b/docs/library/machine.rst
index f831049f88..0a1c1c9530 100644
--- a/docs/library/machine.rst
+++ b/docs/library/machine.rst
@@ -64,9 +64,11 @@ Interrupt related functions
 Power related functions
 -----------------------
 
-.. function:: freq()
+.. function:: freq([hz])
 
-    Returns CPU frequency in hertz.
+    Returns the CPU frequency in hertz.
+
+    On some ports this can also be used to set the CPU frequency by passing in *hz*.
 
 .. function:: idle()
 
diff --git a/docs/library/rp2.Flash.rst b/docs/library/rp2.Flash.rst
new file mode 100644
index 0000000000..3b423adfdd
--- /dev/null
+++ b/docs/library/rp2.Flash.rst
@@ -0,0 +1,36 @@
+.. currentmodule:: rp2
+.. _rp2.Flash:
+
+class Flash -- access to built-in flash storage
+===============================================
+
+This class gives access to the SPI flash memory.
+
+In most cases, to store persistent data on the device, you'll want to use a
+higher-level abstraction, for example the filesystem via Python's standard file
+API, but this interface is useful to :ref:`customise the filesystem
+configuration <filesystem>` or implement a low-level storage system for your
+application.
+
+
+Constructors
+------------
+
+.. class:: Flash()
+
+   Gets the singleton object for accessing the SPI flash memory.
+
+
+Methods
+-------
+
+.. method:: Flash.readblocks(block_num, buf)
+            Flash.readblocks(block_num, buf, offset)
+.. method:: Flash.writeblocks(block_num, buf)
+            Flash.writeblocks(block_num, buf, offset)
+.. method:: Flash.ioctl(cmd, arg)
+
+    These methods implement the simple and extended
+    :ref:`block protocol <block-device-interface>` defined by
+    :class:`uos.AbstractBlockDev`.
+
diff --git a/docs/library/rp2.PIO.rst b/docs/library/rp2.PIO.rst
new file mode 100644
index 0000000000..e0675af1e9
--- /dev/null
+++ b/docs/library/rp2.PIO.rst
@@ -0,0 +1,94 @@
+.. currentmodule:: rp2
+.. _rp2.PIO:
+
+class PIO -- advanced PIO usage
+===============================
+
+The :class:`PIO` class gives access to an instance of the RP2040's PIO
+(programmable I/O) interface.
+
+The preferred way to interact with PIO is using :class:`rp2.StateMachine`, the
+PIO class is for advanced use.
+
+For assembling PIO programs, see :func:`rp2.asm_pio`.
+
+
+Constructors
+------------
+
+.. class:: PIO(id)
+
+    Gets the PIO instance numbered *id*. The RP2040 has two PIO instances,
+    numbered 0 and 1.
+
+    Raises a ``ValueError`` if any other argument is provided.
+
+
+Methods
+-------
+
+.. method:: PIO.add_program(program)
+
+    Add the *program* to the instruction memory of this PIO instance.
+
+    The amount of memory available for programs on each PIO instance is
+    limited. If there isn't enough space left in the PIO's program memory
+    this method will raise ``OSError(ENOMEM)``.
+
+.. method:: PIO.remove_program([program])
+
+    Remove *program* from the instruction memory of this PIO instance.
+
+    If no program is provided, it removes all programs.
+
+    It is not an error to remove a program which has already been removed.
+
+.. method:: PIO.state_machine(id, [program, ...])
+
+    Gets the state machine numbered *id*. On the RP2040, each PIO instance has
+    four state machines, numbered 0 to 3.
+
+    Optionally initialize it with a *program*: see `StateMachine.init`.
+
+    >>> rp2.PIO(1).state_machine(3)
+    StateMachine(7)
+
+.. method:: PIO.irq(handler=None, trigger=IRQ_SM0|IRQ_SM1|IRQ_SM2|IRQ_SM3, hard=False)
+
+    Returns the IRQ object for this PIO instance.
+
+    MicroPython only uses IRQ 0 on each PIO instance. IRQ 1 is not available.
+
+    Optionally configure it.
+
+
+Constants
+---------
+
+.. data:: PIO.IN_LOW
+          PIO.IN_HIGH
+          PIO.OUT_LOW
+          PIO.OUT_HIGH
+
+    These constants are used for the *out_init*, *set_init*, and *sideset_init*
+    arguments to `asm_pio`.
+
+.. data:: PIO.SHIFT_LEFT
+          PIO.SHIFT_RIGHT
+
+    These constants are used for the *in_shiftdir* and *out_shiftdir* arguments
+    to `asm_pio` or `StateMachine.init`.
+
+.. data:: PIO.JOIN_NONE
+          PIO.JOIN_TX
+          PIO.JOIN_RX
+
+    These constants are used for the *fifo_join* argument to `asm_pio`.
+
+.. data:: PIO.IRQ_SM0
+          PIO.IRQ_SM1
+          PIO.IRQ_SM2
+          PIO.IRQ_SM3
+
+    These constants are used for the *trigger* argument to `PIO.irq`.
+
diff --git a/docs/library/rp2.StateMachine.rst b/docs/library/rp2.StateMachine.rst
new file mode 100644
index 0000000000..8d73ccf772
--- /dev/null
+++ b/docs/library/rp2.StateMachine.rst
@@ -0,0 +1,131 @@
+.. currentmodule:: rp2
+.. _rp2.StateMachine:
+
+class StateMachine -- access to the RP2040's programmable I/O interface
+=======================================================================
+
+The :class:`StateMachine` class gives access to the RP2040's PIO (programmable
+I/O) interface.
+
+For assembling PIO programs, see :func:`rp2.asm_pio`.
+
+
+Constructors
+------------
+
+.. class:: StateMachine(id, [program, ...])
+
+    Get the state machine numbered *id*. The RP2040 has two identical PIO
+    instances, each with 4 state machines: so there are 8 state machines in
+    total, numbered 0 to 7.
+
+    Optionally initialize it with the given program *program*: see
+    `StateMachine.init`.
+
+
+Methods
+-------
+
+.. method:: StateMachine.init(program, freq=-1, *, in_base=None, out_base=None, set_base=None, jmp_pin=None, sideset_base=None, in_shiftdir=None, out_shiftdir=None, push_thresh=None, pull_thresh=None)
+
+    Configure the state machine instance to run the given *program*.
+
+    The program is added to the instruction memory of this PIO instance. If the
+    instruction memory already contains this program, then its offset is
+    re-used so as to save on instruction memory.
+
+    - *freq* is the frequency in Hz to run the state machine at. Defaults to
+      the system clock frequency.
+
+      The clock divider is computed as ``system clock frequency / freq``, so
+      there can be slight rounding errors.
+
+      The minimum possible clock divider is one 65536th of the system clock: so
+      at the default system clock frequency of 125MHz, the minimum value of
+      *freq* is ``1908``. To run state machines at slower frequencies, you'll
+      need to reduce the system clock speed with `machine.freq()`.
+    - *in_base* is the first pin to use for ``in()`` instructions.
+    - *out_base* is the first pin to use for ``out()`` instructions.
+    - *set_base* is the first pin to use for ``set()`` instructions.
+    - *jmp_pin* is the first pin to use for ``jmp(pin, ...)`` instructions.
+    - *sideset_base* is the first pin to use for side-setting.
+    - *in_shiftdir* is the direction the ISR will shift, either
+      `PIO.SHIFT_LEFT` or `PIO.SHIFT_RIGHT`.
+    - *out_shiftdir* is the direction the OSR will shift, either
+      `PIO.SHIFT_LEFT` or `PIO.SHIFT_RIGHT`.
+    - *push_thresh* is the threshold in bits before auto-push or conditional
+      re-pushing is triggered.
+    - *pull_thresh* is the threshold in bits before auto-push or conditional
+      re-pushing is triggered.
+
+.. method:: StateMachine.active([value])
+
+    Gets or sets whether the state machine is currently running.
+
+    >>> sm.active()
+    True
+    >>> sm.active(0)
+    False
+
+.. method:: StateMachine.restart()
+
+    Restarts the state machine and jumps to the beginning of the program.
+
+    This method clears the state machine's internal state using the RP2040's
+    ``SM_RESTART`` register. This includes:
+
+     - input and output shift counters
+     - the contents of the input shift register
+     - the delay counter
+     - the waiting-on-IRQ state
+     - a stalled instruction run using `StateMachine.exec()`
+
+.. method:: StateMachine.exec(instr)
+
+    Execute a single PIO instruction. Uses `asm_pio_encode` to encode the
+    instruction from the given string *instr*.
+
+    >>> sm.exec("set(0, 1)")
+
+.. method:: StateMachine.get(buf=None, shift=0)
+
+    Pull a word from the state machine's RX FIFO.
+
+    If the FIFO is empty, it blocks until data arrives (i.e. the state machine
+    pushes a word).
+
+    The value is shifted right by *shift* bits before returning, i.e. the
+    return value is ``word >> shift``.
+
+.. method:: StateMachine.put(value, shift=0)
+
+    Push a word onto the state machine's TX FIFO.
+
+    If the FIFO is full, it blocks until there is space (i.e. the state machine
+    pulls a word).
+
+    The value is first shifted left by *shift* bits, i.e. the state machine
+    receives ``value << shift``.
+
+.. method:: StateMachine.rx_fifo()
+
+    Returns the number of words in the state machine's RX FIFO. A value of 0
+    indicates the FIFO is empty.
+
+    Useful for checking if data is waiting to be read, before calling
+    `StateMachine.get()`.
+
+.. method:: StateMachine.tx_fifo()
+
+    Returns the number of words in the state machine's TX FIFO. A value of 0
+    indicates the FIFO is empty.
+
+    Useful for checking if there is space to push another word using
+    `StateMachine.put()`.
+
+.. method:: StateMachine.irq(handler=None, trigger=0|1, hard=False)
+
+     Returns the IRQ object for the given StateMachine.
+
+     Optionally configure it.
+
diff --git a/docs/library/rp2.rst b/docs/library/rp2.rst
new file mode 100644
index 0000000000..b6e7fcf429
--- /dev/null
+++ b/docs/library/rp2.rst
@@ -0,0 +1,83 @@
+.. currentmodule:: rp2
+
+:mod:`rp2` --- functionality specific to the RP2040
+===================================================
+
+.. module:: rp2
+    :synopsis: functionality specific to the RP2
+
+The ``rp2`` module contains functions and classes specific to the RP2040, as
+used in the Raspberry Pi Pico.
+
+See the `RP2040 Python datasheet
+<https://datasheets.raspberrypi.org/pico/raspberry-pi-pico-python-sdk.pdf>`_
+for more information, and `pico-micropython-examples
+<https://github.com/raspberrypi/pico-micropython-examples/tree/master/pio>`_
+for example code.
+
+
+PIO related functions
+---------------------
+
+The ``rp2`` module includes functions for assembling PIO programs.
+
+For running PIO programs, see :class:`rp2.StateMachine`.
+
+.. function:: asm_pio(*, out_init=None, set_init=None, sideset_init=None, in_shiftdir=0, out_shiftdir=0, autopush=False, autopull=False, push_thresh=32, pull_thresh=32, fifo_join=PIO.JOIN_NONE)
+
+    Assemble a PIO program.
+
+    The following parameters control the initial state of the GPIO pins, as one
+    of `PIO.IN_LOW`, `PIO.IN_HIGH`, `PIO.OUT_LOW` or `PIO.OUT_HIGH`. If the
+    program uses more than one pin, provide a tuple, e.g.
+    ``out_init=(PIO.OUT_LOW, PIO.OUT_LOW)``.
+
+    - *out_init* configures the pins used for ``out()`` instructions.
+    - *set_init* configures the pins used for ``set()`` instructions. There can
+      be at most 5.
+    - *sideset_init* configures the pins used side-setting. There can be at
+      most 5.
+
+    The following parameters are used by default, but can be overriden in
+    `StateMachine.init()`:
+
+    - *in_shiftdir* is the default direction the ISR will shift, either
+      `PIO.SHIFT_LEFT` or `PIO.SHIFT_RIGHT`.
+    - *out_shiftdir* is the default direction the OSR will shift, either
+      `PIO.SHIFT_LEFT` or `PIO.SHIFT_RIGHT`.
+    - *push_thresh* is the threshold in bits before auto-push or conditional
+      re-pushing is triggered.
+    - *pull_thresh* is the threshold in bits before auto-push or conditional
+      re-pushing is triggered.
+
+    The remaining parameters are:
+
+    - *autopush* configures whether auto-push is enabled.
+    - *autopull* configures whether auto-pull is enabled.
+    - *fifo_join* configures whether the 4-word TX and RX FIFOs should be
+      combined into a single 8-word FIFO for one direction only. The options
+      are `PIO.JOIN_NONE`, `PIO.JOIN_RX` and `PIO.JOIN_TX`.
+
+.. function:: asm_pio_encode(instr, sideset_count)
+
+    Assemble a single PIO instruction. You usually want to use `asm_pio()`
+    instead.
+
+    >>> rp2.asm_pio_encode("set(0, 1)", 0)
+    57345
+
+.. class:: PIOASMError
+
+    This exception is raised from `asm_pio()` or `asm_pio_encode()` if there is
+    an error assembling a PIO program.
+
+
+Classes
+-------
+
+.. toctree::
+    :maxdepth: 1
+
+    rp2.Flash.rst
+    rp2.PIO.rst
+    rp2.StateMachine.rst

From 31e0b8c71c6e9bed7388439e2441465c58311393 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 8 May 2021 18:14:13 +1000
Subject: [PATCH 086/349] esp32/mpthreadport: Don't explicitly free thread
 struct in TCB cleanup.

Because vPortCleanUpTCB runs on the FreeRTOS idle task and cannot execute
any VM or runtime related code like freeing memory.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/mpthreadport.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/mpthreadport.c b/ports/esp32/mpthreadport.c
index 140a76464f..bbfc53d3f5 100644
--- a/ports/esp32/mpthreadport.c
+++ b/ports/esp32/mpthreadport.c
@@ -166,6 +166,8 @@ void mp_thread_finish(void) {
     mp_thread_mutex_unlock(&thread_mutex);
 }
 
+// This is called from the FreeRTOS idle task and is not within Python context,
+// so MP_STATE_THREAD is not valid and it does not have the GIL.
 void vPortCleanUpTCB(void *tcb) {
     if (thread == NULL) {
         // threading not yet initialised
@@ -182,8 +184,7 @@ void vPortCleanUpTCB(void *tcb) {
                 // move the start pointer
                 thread = th->next;
             }
-            // explicitly release all its memory
-            m_del(thread_t, th, 1);
+            // The "th" memory will eventually be reclaimed by the GC.
             break;
         }
     }

From 864e4ecc47f204e6ca6fbe8342e268932c89acdf Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 8 May 2021 18:17:27 +1000
Subject: [PATCH 087/349] esp32/mpthreadport: Use binary semaphore instead of
 mutex.

So a lock can be acquired on one Python thread and then released on
another.  A test for this is added.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/mpthreadport.c   |  5 ++++-
 tests/thread/thread_lock5.py | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 tests/thread/thread_lock5.py

diff --git a/ports/esp32/mpthreadport.c b/ports/esp32/mpthreadport.c
index bbfc53d3f5..f575d99e6e 100644
--- a/ports/esp32/mpthreadport.c
+++ b/ports/esp32/mpthreadport.c
@@ -192,7 +192,10 @@ void vPortCleanUpTCB(void *tcb) {
 }
 
 void mp_thread_mutex_init(mp_thread_mutex_t *mutex) {
-    mutex->handle = xSemaphoreCreateMutexStatic(&mutex->buffer);
+    // Need a binary semaphore so a lock can be acquired on one Python thread
+    // and then released on another.
+    mutex->handle = xSemaphoreCreateBinaryStatic(&mutex->buffer);
+    xSemaphoreGive(mutex->handle);
 }
 
 int mp_thread_mutex_lock(mp_thread_mutex_t *mutex, int wait) {
diff --git a/tests/thread/thread_lock5.py b/tests/thread/thread_lock5.py
new file mode 100644
index 0000000000..830b5efa82
--- /dev/null
+++ b/tests/thread/thread_lock5.py
@@ -0,0 +1,16 @@
+# test _thread lock objects where a lock is acquired/released by a different thread
+
+import _thread
+
+
+def thread_entry():
+    print("thread about to release lock")
+    lock.release()
+
+
+lock = _thread.allocate_lock()
+lock.acquire()
+_thread.start_new_thread(thread_entry, ())
+lock.acquire()
+print("main has lock")
+lock.release()

From 9340cfe77432b548fc6ace6e2959a07a08e8eadc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 8 May 2021 18:20:05 +1000
Subject: [PATCH 088/349] tests/thread: Make stress_create.py test run on
 esp32.

The esp32 port needs to be idle for finished threads and their resources to
be freed up.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/thread/stress_create.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/tests/thread/stress_create.py b/tests/thread/stress_create.py
index eda768fa7b..877424cdf5 100644
--- a/tests/thread/stress_create.py
+++ b/tests/thread/stress_create.py
@@ -1,9 +1,13 @@
 # stress test for creating many threads
 
 try:
-    import utime as time
+    import utime
+
+    sleep_ms = utime.sleep_ms
 except ImportError:
     import time
+
+    sleep_ms = lambda t: time.sleep(t / 1000)
 import _thread
 
 
@@ -16,9 +20,11 @@ while thread_num < 500:
     try:
         _thread.start_new_thread(thread_entry, (thread_num,))
         thread_num += 1
-    except MemoryError:
-        pass
+    except (MemoryError, OSError) as er:
+        # Cannot create a new thead at this stage, yield for a bit to
+        # let existing threads run to completion and free up resources.
+        sleep_ms(50)
 
 # wait for the last threads to terminate
-time.sleep(1)
+sleep_ms(500)
 print("done")

From 7b923d6c72be29e2fe57740c9ea3a2135e7db6f7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 8 May 2021 18:36:27 +1000
Subject: [PATCH 089/349] tests/thread: Make stress_aes.py test run on
 bare-metal ports.

This is a long-running test, so make it run in reasonable time on slower,
bare-metal ports.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/thread/stress_aes.py | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/tests/thread/stress_aes.py b/tests/thread/stress_aes.py
index f73da557cb..1bf252a807 100644
--- a/tests/thread/stress_aes.py
+++ b/tests/thread/stress_aes.py
@@ -235,7 +235,7 @@ class LockedCounter:
 count = LockedCounter()
 
 
-def thread_entry():
+def thread_entry(n_loop):
     global count
 
     aes = AES(256)
@@ -244,7 +244,7 @@ def thread_entry():
     data = bytearray(128)
     # from now on we don't use the heap
 
-    for loop in range(5):
+    for loop in range(n_loop):
         # encrypt
         aes.set_key(key)
         aes.set_iv(iv)
@@ -265,8 +265,20 @@ def thread_entry():
 
 
 if __name__ == "__main__":
-    n_thread = 20
+    import sys
+
+    if sys.platform == "rp2":
+        n_thread = 1
+        n_loop = 2
+    elif sys.platform in ("esp32", "pyboard"):
+        n_thread = 2
+        n_loop = 2
+    else:
+        n_thread = 20
+        n_loop = 5
     for i in range(n_thread):
-        _thread.start_new_thread(thread_entry, ())
+        _thread.start_new_thread(thread_entry, (n_loop,))
+    thread_entry(n_loop)
     while count.value < n_thread:
         time.sleep(1)
+    print("done")

From d0de16266f92de180bd34f03aa43f1c489cd883a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 9 May 2021 00:08:30 +1000
Subject: [PATCH 090/349] rp2/mpthreadport: Add mp_thread_deinit to reset core1
 on soft reset.

Any code running on core1 should be stopped on soft-reset (the GC heap is
reset so if code continues to run on core1 it will see corrupt memory).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/main.c         | 3 +++
 ports/rp2/mpthreadport.c | 5 +++++
 ports/rp2/mpthreadport.h | 1 +
 3 files changed, 9 insertions(+)

diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 8fddeaa560..7709a478bc 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -138,6 +138,9 @@ int main(int argc, char **argv) {
         mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n");
         rp2_pio_deinit();
         machine_pin_deinit();
+        #if MICROPY_PY_THREAD
+        mp_thread_deinit();
+        #endif
         gc_sweep_all();
         mp_deinit();
     }
diff --git a/ports/rp2/mpthreadport.c b/ports/rp2/mpthreadport.c
index fb4428772a..8a36cfca75 100644
--- a/ports/rp2/mpthreadport.c
+++ b/ports/rp2/mpthreadport.c
@@ -46,6 +46,11 @@ void mp_thread_init(void) {
     core1_entry = NULL;
 }
 
+void mp_thread_deinit(void) {
+    multicore_reset_core1();
+    core1_entry = NULL;
+}
+
 void mp_thread_gc_others(void) {
     if (get_core_num() == 0) {
         // GC running on core0, trace core1's stack, if it's running.
diff --git a/ports/rp2/mpthreadport.h b/ports/rp2/mpthreadport.h
index 5eb0bff396..868f8d1411 100644
--- a/ports/rp2/mpthreadport.h
+++ b/ports/rp2/mpthreadport.h
@@ -34,6 +34,7 @@ typedef struct mutex mp_thread_mutex_t;
 extern void *core_state[2];
 
 void mp_thread_init(void);
+void mp_thread_deinit(void);
 void mp_thread_gc_others(void);
 
 static inline void mp_thread_set_state(struct _mp_state_thread_t *state) {

From b6b39bff47b5ff1ffc322a6e795d57451d4215a8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 4 May 2021 23:56:43 +1000
Subject: [PATCH 091/349] py/gc: Make gc_lock_depth have a count per thread.

This commit makes gc_lock_depth have one counter per thread, instead of one
global counter.  This makes threads properly independent with respect to
the GC, in particular threads can now independently lock the GC for
themselves without locking it for other threads.  It also means a given
thread can run a hard IRQ without temporarily locking the GC for all other
threads and potentially making them have MemoryError exceptions at random
locations (this really only occurs on MCUs with multiple cores and no GIL,
eg on the rp2 port).

The commit also removes protection of the GC lock/unlock functions, which
is no longer needed when the counter is per thread (and this also fixes the
cas where a hard IRQ calling gc_lock() may stall waiting for the mutex).

It also puts the check for `gc_lock_depth > 0` outside the GC mutex in
gc_alloc, gc_realloc and gc_free, to potentially prevent a hard IRQ from
waiting on a mutex if it does attempt to allocate heap memory (and putting
the check outside the GC mutex is now safe now that there is a
gc_lock_depth per thread).

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/utils/pyexec.c                   |  4 +--
 py/gc.c                              | 45 ++++++++++++++--------------
 py/modmicropython.c                  |  4 +--
 py/modthread.c                       |  3 ++
 py/mpstate.h                         |  4 ++-
 tests/thread/thread_heap_lock.py     | 26 ++++++++++++++++
 tests/thread/thread_heap_lock.py.exp |  1 +
 7 files changed, 59 insertions(+), 28 deletions(-)
 create mode 100644 tests/thread/thread_heap_lock.py
 create mode 100644 tests/thread/thread_heap_lock.py.exp

diff --git a/lib/utils/pyexec.c b/lib/utils/pyexec.c
index d1e955d65b..4446b36b61 100644
--- a/lib/utils/pyexec.c
+++ b/lib/utils/pyexec.c
@@ -588,8 +588,8 @@ friendly_repl_reset:
 
         // If the GC is locked at this point there is no way out except a reset,
         // so force the GC to be unlocked to help the user debug what went wrong.
-        if (MP_STATE_MEM(gc_lock_depth) != 0) {
-            MP_STATE_MEM(gc_lock_depth) = 0;
+        if (MP_STATE_THREAD(gc_lock_depth) != 0) {
+            MP_STATE_THREAD(gc_lock_depth) = 0;
         }
 
         vstr_reset(&line);
diff --git a/py/gc.c b/py/gc.c
index 53a0d9da4a..88adf2045e 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -150,7 +150,7 @@ void gc_init(void *start, void *end) {
     MP_STATE_MEM(gc_last_free_atb_index) = 0;
 
     // unlock the GC
-    MP_STATE_MEM(gc_lock_depth) = 0;
+    MP_STATE_THREAD(gc_lock_depth) = 0;
 
     // allow auto collection
     MP_STATE_MEM(gc_auto_collect_enabled) = 1;
@@ -174,19 +174,20 @@ void gc_init(void *start, void *end) {
 }
 
 void gc_lock(void) {
-    GC_ENTER();
-    MP_STATE_MEM(gc_lock_depth)++;
-    GC_EXIT();
+    // This does not need to be atomic or have the GC mutex because:
+    // - each thread has its own gc_lock_depth so there are no races between threads;
+    // - a hard interrupt will only change gc_lock_depth during its execution, and
+    //   upon return will restore the value of gc_lock_depth.
+    MP_STATE_THREAD(gc_lock_depth)++;
 }
 
 void gc_unlock(void) {
-    GC_ENTER();
-    MP_STATE_MEM(gc_lock_depth)--;
-    GC_EXIT();
+    // This does not need to be atomic, See comment above in gc_lock.
+    MP_STATE_THREAD(gc_lock_depth)--;
 }
 
 bool gc_is_locked(void) {
-    return MP_STATE_MEM(gc_lock_depth) != 0;
+    return MP_STATE_THREAD(gc_lock_depth) != 0;
 }
 
 // ptr should be of type void*
@@ -320,7 +321,7 @@ STATIC void gc_sweep(void) {
 
 void gc_collect_start(void) {
     GC_ENTER();
-    MP_STATE_MEM(gc_lock_depth)++;
+    MP_STATE_THREAD(gc_lock_depth)++;
     #if MICROPY_GC_ALLOC_THRESHOLD
     MP_STATE_MEM(gc_alloc_amount) = 0;
     #endif
@@ -360,13 +361,13 @@ void gc_collect_end(void) {
     gc_deal_with_stack_overflow();
     gc_sweep();
     MP_STATE_MEM(gc_last_free_atb_index) = 0;
-    MP_STATE_MEM(gc_lock_depth)--;
+    MP_STATE_THREAD(gc_lock_depth)--;
     GC_EXIT();
 }
 
 void gc_sweep_all(void) {
     GC_ENTER();
-    MP_STATE_MEM(gc_lock_depth)++;
+    MP_STATE_THREAD(gc_lock_depth)++;
     MP_STATE_MEM(gc_stack_overflow) = 0;
     gc_collect_end();
 }
@@ -445,14 +446,13 @@ void *gc_alloc(size_t n_bytes, unsigned int alloc_flags) {
         return NULL;
     }
 
-    GC_ENTER();
-
     // check if GC is locked
-    if (MP_STATE_MEM(gc_lock_depth) > 0) {
-        GC_EXIT();
+    if (MP_STATE_THREAD(gc_lock_depth) > 0) {
         return NULL;
     }
 
+    GC_ENTER();
+
     size_t i;
     size_t end_block;
     size_t start_block;
@@ -573,13 +573,13 @@ void *gc_alloc_with_finaliser(mp_uint_t n_bytes) {
 // force the freeing of a piece of memory
 // TODO: freeing here does not call finaliser
 void gc_free(void *ptr) {
-    GC_ENTER();
-    if (MP_STATE_MEM(gc_lock_depth) > 0) {
+    if (MP_STATE_THREAD(gc_lock_depth) > 0) {
         // TODO how to deal with this error?
-        GC_EXIT();
         return;
     }
 
+    GC_ENTER();
+
     DEBUG_printf("gc_free(%p)\n", ptr);
 
     if (ptr == NULL) {
@@ -674,15 +674,14 @@ void *gc_realloc(void *ptr_in, size_t n_bytes, bool allow_move) {
         return NULL;
     }
 
+    if (MP_STATE_THREAD(gc_lock_depth) > 0) {
+        return NULL;
+    }
+
     void *ptr = ptr_in;
 
     GC_ENTER();
 
-    if (MP_STATE_MEM(gc_lock_depth) > 0) {
-        GC_EXIT();
-        return NULL;
-    }
-
     // get the GC block number corresponding to this pointer
     assert(VERIFY_PTR(ptr));
     size_t block = BLOCK_FROM_PTR(ptr);
diff --git a/py/modmicropython.c b/py/modmicropython.c
index f7eadf79bd..180f7f186c 100644
--- a/py/modmicropython.c
+++ b/py/modmicropython.c
@@ -130,13 +130,13 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_micropython_heap_lock_obj, mp_micropython_he
 
 STATIC mp_obj_t mp_micropython_heap_unlock(void) {
     gc_unlock();
-    return MP_OBJ_NEW_SMALL_INT(MP_STATE_MEM(gc_lock_depth));
+    return MP_OBJ_NEW_SMALL_INT(MP_STATE_THREAD(gc_lock_depth));
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_micropython_heap_unlock_obj, mp_micropython_heap_unlock);
 
 #if MICROPY_PY_MICROPYTHON_HEAP_LOCKED
 STATIC mp_obj_t mp_micropython_heap_locked(void) {
-    return MP_OBJ_NEW_SMALL_INT(MP_STATE_MEM(gc_lock_depth));
+    return MP_OBJ_NEW_SMALL_INT(MP_STATE_THREAD(gc_lock_depth));
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_micropython_heap_locked_obj, mp_micropython_heap_locked);
 #endif
diff --git a/py/modthread.c b/py/modthread.c
index 1306dc642b..64fbb3f198 100644
--- a/py/modthread.c
+++ b/py/modthread.c
@@ -171,6 +171,9 @@ STATIC void *thread_entry(void *args_in) {
     mp_pystack_init(mini_pystack, &mini_pystack[128]);
     #endif
 
+    // The GC starts off unlocked on this thread.
+    ts.gc_lock_depth = 0;
+
     // set locals and globals from the calling context
     mp_locals_set(args->dict_locals);
     mp_globals_set(args->dict_globals);
diff --git a/py/mpstate.h b/py/mpstate.h
index 2519c77e2d..a0e3d4f143 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -80,7 +80,6 @@ typedef struct _mp_state_mem_t {
 
     int gc_stack_overflow;
     MICROPY_GC_STACK_ENTRY_TYPE gc_stack[MICROPY_ALLOC_GC_STACK_SIZE];
-    uint16_t gc_lock_depth;
 
     // This variable controls auto garbage collection.  If set to 0 then the
     // GC won't automatically run when gc_alloc can't find enough blocks.  But
@@ -253,6 +252,9 @@ typedef struct _mp_state_thread_t {
     uint8_t *pystack_cur;
     #endif
 
+    // Locking of the GC is done per thread.
+    uint16_t gc_lock_depth;
+
     ////////////////////////////////////////////////////////////
     // START ROOT POINTER SECTION
     // Everything that needs GC scanning must start here, and
diff --git a/tests/thread/thread_heap_lock.py b/tests/thread/thread_heap_lock.py
new file mode 100644
index 0000000000..2837e0f366
--- /dev/null
+++ b/tests/thread/thread_heap_lock.py
@@ -0,0 +1,26 @@
+# test interaction of micropython.heap_lock with threads
+
+import _thread, micropython
+
+lock1 = _thread.allocate_lock()
+lock2 = _thread.allocate_lock()
+
+
+def thread_entry():
+    lock1.acquire()
+    print([1, 2, 3])
+    lock2.release()
+
+
+lock1.acquire()
+lock2.acquire()
+
+_thread.start_new_thread(thread_entry, ())
+
+micropython.heap_lock()
+lock1.release()
+lock2.acquire()
+micropython.heap_unlock()
+
+lock1.release()
+lock2.release()
diff --git a/tests/thread/thread_heap_lock.py.exp b/tests/thread/thread_heap_lock.py.exp
new file mode 100644
index 0000000000..b5d8bb58d9
--- /dev/null
+++ b/tests/thread/thread_heap_lock.py.exp
@@ -0,0 +1 @@
+[1, 2, 3]

From 4cdcbdb7531b98b2dc9a85737b760f509957e31e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 10 May 2021 12:44:47 +1000
Subject: [PATCH 092/349] tests/thread: Make exc1,exit1,exit2,stacksize1,start1
 tests run on rp2.

The RP2040 has 2 cores and supports running at most 2 Python threads (the
main one plus another), and will raise OSError if a thread cannot be
created because core1 is already in use.  This commit adjusts some thread
tests to be robust against such OSError's.  These tests now pass on rp2
boards.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/thread/thread_exc1.py       | 7 ++++++-
 tests/thread/thread_exit1.py      | 9 +++++++--
 tests/thread/thread_exit2.py      | 9 +++++++--
 tests/thread/thread_stacksize1.py | 7 ++++++-
 tests/thread/thread_start1.py     | 9 +++++++--
 5 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/tests/thread/thread_exc1.py b/tests/thread/thread_exc1.py
index 16483d7778..cd87740929 100644
--- a/tests/thread/thread_exc1.py
+++ b/tests/thread/thread_exc1.py
@@ -25,7 +25,12 @@ n_finished = 0
 
 # spawn threads
 for i in range(n_thread):
-    _thread.start_new_thread(thread_entry, ())
+    while True:
+        try:
+            _thread.start_new_thread(thread_entry, ())
+            break
+        except OSError:
+            pass
 
 # busy wait for threads to finish
 while n_finished < n_thread:
diff --git a/tests/thread/thread_exit1.py b/tests/thread/thread_exit1.py
index c4a93c45a3..186a9be340 100644
--- a/tests/thread/thread_exit1.py
+++ b/tests/thread/thread_exit1.py
@@ -13,8 +13,13 @@ def thread_entry():
     _thread.exit()
 
 
-_thread.start_new_thread(thread_entry, ())
-_thread.start_new_thread(thread_entry, ())
+for i in range(2):
+    while True:
+        try:
+            _thread.start_new_thread(thread_entry, ())
+            break
+        except OSError:
+            pass
 
 # wait for threads to finish
 time.sleep(1)
diff --git a/tests/thread/thread_exit2.py b/tests/thread/thread_exit2.py
index 0cd80e6909..5be7945db2 100644
--- a/tests/thread/thread_exit2.py
+++ b/tests/thread/thread_exit2.py
@@ -13,8 +13,13 @@ def thread_entry():
     raise SystemExit
 
 
-_thread.start_new_thread(thread_entry, ())
-_thread.start_new_thread(thread_entry, ())
+for i in range(2):
+    while True:
+        try:
+            _thread.start_new_thread(thread_entry, ())
+            break
+        except OSError:
+            pass
 
 # wait for threads to finish
 time.sleep(1)
diff --git a/tests/thread/thread_stacksize1.py b/tests/thread/thread_stacksize1.py
index 5d25509b76..cf46b73b77 100644
--- a/tests/thread/thread_stacksize1.py
+++ b/tests/thread/thread_stacksize1.py
@@ -41,7 +41,12 @@ n_finished = 0
 # set stack size and spawn a few threads
 _thread.stack_size(sz)
 for i in range(n_thread):
-    _thread.start_new_thread(thread_entry, ())
+    while True:
+        try:
+            _thread.start_new_thread(thread_entry, ())
+            break
+        except OSError:
+            pass
 
 # reset stack size to default (for subsequent scripts on baremetal)
 _thread.stack_size()
diff --git a/tests/thread/thread_start1.py b/tests/thread/thread_start1.py
index f0e696840e..7274633245 100644
--- a/tests/thread/thread_start1.py
+++ b/tests/thread/thread_start1.py
@@ -18,8 +18,13 @@ def thread_entry(n):
         foo()
 
 
-_thread.start_new_thread(thread_entry, (10,))
-_thread.start_new_thread(thread_entry, (20,))
+for i in range(2):
+    while True:
+        try:
+            _thread.start_new_thread(thread_entry, ((i + 1) * 10,))
+            break
+        except OSError:
+            pass
 
 # wait for threads to finish
 time.sleep(1)

From 5093d49fae5b59d6440d34b4c05f2950f40a6b9f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 May 2021 10:58:12 +1000
Subject: [PATCH 093/349] esp32: Extend support for S2 series, and S3 where
 applicable.

Improvements made:
- PSRAM support for S2
- partition definition for 16MiB flash
- correct ADC and DAC pins
- correct GPIO and IRQ pins
- S3 components in CMakeLists

Based on original commit made by Seon Rozenblum aka @UnexpectedMaker.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/sdkconfig.spiram_sx |  11 +++
 ports/esp32/machine_adc.c              |  17 +++-
 ports/esp32/machine_pin.c              | 131 ++++++++++++++++++++++---
 ports/esp32/machine_touchpad.c         |  23 +++++
 ports/esp32/main.c                     |  14 +++
 ports/esp32/main/CMakeLists.txt        |   3 +
 ports/esp32/modmachine.c               |   3 +
 ports/esp32/mphalport.c                |   7 ++
 ports/esp32/partitions-16MiB.csv       |   8 ++
 9 files changed, 201 insertions(+), 16 deletions(-)
 create mode 100644 ports/esp32/boards/sdkconfig.spiram_sx
 create mode 100644 ports/esp32/partitions-16MiB.csv

diff --git a/ports/esp32/boards/sdkconfig.spiram_sx b/ports/esp32/boards/sdkconfig.spiram_sx
new file mode 100644
index 0000000000..18a0712cbf
--- /dev/null
+++ b/ports/esp32/boards/sdkconfig.spiram_sx
@@ -0,0 +1,11 @@
+# MicroPython on ESP32-S2 and ESP32-PAD1_subscript_3, ESP IDF configuration with SPIRAM support
+CONFIG_ESP32S2_SPIRAM_SUPPORT=y
+CONFIG_SPIRAM_TYPE_AUTO=y
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+CONFIG_DEFAULT_PSRAM_CS_IO=26
+CONFIG_SPIRAM_SPEED_80M=y
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+CONFIG_SPIRAM_IGNORE_NOTFOUND=y
+CONFIG_SPIRAM_USE_MEMMAP=y
+CONFIG_SPIRAM_MEMTEST=y
diff --git a/ports/esp32/machine_adc.c b/ports/esp32/machine_adc.c
index 4c19d5992b..739d47da50 100644
--- a/ports/esp32/machine_adc.c
+++ b/ports/esp32/machine_adc.c
@@ -43,6 +43,7 @@ typedef struct _madc_obj_t {
 } madc_obj_t;
 
 STATIC const madc_obj_t madc_obj[] = {
+    #if CONFIG_IDF_TARGET_ESP32
     {{&machine_adc_type}, GPIO_NUM_36, ADC1_CHANNEL_0},
     {{&machine_adc_type}, GPIO_NUM_37, ADC1_CHANNEL_1},
     {{&machine_adc_type}, GPIO_NUM_38, ADC1_CHANNEL_2},
@@ -51,6 +52,18 @@ STATIC const madc_obj_t madc_obj[] = {
     {{&machine_adc_type}, GPIO_NUM_33, ADC1_CHANNEL_5},
     {{&machine_adc_type}, GPIO_NUM_34, ADC1_CHANNEL_6},
     {{&machine_adc_type}, GPIO_NUM_35, ADC1_CHANNEL_7},
+    #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+    {{&machine_adc_type}, GPIO_NUM_1, ADC1_CHANNEL_0},
+    {{&machine_adc_type}, GPIO_NUM_2, ADC1_CHANNEL_1},
+    {{&machine_adc_type}, GPIO_NUM_3, ADC1_CHANNEL_2},
+    {{&machine_adc_type}, GPIO_NUM_4, ADC1_CHANNEL_3},
+    {{&machine_adc_type}, GPIO_NUM_5, ADC1_CHANNEL_4},
+    {{&machine_adc_type}, GPIO_NUM_6, ADC1_CHANNEL_5},
+    {{&machine_adc_type}, GPIO_NUM_7, ADC1_CHANNEL_6},
+    {{&machine_adc_type}, GPIO_NUM_8, ADC1_CHANNEL_7},
+    {{&machine_adc_type}, GPIO_NUM_9, ADC1_CHANNEL_8},
+    {{&machine_adc_type}, GPIO_NUM_10, ADC1_CHANNEL_9},
+    #endif
 };
 
 STATIC uint8_t adc_bit_width;
@@ -145,7 +158,7 @@ STATIC mp_obj_t madc_width(mp_obj_t cls_in, mp_obj_t width_in) {
         case ADC_WIDTH_12Bit:
             adc_bit_width = 12;
             break;
-        #elif CONFIG_IDF_TARGET_ESP32S2
+        #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
         case ADC_WIDTH_BIT_13:
             adc_bit_width = 13;
             break;
@@ -175,7 +188,7 @@ STATIC const mp_rom_map_elem_t madc_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_WIDTH_10BIT), MP_ROM_INT(ADC_WIDTH_10Bit) },
     { MP_ROM_QSTR(MP_QSTR_WIDTH_11BIT), MP_ROM_INT(ADC_WIDTH_11Bit) },
     { MP_ROM_QSTR(MP_QSTR_WIDTH_12BIT), MP_ROM_INT(ADC_WIDTH_12Bit) },
-    #elif CONFIG_IDF_TARGET_ESP32S2
+    #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
     { MP_ROM_QSTR(MP_QSTR_WIDTH_13BIT), MP_ROM_INT(ADC_WIDTH_BIT_13) },
     #endif
 };
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index 8dbdd19849..bd623d0413 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -56,6 +56,8 @@ typedef struct _machine_pin_irq_obj_t {
 } machine_pin_irq_obj_t;
 
 STATIC const machine_pin_obj_t machine_pin_obj[] = {
+    #if CONFIG_IDF_TARGET_ESP32
+
     {{&machine_pin_type}, GPIO_NUM_0},
     {{&machine_pin_type}, GPIO_NUM_1},
     {{&machine_pin_type}, GPIO_NUM_2},
@@ -78,17 +80,10 @@ STATIC const machine_pin_obj_t machine_pin_obj[] = {
     {{&machine_pin_type}, GPIO_NUM_19},
     {{NULL}, -1},
     {{&machine_pin_type}, GPIO_NUM_21},
-    #if CONFIG_IDF_TARGET_ESP32
     {{&machine_pin_type}, GPIO_NUM_22},
     {{&machine_pin_type}, GPIO_NUM_23},
     {{NULL}, -1},
     {{&machine_pin_type}, GPIO_NUM_25},
-    #else
-    {{NULL}, -1},
-    {{NULL}, -1},
-    {{NULL}, -1},
-    {{NULL}, -1},
-    #endif
     {{&machine_pin_type}, GPIO_NUM_26},
     {{&machine_pin_type}, GPIO_NUM_27},
     {{NULL}, -1},
@@ -103,6 +98,63 @@ STATIC const machine_pin_obj_t machine_pin_obj[] = {
     {{&machine_pin_type}, GPIO_NUM_37},
     {{&machine_pin_type}, GPIO_NUM_38},
     {{&machine_pin_type}, GPIO_NUM_39},
+
+    #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+
+    {{&machine_pin_type}, GPIO_NUM_0},
+    {{&machine_pin_type}, GPIO_NUM_1},
+    {{&machine_pin_type}, GPIO_NUM_2},
+    {{&machine_pin_type}, GPIO_NUM_3},
+    {{&machine_pin_type}, GPIO_NUM_4},
+    {{&machine_pin_type}, GPIO_NUM_5},
+    {{&machine_pin_type}, GPIO_NUM_6},
+    {{&machine_pin_type}, GPIO_NUM_7},
+    {{&machine_pin_type}, GPIO_NUM_8},
+    {{&machine_pin_type}, GPIO_NUM_9},
+    {{&machine_pin_type}, GPIO_NUM_10},
+    {{&machine_pin_type}, GPIO_NUM_11},
+    {{&machine_pin_type}, GPIO_NUM_12},
+    {{&machine_pin_type}, GPIO_NUM_13},
+    {{&machine_pin_type}, GPIO_NUM_14},
+    {{&machine_pin_type}, GPIO_NUM_15},
+    {{&machine_pin_type}, GPIO_NUM_16},
+    {{&machine_pin_type}, GPIO_NUM_17},
+    {{&machine_pin_type}, GPIO_NUM_18},
+    #if CONFIG_USB_CDC_ENABLED
+    {{NULL}, -1}, // 19 is for native USB D-
+    {{NULL}, -1}, // 20 is for native USB D-
+    #else
+    {{&machine_pin_type}, GPIO_NUM_19},
+    {{&machine_pin_type}, GPIO_NUM_20},
+    #endif
+    {{&machine_pin_type}, GPIO_NUM_21},
+    {{NULL}, -1}, // 22 not a pin
+    {{NULL}, -1}, // 23 not a pin
+    {{NULL}, -1}, // 24 not a pin
+    {{NULL}, -1}, // 25 not a pin
+    {{NULL}, -1}, // 26 FLASH/PSRAM
+    {{NULL}, -1}, // 27 FLASH/PSRAM
+    {{NULL}, -1}, // 28 FLASH/PSRAM
+    {{NULL}, -1}, // 29 FLASH/PSRAM
+    {{NULL}, -1}, // 30 FLASH/PSRAM
+    {{NULL}, -1}, // 31 FLASH/PSRAM
+    {{NULL}, -1}, // 32 FLASH/PSRAM
+    {{&machine_pin_type}, GPIO_NUM_33},
+    {{&machine_pin_type}, GPIO_NUM_34},
+    {{&machine_pin_type}, GPIO_NUM_35},
+    {{&machine_pin_type}, GPIO_NUM_36},
+    {{&machine_pin_type}, GPIO_NUM_37},
+    {{&machine_pin_type}, GPIO_NUM_38},
+    {{&machine_pin_type}, GPIO_NUM_39}, // MTCLK
+    {{&machine_pin_type}, GPIO_NUM_40}, // MTDO
+    {{&machine_pin_type}, GPIO_NUM_41}, // MTDI
+    {{&machine_pin_type}, GPIO_NUM_42}, // MTMS
+    {{&machine_pin_type}, GPIO_NUM_43}, // U0TXD
+    {{&machine_pin_type}, GPIO_NUM_44}, // U0RXD
+    {{&machine_pin_type}, GPIO_NUM_45},
+    {{&machine_pin_type}, GPIO_NUM_46},
+
+    #endif
 };
 
 // forward declaration
@@ -399,6 +451,8 @@ const mp_obj_type_t machine_pin_type = {
 STATIC const mp_obj_type_t machine_pin_irq_type;
 
 STATIC const machine_pin_irq_obj_t machine_pin_irq_object[] = {
+    #if CONFIG_IDF_TARGET_ESP32
+
     {{&machine_pin_irq_type}, GPIO_NUM_0},
     {{&machine_pin_irq_type}, GPIO_NUM_1},
     {{&machine_pin_irq_type}, GPIO_NUM_2},
@@ -421,17 +475,10 @@ STATIC const machine_pin_irq_obj_t machine_pin_irq_object[] = {
     {{&machine_pin_irq_type}, GPIO_NUM_19},
     {{NULL}, -1},
     {{&machine_pin_irq_type}, GPIO_NUM_21},
-    #if CONFIG_IDF_TARGET_ESP32
     {{&machine_pin_irq_type}, GPIO_NUM_22},
     {{&machine_pin_irq_type}, GPIO_NUM_23},
     {{NULL}, -1},
     {{&machine_pin_irq_type}, GPIO_NUM_25},
-    #else
-    {{NULL}, -1},
-    {{NULL}, -1},
-    {{NULL}, -1},
-    {{NULL}, -1},
-    #endif
     {{&machine_pin_irq_type}, GPIO_NUM_26},
     {{&machine_pin_irq_type}, GPIO_NUM_27},
     {{NULL}, -1},
@@ -446,6 +493,62 @@ STATIC const machine_pin_irq_obj_t machine_pin_irq_object[] = {
     {{&machine_pin_irq_type}, GPIO_NUM_37},
     {{&machine_pin_irq_type}, GPIO_NUM_38},
     {{&machine_pin_irq_type}, GPIO_NUM_39},
+
+    #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+
+    {{&machine_pin_irq_type}, GPIO_NUM_0},
+    {{&machine_pin_irq_type}, GPIO_NUM_1},
+    {{&machine_pin_irq_type}, GPIO_NUM_2},
+    {{&machine_pin_irq_type}, GPIO_NUM_3},
+    {{&machine_pin_irq_type}, GPIO_NUM_4},
+    {{&machine_pin_irq_type}, GPIO_NUM_5},
+    {{&machine_pin_irq_type}, GPIO_NUM_6},
+    {{&machine_pin_irq_type}, GPIO_NUM_7},
+    {{&machine_pin_irq_type}, GPIO_NUM_8},
+    {{&machine_pin_irq_type}, GPIO_NUM_9},
+    {{&machine_pin_irq_type}, GPIO_NUM_10},
+    {{&machine_pin_irq_type}, GPIO_NUM_11},
+    {{&machine_pin_irq_type}, GPIO_NUM_12},
+    {{&machine_pin_irq_type}, GPIO_NUM_13},
+    {{&machine_pin_irq_type}, GPIO_NUM_14},
+    {{&machine_pin_irq_type}, GPIO_NUM_15},
+    {{&machine_pin_irq_type}, GPIO_NUM_16},
+    {{&machine_pin_irq_type}, GPIO_NUM_17},
+    {{&machine_pin_irq_type}, GPIO_NUM_18},
+    #if CONFIG_USB_CDC_ENABLED
+    {{NULL}, -1}, // 19 is for native USB D-
+    {{NULL}, -1}, // 20 is for native USB D-
+    #else
+    {{&machine_pin_irq_type}, GPIO_NUM_19},
+    {{&machine_pin_irq_type}, GPIO_NUM_20},
+    #endif
+    {{&machine_pin_irq_type}, GPIO_NUM_21},
+    {{NULL}, -1}, // 22 not a pin
+    {{NULL}, -1}, // 23 not a pin
+    {{NULL}, -1}, // 24 not a pin
+    {{NULL}, -1}, // 25 not a pin
+    {{NULL}, -1}, // 26 FLASH/PSRAM
+    {{NULL}, -1}, // 27 FLASH/PSRAM
+    {{NULL}, -1}, // 28 FLASH/PSRAM
+    {{NULL}, -1}, // 29 FLASH/PSRAM
+    {{NULL}, -1}, // 30 FLASH/PSRAM
+    {{NULL}, -1}, // 31 FLASH/PSRAM
+    {{NULL}, -1}, // 32 FLASH/PSRAM
+    {{&machine_pin_irq_type}, GPIO_NUM_33},
+    {{&machine_pin_irq_type}, GPIO_NUM_34},
+    {{&machine_pin_irq_type}, GPIO_NUM_35},
+    {{&machine_pin_irq_type}, GPIO_NUM_36},
+    {{&machine_pin_irq_type}, GPIO_NUM_37},
+    {{&machine_pin_irq_type}, GPIO_NUM_38},
+    {{&machine_pin_irq_type}, GPIO_NUM_39},
+    {{&machine_pin_irq_type}, GPIO_NUM_40},
+    {{&machine_pin_irq_type}, GPIO_NUM_41},
+    {{&machine_pin_irq_type}, GPIO_NUM_42},
+    {{&machine_pin_irq_type}, GPIO_NUM_43},
+    {{&machine_pin_irq_type}, GPIO_NUM_44},
+    {{&machine_pin_irq_type}, GPIO_NUM_45},
+
+    #endif
 };
 
 STATIC mp_obj_t machine_pin_irq_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
diff --git a/ports/esp32/machine_touchpad.c b/ports/esp32/machine_touchpad.c
index 335157b154..168ac16d0e 100644
--- a/ports/esp32/machine_touchpad.c
+++ b/ports/esp32/machine_touchpad.c
@@ -31,7 +31,11 @@
 #if CONFIG_IDF_TARGET_ESP32
 
 #include "driver/gpio.h"
+#if CONFIG_IDF_TARGET_ESP32
 #include "driver/touch_pad.h"
+#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+#include "driver/touch_sensor.h"
+#endif
 
 typedef struct _mtp_obj_t {
     mp_obj_base_t base;
@@ -39,6 +43,7 @@ typedef struct _mtp_obj_t {
     touch_pad_t touchpad_id;
 } mtp_obj_t;
 
+#if CONFIG_IDF_TARGET_ESP32
 STATIC const mtp_obj_t touchpad_obj[] = {
     {{&machine_touchpad_type}, GPIO_NUM_4, TOUCH_PAD_NUM0},
     {{&machine_touchpad_type}, GPIO_NUM_0, TOUCH_PAD_NUM1},
@@ -51,6 +56,24 @@ STATIC const mtp_obj_t touchpad_obj[] = {
     {{&machine_touchpad_type}, GPIO_NUM_33, TOUCH_PAD_NUM8},
     {{&machine_touchpad_type}, GPIO_NUM_32, TOUCH_PAD_NUM9},
 };
+#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+STATIC const mtp_obj_t touchpad_obj[] = {
+    {{&machine_touchpad_type}, GPIO_NUM_1, TOUCH_PAD_NUM1},
+    {{&machine_touchpad_type}, GPIO_NUM_2, TOUCH_PAD_NUM2},
+    {{&machine_touchpad_type}, GPIO_NUM_3, TOUCH_PAD_NUM3},
+    {{&machine_touchpad_type}, GPIO_NUM_4, TOUCH_PAD_NUM4},
+    {{&machine_touchpad_type}, GPIO_NUM_5, TOUCH_PAD_NUM5},
+    {{&machine_touchpad_type}, GPIO_NUM_6, TOUCH_PAD_NUM6},
+    {{&machine_touchpad_type}, GPIO_NUM_7, TOUCH_PAD_NUM7},
+    {{&machine_touchpad_type}, GPIO_NUM_8, TOUCH_PAD_NUM8},
+    {{&machine_touchpad_type}, GPIO_NUM_9, TOUCH_PAD_NUM9},
+    {{&machine_touchpad_type}, GPIO_NUM_10, TOUCH_PAD_NUM10},
+    {{&machine_touchpad_type}, GPIO_NUM_11, TOUCH_PAD_NUM11},
+    {{&machine_touchpad_type}, GPIO_NUM_12, TOUCH_PAD_NUM12},
+    {{&machine_touchpad_type}, GPIO_NUM_13, TOUCH_PAD_NUM13},
+    {{&machine_touchpad_type}, GPIO_NUM_14, TOUCH_PAD_NUM14},
+};
+#endif
 
 STATIC mp_obj_t mtp_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
     const mp_obj_t *args) {
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 7ca3d84140..ff6dd69574 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -42,6 +42,8 @@
 #include "esp32/spiram.h"
 #elif CONFIG_IDF_TARGET_ESP32S2
 #include "esp32s2/spiram.h"
+#elif CONFIG_IDF_TARGET_ESP32S3
+#include "esp32s3/spiram.h"
 #endif
 
 #include "py/stackctrl.h"
@@ -104,6 +106,18 @@ void mp_task(void *pvParameter) {
             mp_task_heap = malloc(mp_task_heap_size);
             break;
     }
+    #elif CONFIG_ESP32S2_SPIRAM_SUPPORT || CONFIG_ESP32S3_SPIRAM_SUPPORT
+    // Try to use the entire external SPIRAM directly for the heap
+    size_t mp_task_heap_size;
+    size_t esp_spiram_size = esp_spiram_get_size();
+    void *mp_task_heap = (void *)0x3ff80000 - esp_spiram_size;
+    if (esp_spiram_size > 0) {
+        mp_task_heap_size = esp_spiram_size;
+    } else {
+        // No SPIRAM, fallback to normal allocation
+        mp_task_heap_size = heap_caps_get_largest_free_block(MALLOC_CAP_8BIT);
+        mp_task_heap = malloc(mp_task_heap_size);
+    }
     #else
     // Allocate the uPy heap using malloc and get the largest available region
     size_t mp_task_heap_size = heap_caps_get_largest_free_block(MALLOC_CAP_8BIT);
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index 656045da90..1cc30b71ec 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -128,6 +128,9 @@ if(IDF_TARGET STREQUAL "esp32")
 elseif(IDF_TARGET STREQUAL "esp32s2")
     list(APPEND IDF_COMPONENTS esp32s2)
     list(APPEND IDF_COMPONENTS tinyusb)
+elseif(IDF_TARGET STREQUAL "esp32s3")
+    list(APPEND IDF_COMPONENTS esp32s3)
+    list(APPEND IDF_COMPONENTS tinyusb)
 endif()
 
 # Register the main IDF component.
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index 2eb5cd2fee..bbe7fae033 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -42,6 +42,9 @@
 #elif CONFIG_IDF_TARGET_ESP32S2
 #include "esp32s2/rom/rtc.h"
 #include "esp32s2/clk.h"
+#elif CONFIG_IDF_TARGET_ESP32S3
+#include "esp32s3/rom/rtc.h"
+#include "esp32s3/clk.h"
 #endif
 
 #include "py/obj.h"
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index cf668216df..a0bafb755e 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -32,7 +32,14 @@
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
+
+#if CONFIG_IDF_TARGET_ESP32
 #include "esp32/rom/uart.h"
+#elif CONFIG_IDF_TARGET_ESP32S2
+#include "esp32s2/rom/uart.h"
+#elif CONFIG_IDF_TARGET_ESP32S3
+#include "esp32s3/rom/uart.h"
+#endif
 
 #include "py/obj.h"
 #include "py/objstr.h"
diff --git a/ports/esp32/partitions-16MiB.csv b/ports/esp32/partitions-16MiB.csv
new file mode 100644
index 0000000000..5133185c78
--- /dev/null
+++ b/ports/esp32/partitions-16MiB.csv
@@ -0,0 +1,8 @@
+# Notes: the offset of the partition table itself is set in
+# $ESPIDF/components/partition_table/Kconfig.projbuild and the
+# offset of the factory/ota_0 partition is set in makeimg.py
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x6000,
+phy_init, data, phy,     0xf000,  0x1000,
+factory,  app,  factory, 0x10000, 0x180000,
+vfs,      data, fat,     0x200000, 0xD59F80,

From 32ec07a3504d6dcbfc53997197a3c53e8c03497f Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Fri, 19 Mar 2021 18:48:34 +1100
Subject: [PATCH 094/349] esp32/boards: Rename TINYPICO board to UM_TINYPICO.

And add default hardware SPI 0 pins in mpconfigboard.h, and
CONFIG_LWIP_LOCAL_HOSTNAME in sdkconfig.board.
---
 ports/esp32/boards/TINYPICO/mpconfigboard.h                 | 2 --
 ports/esp32/boards/{TINYPICO => UM_TINYPICO}/manifest.py    | 0
 .../boards/{TINYPICO => UM_TINYPICO}/modules/dotstar.py     | 0
 .../boards/{TINYPICO => UM_TINYPICO}/modules/tinypico.py    | 0
 .../boards/{TINYPICO => UM_TINYPICO}/mpconfigboard.cmake    | 0
 ports/esp32/boards/UM_TINYPICO/mpconfigboard.h              | 6 ++++++
 .../esp32/boards/{TINYPICO => UM_TINYPICO}/sdkconfig.board  | 1 +
 7 files changed, 7 insertions(+), 2 deletions(-)
 delete mode 100644 ports/esp32/boards/TINYPICO/mpconfigboard.h
 rename ports/esp32/boards/{TINYPICO => UM_TINYPICO}/manifest.py (100%)
 rename ports/esp32/boards/{TINYPICO => UM_TINYPICO}/modules/dotstar.py (100%)
 rename ports/esp32/boards/{TINYPICO => UM_TINYPICO}/modules/tinypico.py (100%)
 rename ports/esp32/boards/{TINYPICO => UM_TINYPICO}/mpconfigboard.cmake (100%)
 create mode 100644 ports/esp32/boards/UM_TINYPICO/mpconfigboard.h
 rename ports/esp32/boards/{TINYPICO => UM_TINYPICO}/sdkconfig.board (72%)

diff --git a/ports/esp32/boards/TINYPICO/mpconfigboard.h b/ports/esp32/boards/TINYPICO/mpconfigboard.h
deleted file mode 100644
index e63f43ed25..0000000000
--- a/ports/esp32/boards/TINYPICO/mpconfigboard.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define MICROPY_HW_BOARD_NAME "TinyPICO"
-#define MICROPY_HW_MCU_NAME "ESP32-PICO-D4"
diff --git a/ports/esp32/boards/TINYPICO/manifest.py b/ports/esp32/boards/UM_TINYPICO/manifest.py
similarity index 100%
rename from ports/esp32/boards/TINYPICO/manifest.py
rename to ports/esp32/boards/UM_TINYPICO/manifest.py
diff --git a/ports/esp32/boards/TINYPICO/modules/dotstar.py b/ports/esp32/boards/UM_TINYPICO/modules/dotstar.py
similarity index 100%
rename from ports/esp32/boards/TINYPICO/modules/dotstar.py
rename to ports/esp32/boards/UM_TINYPICO/modules/dotstar.py
diff --git a/ports/esp32/boards/TINYPICO/modules/tinypico.py b/ports/esp32/boards/UM_TINYPICO/modules/tinypico.py
similarity index 100%
rename from ports/esp32/boards/TINYPICO/modules/tinypico.py
rename to ports/esp32/boards/UM_TINYPICO/modules/tinypico.py
diff --git a/ports/esp32/boards/TINYPICO/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake
similarity index 100%
rename from ports/esp32/boards/TINYPICO/mpconfigboard.cmake
rename to ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake
diff --git a/ports/esp32/boards/UM_TINYPICO/mpconfigboard.h b/ports/esp32/boards/UM_TINYPICO/mpconfigboard.h
new file mode 100644
index 0000000000..05ee5eaf72
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYPICO/mpconfigboard.h
@@ -0,0 +1,6 @@
+#define MICROPY_HW_BOARD_NAME "TinyPICO"
+#define MICROPY_HW_MCU_NAME "ESP32-PICO-D4"
+
+#define MICROPY_HW_SPI1_SCK (18)
+#define MICROPY_HW_SPI1_MOSI (23)
+#define MICROPY_HW_SPI1_MISO (19)
diff --git a/ports/esp32/boards/TINYPICO/sdkconfig.board b/ports/esp32/boards/UM_TINYPICO/sdkconfig.board
similarity index 72%
rename from ports/esp32/boards/TINYPICO/sdkconfig.board
rename to ports/esp32/boards/UM_TINYPICO/sdkconfig.board
index dc2c23f674..766419c7f8 100644
--- a/ports/esp32/boards/TINYPICO/sdkconfig.board
+++ b/ports/esp32/boards/UM_TINYPICO/sdkconfig.board
@@ -2,3 +2,4 @@ CONFIG_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_SPIRAM_SPEED_80M=y
 CONFIG_ESP32_REV_MIN_1=y
+CONFIG_LWIP_LOCAL_HOSTNAME="UMTinyPICO"

From 0e87459e2bfd073a084fe4af00c2f75d4c815639 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 May 2021 11:08:00 +1000
Subject: [PATCH 095/349] esp32/boards: Add UM_FEATHERS2 and UM_TINYS2 board
 definitions.

Based on original commit made by Seon Rozenblum aka @UnexpectedMaker.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/UM_FEATHERS2/manifest.py   |   3 +
 .../boards/UM_FEATHERS2/modules/feathers2.py  | 101 ++++++++++++++++++
 .../boards/UM_FEATHERS2/mpconfigboard.cmake   |   9 ++
 .../esp32/boards/UM_FEATHERS2/mpconfigboard.h |   5 +
 .../esp32/boards/UM_FEATHERS2/sdkconfig.board |  16 +++
 ports/esp32/boards/UM_TINYS2/manifest.py      |   2 +
 .../esp32/boards/UM_TINYS2/modules/tinys2.py  |  82 ++++++++++++++
 .../boards/UM_TINYS2/mpconfigboard.cmake      |   8 ++
 ports/esp32/boards/UM_TINYS2/mpconfigboard.h  |   9 ++
 ports/esp32/boards/UM_TINYS2/sdkconfig.board  |   6 ++
 10 files changed, 241 insertions(+)
 create mode 100644 ports/esp32/boards/UM_FEATHERS2/manifest.py
 create mode 100644 ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py
 create mode 100644 ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h
 create mode 100644 ports/esp32/boards/UM_FEATHERS2/sdkconfig.board
 create mode 100644 ports/esp32/boards/UM_TINYS2/manifest.py
 create mode 100644 ports/esp32/boards/UM_TINYS2/modules/tinys2.py
 create mode 100644 ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/UM_TINYS2/mpconfigboard.h
 create mode 100644 ports/esp32/boards/UM_TINYS2/sdkconfig.board

diff --git a/ports/esp32/boards/UM_FEATHERS2/manifest.py b/ports/esp32/boards/UM_FEATHERS2/manifest.py
new file mode 100644
index 0000000000..82ad0c7e49
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS2/manifest.py
@@ -0,0 +1,3 @@
+include("$(PORT_DIR)/boards/manifest.py")
+freeze("$(PORT_DIR)/boards/UM_TINYPICO/modules", "dotstar.py")
+freeze("modules")
diff --git a/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py b/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py
new file mode 100644
index 0000000000..32126fc9c9
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py
@@ -0,0 +1,101 @@
+# FeatherS2 MicroPython Helper Library
+# 2021 Seon Rozenblum - Unexpected Maker
+#
+# Project home:
+#   https://feathers2.io
+#
+# 2021-Mar-21 - v0.1 - Initial implementation
+
+# Import required libraries
+from micropython import const
+from machine import Pin, SPI, ADC
+import machine, time
+
+# FeatherS2 Hardware Pin Assignments
+
+# LDO
+LDO2 = const(21)
+
+# APA102 Dotstar pins
+DOTSTAR_CLK = const(45)
+DOTSTAR_DATA = const(40)
+
+# SPI
+SPI_MOSI = const(35)
+SPI_MISO = const(36)
+SPI_CLK = const(37)
+
+# I2C
+I2C_SDA = const(38)
+I2C_SCL = const(33)
+
+# DAC
+DAC1 = const(17)
+DAC2 = const(18)
+
+# LED & Ambient Light Sensor
+LED = const(13)
+AMB_LIGHT = const(4)
+
+# Helper functions
+
+# LED & Ambient Light Sensor control
+def set_led(state):
+    l = Pin(LED, Pin.OUT)
+    l.value(state)
+
+
+def toggle_led(state):
+    l = Pin(LED, Pin.OUT)
+    l.value(not l.value())
+
+
+# Create ADC and set attenuation and return teh ambient light value from the onboard sensor
+def get_amb_light():
+    adc = ADC(Pin(AMB_LIGHT))
+    adc.atten(ADC.ATTN_11DB)
+    return adc.read()
+
+
+# LDO2 power control
+# When we manually turn off the second LDO we also set the DotStar DATA and CLK pins to input to
+# prevent parasitic power from lighting the LED even with the LDO off, causing current use.
+# The DotStar is a beautiful LED, but parasitic power makes it a terrible choice for battery use :(
+def set_ldo2_power(state):
+    """Set the power for the on-board Dostar to allow no current draw when not needed."""
+    # Set the power pin to the inverse of state
+    ldo2 = Pin(LDO2, Pin.OUT)
+    ldo2.value(state)
+
+    if state:
+        Pin(DOTSTAR_CLK, Pin.OUT)
+        Pin(DOTSTAR_DATA, Pin.OUT)  # If power is on, set CLK to be output, otherwise input
+    else:
+        Pin(DOTSTAR_CLK, Pin.IN)
+        Pin(DOTSTAR_DATA, Pin.IN)  # If power is on, set CLK to be output, otherwise input
+
+    # A small delay to let the IO change state
+    time.sleep(0.035)
+
+
+# Dotstar rainbow colour wheel
+def dotstar_color_wheel(wheel_pos):
+    """Color wheel to allow for cycling through the rainbow of RGB colors."""
+    wheel_pos = wheel_pos % 255
+
+    if wheel_pos < 85:
+        return 255 - wheel_pos * 3, 0, wheel_pos * 3
+    elif wheel_pos < 170:
+        wheel_pos -= 85
+        return 0, wheel_pos * 3, 255 - wheel_pos * 3
+    else:
+        wheel_pos -= 170
+        return wheel_pos * 3, 255 - wheel_pos * 3, 0
+
+
+# Go into deep sleep but shut down the APA first to save power
+# Use this if you want lowest deep  sleep current
+def go_deepsleep(t):
+    """Deep sleep helper that also powers down the on-board Dotstar."""
+    set_ldo2_power(False)
+    machine.deepsleep(t)
diff --git a/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake b/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake
new file mode 100644
index 0000000000..5e570d513b
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake
@@ -0,0 +1,9 @@
+set(IDF_TARGET esp32s2)
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.spiram_sx
+    boards/sdkconfig.usb
+    boards/UM_FEATHERS2/sdkconfig.board
+)
+
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
\ No newline at end of file
diff --git a/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h b/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h
new file mode 100644
index 0000000000..c045adccd9
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h
@@ -0,0 +1,5 @@
+#define MICROPY_HW_BOARD_NAME "FeatherS2"
+#define MICROPY_HW_MCU_NAME "ESP32-S2"
+
+#define MICROPY_PY_BLUETOOTH                (0)
+#define MICROPY_HW_ENABLE_SDCARD            (0)
\ No newline at end of file
diff --git a/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board b/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board
new file mode 100644
index 0000000000..ccda7bff68
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board
@@ -0,0 +1,16 @@
+CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
+CONFIG_ESPTOOLPY_AFTER_NORESET=y
+
+CONFIG_SPIRAM_MEMTEST=
+
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-16MiB.csv"
+#CONFIG_USB_AND_UART=y
+
+# LWIP
+CONFIG_LWIP_LOCAL_HOSTNAME="UMFeatherS2"
+# end of LWIP
diff --git a/ports/esp32/boards/UM_TINYS2/manifest.py b/ports/esp32/boards/UM_TINYS2/manifest.py
new file mode 100644
index 0000000000..7ae2ed15d9
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYS2/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+freeze("modules")
diff --git a/ports/esp32/boards/UM_TINYS2/modules/tinys2.py b/ports/esp32/boards/UM_TINYS2/modules/tinys2.py
new file mode 100644
index 0000000000..ca59cb1235
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYS2/modules/tinys2.py
@@ -0,0 +1,82 @@
+# TinyS2 MicroPython Helper Library
+# 2021 Seon Rozenblum - Unexpected Maker
+#
+# Project home:
+#   https://tinys2.io
+#
+# 2021-Apr-10 - v0.1 - Initial implementation
+
+# Import required libraries
+from micropython import const
+from machine import Pin, SPI, ADC
+import machine, time
+
+# TinyS2 Hardware Pin Assignments
+
+# Sense Pins
+VBUS_SENSE = const(21)
+VBAT_SENSE = const(3)
+
+
+# RGB LED Pins
+RGB_DATA = const(1)
+RGB_PWR = const(2)
+
+# SPI
+SPI_MOSI = const(35)
+SPI_MISO = const(36)
+SPI_CLK = const(37)
+
+# I2C
+I2C_SDA = const(8)
+I2C_SCL = const(9)
+
+# DAC
+DAC1 = const(17)
+DAC2 = const(18)
+
+
+# Helper functions
+def set_pixel_power(state):
+    """Enable or Disable power to the onboard NeoPixel to either show colour, or to reduce power fro deep sleep."""
+    Pin(RGB_PWR, Pin.OUT).value(state)
+
+
+def get_battery_voltage():
+    """
+    Returns the current battery voltage. If no battery is connected, returns 4.2V which is the charge voltage
+    This is an approximation only, but useful to detect if the charge state of the battery is getting low.
+    """
+    adc = ADC(Pin(VBAT_SENSE))  # Assign the ADC pin to read
+    measuredvbat = adc.read()  # Read the value
+    measuredvbat /= 8192  # divide by 8192 as we are using the default ADC voltage range of 0-1V
+    measuredvbat *= 4.2  # Multiply by 4.2V, our reference voltage
+    return round(measuredvbat, 2)
+
+
+def get_vbus_present():
+    """Detect if VBUS (5V) power source is present"""
+    return Pin(VBUS_SENSE, Pin.IN).value() == 1
+
+
+# Dotstar rainbow colour wheel
+def rgb_color_wheel(wheel_pos):
+    """Color wheel to allow for cycling through the rainbow of RGB colors."""
+    wheel_pos = wheel_pos % 255
+
+    if wheel_pos < 85:
+        return 255 - wheel_pos * 3, 0, wheel_pos * 3
+    elif wheel_pos < 170:
+        wheel_pos -= 85
+        return 0, wheel_pos * 3, 255 - wheel_pos * 3
+    else:
+        wheel_pos -= 170
+        return wheel_pos * 3, 255 - wheel_pos * 3, 0
+
+
+# Go into deep sleep but shut down the APA first to save power
+# Use this if you want lowest deep  sleep current
+def go_deepsleep(t):
+    """Deep sleep helper that also powers down the on-board Dotstar."""
+    set_pixel_power(False)
+    machine.deepsleep(t)
diff --git a/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake
new file mode 100644
index 0000000000..928f9f8fc3
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake
@@ -0,0 +1,8 @@
+set(IDF_TARGET esp32s2)
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.spiram_sx
+    boards/sdkconfig.usb
+)
+
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
diff --git a/ports/esp32/boards/UM_TINYS2/mpconfigboard.h b/ports/esp32/boards/UM_TINYS2/mpconfigboard.h
new file mode 100644
index 0000000000..87d266e58c
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYS2/mpconfigboard.h
@@ -0,0 +1,9 @@
+#define MICROPY_HW_BOARD_NAME "TinyS2"
+#define MICROPY_HW_MCU_NAME "ESP32-S2FN4R2"
+
+#define MICROPY_PY_BLUETOOTH                (0)
+#define MICROPY_HW_ENABLE_SDCARD            (0)
+
+#define MICROPY_HW_SPI1_MOSI (35)
+#define MICROPY_HW_SPI1_MISO (36)
+#define MICROPY_HW_SPI1_SCK (37)
diff --git a/ports/esp32/boards/UM_TINYS2/sdkconfig.board b/ports/esp32/boards/UM_TINYS2/sdkconfig.board
new file mode 100644
index 0000000000..48b6749c72
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYS2/sdkconfig.board
@@ -0,0 +1,6 @@
+CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_USB_AND_UART=y
+# LWIP
+CONFIG_LWIP_LOCAL_HOSTNAME="UMTinyS2"
+# end of LWIP

From cce7096d1a031f43f72c2ea87513301c3db118dc Mon Sep 17 00:00:00 2001
From: Chris Greening <chris@cmgresearch.com>
Date: Mon, 10 May 2021 18:17:31 +0100
Subject: [PATCH 096/349] esp32/boards/UM_TINYPICO: Fix include of sdkconfig
 fragment.

This was broken by 32ec07a3504d6dcbfc53997197a3c53e8c03497f
---
 ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake
index 0c65103a85..bc2541c699 100644
--- a/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake
@@ -3,7 +3,7 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
     boards/sdkconfig.spiram
-    boards/TINYPICO/sdkconfig.board
+    boards/UM_TINYPICO/sdkconfig.board
 )
 
 if(NOT MICROPY_FROZEN_MANIFEST)

From 4404dababb715916262ca9aa45a5732d8454eda0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 11 May 2021 12:46:18 +1000
Subject: [PATCH 097/349] rp2/CMakeLists.txt: Include tinyusb_common in
 PICO_SDK_COMPONENTS.

So the TinyUSB headers can be found during qstr processing.

Fixes issue #7236.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 699520b240..50cdba4ba0 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -154,6 +154,7 @@ set(PICO_SDK_COMPONENTS
     pico_sync
     pico_time
     pico_unique_id
+    tinyusb_common
     tinyusb_device
 )
 

From 70f50c46cc8ae0cd6802c7998874b5ea7c410119 Mon Sep 17 00:00:00 2001
From: Ayke van Laethem <aykevanlaethem@gmail.com>
Date: Mon, 9 Apr 2018 01:00:01 +0200
Subject: [PATCH 098/349] lib/utils: Add ARM semihosting utility functions.

This can be a replacement for a UART in custom ports.
---
 lib/utils/semihosting.c | 132 ++++++++++++++++++++++++++++++++++++++++
 lib/utils/semihosting.h |  51 ++++++++++++++++
 2 files changed, 183 insertions(+)
 create mode 100644 lib/utils/semihosting.c
 create mode 100644 lib/utils/semihosting.h

diff --git a/lib/utils/semihosting.c b/lib/utils/semihosting.c
new file mode 100644
index 0000000000..18c7f5d57a
--- /dev/null
+++ b/lib/utils/semihosting.c
@@ -0,0 +1,132 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Ayke van Laethem
+ *
+ * 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 "semihosting.h"
+
+// Resources:
+// http://embed.rs/articles/2016/semi-hosting-rust/
+// https://wiki.dlang.org/Minimal_semihosted_ARM_Cortex-M_%22Hello_World%22
+// https://github.com/arduino/OpenOCD/blob/master/src/target/arm_semihosting.c
+
+#define SYS_OPEN   0x01
+#define SYS_WRITEC 0x03
+#define SYS_WRITE  0x05
+#define SYS_READC  0x07
+
+// Constants:
+#define OPEN_MODE_READ  (0) // mode "r"
+#define OPEN_MODE_WRITE (4) // mode "w"
+
+#ifndef __thumb__
+#error Semihosting is only implemented for ARM microcontrollers.
+#endif
+
+static int mp_semihosting_stdout;
+
+static uint32_t mp_semihosting_call(uint32_t num, const void *arg) {
+    // A semihosting call works as follows, similar to a SVCall:
+    //   * the call is invoked by a special breakpoint: 0xAB
+    //   * the command is placed in r0
+    //   * a pointer to the arguments is placed in r1
+    //   * the return value is placed in r0
+    // Note that because it uses the breakpoint instruction, applications
+    // will hang if they're not connected to a debugger. And they'll be
+    // stuck in a breakpoint if semihosting is not specifically enabled in
+    // the debugger.
+    // Also note that semihosting is extremely slow (sometimes >100ms per
+    // call).
+    register uint32_t num_reg __asm__ ("r0") = num;
+    register const void *args_reg __asm__ ("r1") = arg;
+    __asm__ __volatile__ (
+        "bkpt 0xAB\n"         // invoke semihosting call
+        : "+r" (num_reg)      // call number and result
+        : "r" (args_reg)      // arguments
+        : "memory");          // make sure args aren't optimized away
+    return num_reg; // r0, which became the result
+}
+
+static int mp_semihosting_open_console(uint32_t mode) {
+    struct {
+        char *name;
+        uint32_t mode;
+        uint32_t name_len;
+    } args = {
+        .name = ":tt",     // magic path to console
+        .mode = mode,      // e.g. "r", "w" (see OPEN_MODE_* constants)
+        .name_len = 3,     // strlen(":tt")
+    };
+    return mp_semihosting_call(SYS_OPEN, &args);
+}
+
+void mp_semihosting_init() {
+    mp_semihosting_stdout = mp_semihosting_open_console(OPEN_MODE_WRITE);
+}
+
+int mp_semihosting_rx_char() {
+    return mp_semihosting_call(SYS_READC, NULL);
+}
+
+static void mp_semihosting_tx_char(char c) {
+    mp_semihosting_call(SYS_WRITEC, &c);
+}
+
+uint32_t mp_semihosting_tx_strn(const char *str, size_t len) {
+    if (len == 0) {
+        return 0; // nothing to do
+    }
+    if (len == 1) {
+        mp_semihosting_tx_char(*str); // maybe faster?
+        return 0;
+    }
+
+    struct {
+        uint32_t fd;
+        const char *str;
+        uint32_t len;
+    } args = {
+        .fd = mp_semihosting_stdout,
+        .str = str,
+        .len = len,
+    };
+    return mp_semihosting_call(SYS_WRITE, &args);
+}
+
+uint32_t mp_semihosting_tx_strn_cooked(const char *str, size_t len) {
+    // Write chunks of data until (excluding) the first '\n' character,
+    // insert a '\r' character, and then continue with the next chunk
+    // (starting with '\n').
+    // Doing byte-by-byte writes would be easier to implement but is far
+    // too slow.
+    size_t start = 0;
+    for (size_t i = 0; i < len; i++) {
+        if (str[i] == '\n') {
+            mp_semihosting_tx_strn(str + start, i - start);
+            mp_semihosting_tx_char('\r');
+            start = i;
+        }
+    }
+    return mp_semihosting_tx_strn(str + start, len - start);
+}
diff --git a/lib/utils/semihosting.h b/lib/utils/semihosting.h
new file mode 100644
index 0000000000..d053a03eda
--- /dev/null
+++ b/lib/utils/semihosting.h
@@ -0,0 +1,51 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Ayke van Laethem
+ *
+ * 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_LIB_UTILS_SEMIHOSTING_H
+#define MICROPY_INCLUDED_LIB_UTILS_SEMIHOSTING_H
+
+/*
+
+To use semi-hosting for a replacement UART:
+- Add lib/semihosting/semihosting.c to the Makefile sources.
+- Call mp_semihosting_init() in main(), around the time UART is initialized.
+- Replace mp_hal_stdin_rx_chr and similar in mphalport.c with the semihosting equivalent.
+- Include lib/semihosting/semihosting.h in the relevant files.
+
+Then make sure the debugger is attached and enables semihosting.  In OpenOCD this is
+done with ARM semihosting enable followed by reset.  The terminal will need further
+configuration to work with MicroPython (bash: stty raw -echo).
+
+*/
+
+#include <stddef.h>
+#include <stdint.h>
+
+void mp_semihosting_init();
+int mp_semihosting_rx_char();
+uint32_t mp_semihosting_tx_strn(const char *str, size_t len);
+uint32_t mp_semihosting_tx_strn_cooked(const char *str, size_t len);
+
+#endif // MICROPY_INCLUDED_LIB_UTILS_SEMIHOSTING_H

From 18d984c8b2053ddc17f02816cb037f13afee685a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 11 May 2021 23:45:36 +1000
Subject: [PATCH 099/349] tests/run-perfbench.py: Fix native feature check.

This was broken by 8459f538eb45fd8e1e4d614298449cf18de84d75

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-perfbench.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/run-perfbench.py b/tests/run-perfbench.py
index 8b71ae64ce..bcdbe69abb 100755
--- a/tests/run-perfbench.py
+++ b/tests/run-perfbench.py
@@ -85,7 +85,7 @@ def run_benchmark_on_target(target, script):
 
 def run_benchmarks(target, param_n, param_m, n_average, test_list):
     skip_complex = run_feature_test(target, "complex") != "complex"
-    skip_native = run_feature_test(target, "native_check") != ""
+    skip_native = run_feature_test(target, "native_check") != "native"
 
     for test_file in sorted(test_list):
         print(test_file + ": ", end="")

From 87e38b3cc83be7297957b5ec9b701769ffe2d6e3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 12 May 2021 00:05:55 +1000
Subject: [PATCH 100/349] docs/library/rp2.rst: Fix typo overriden->overridden.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/rp2.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/library/rp2.rst b/docs/library/rp2.rst
index b6e7fcf429..5d168bce20 100644
--- a/docs/library/rp2.rst
+++ b/docs/library/rp2.rst
@@ -38,7 +38,7 @@ For running PIO programs, see :class:`rp2.StateMachine`.
     - *sideset_init* configures the pins used side-setting. There can be at
       most 5.
 
-    The following parameters are used by default, but can be overriden in
+    The following parameters are used by default, but can be overridden in
     `StateMachine.init()`:
 
     - *in_shiftdir* is the default direction the ISR will shift, either

From 300fc842cec1d1ef71df95c917374808ae2cafe9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 12 May 2021 11:18:16 +1000
Subject: [PATCH 101/349] py/mkenv.mk: Don't emit info about BUILD_VERBOSE if
 it's set.

If the user sets V or BUILD_VERBOSE then they don't need to see this
message.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mkenv.mk | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/py/mkenv.mk b/py/mkenv.mk
index 371d320462..d54f0a0d31 100644
--- a/py/mkenv.mk
+++ b/py/mkenv.mk
@@ -20,6 +20,7 @@ ifeq ("$(origin V)", "command line")
 BUILD_VERBOSE=$(V)
 endif
 ifndef BUILD_VERBOSE
+$(info Use make V=1 or set BUILD_VERBOSE in your environment to increase build verbosity.)
 BUILD_VERBOSE = 0
 endif
 ifeq ($(BUILD_VERBOSE),0)
@@ -27,10 +28,6 @@ Q = @
 else
 Q =
 endif
-# Since this is a new feature, advertise it
-ifeq ($(BUILD_VERBOSE),0)
-$(info Use make V=1 or set BUILD_VERBOSE in your environment to increase build verbosity.)
-endif
 
 # default settings; can be overridden in main Makefile
 

From ee4ffc1804cc39c80128185e7ea96365fa381d7e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Apr 2021 16:52:01 +1000
Subject: [PATCH 102/349] stm32/powerctrl: Add
 MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET option.

When disabled the bootloader is entered via a direct jump.  When enabled
the bootloader is entered via a system reset then a jump.  It's enabled by
default to retain the existing behaviour, which is the recommended way.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mpconfigboard_common.h |  5 +++++
 ports/stm32/powerctrl.c            | 36 ++++++++++++++++++++++--------
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 0df35918be..ce9dbdb0af 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -47,6 +47,11 @@
 #define MICROPY_PY_PYB_LEGACY (1)
 #endif
 
+// Whether machine.bootloader() will enter the bootloader via reset, or direct jump.
+#ifndef MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET
+#define MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET (1)
+#endif
+
 // Whether to enable storage on the internal flash of the MCU
 #ifndef MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
 #define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index 573844063b..253f1056ca 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -66,9 +66,11 @@
 #define HAVE_PLL48 0
 #endif
 
+#if MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET
 // Location in RAM of bootloader state (just after the top of the stack)
 extern uint32_t _estack[];
 #define BL_STATE ((uint32_t *)&_estack)
+#endif
 
 static inline void powerctrl_disable_hsi_if_unused(void) {
     #if !MICROPY_HW_CLK_USE_HSI && (defined(STM32F4) || defined(STM32F7) || defined(STM32H7))
@@ -78,32 +80,47 @@ static inline void powerctrl_disable_hsi_if_unused(void) {
 }
 
 NORETURN void powerctrl_mcu_reset(void) {
+    #if MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET
     BL_STATE[1] = 1; // invalidate bootloader address
     #if __DCACHE_PRESENT == 1
     SCB_CleanDCache();
     #endif
-    NVIC_SystemReset();
-}
-
-NORETURN void powerctrl_enter_bootloader(uint32_t r0, uint32_t bl_addr) {
-    BL_STATE[0] = r0;
-    BL_STATE[1] = bl_addr;
-    #if __DCACHE_PRESENT == 1
-    SCB_CleanDCache();
     #endif
     NVIC_SystemReset();
 }
 
-static __attribute__((naked)) void branch_to_bootloader(uint32_t r0, uint32_t bl_addr) {
+NORETURN static __attribute__((naked)) void branch_to_bootloader(uint32_t r0, uint32_t bl_addr) {
     __asm volatile (
         "ldr r2, [r1, #0]\n"    // get address of stack pointer
         "msr msp, r2\n"         // get stack pointer
         "ldr r2, [r1, #4]\n"    // get address of destination
         "bx r2\n"               // branch to bootloader
         );
+    MP_UNREACHABLE;
+}
+
+NORETURN void powerctrl_enter_bootloader(uint32_t r0, uint32_t bl_addr) {
+    #if MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET
+
+    // Enter the bootloader via a reset, so everything is reset (including WDT).
+    // Upon reset powerctrl_check_enter_bootloader() will jump to the bootloader.
+    BL_STATE[0] = r0;
+    BL_STATE[1] = bl_addr;
+    #if __DCACHE_PRESENT == 1
+    SCB_CleanDCache();
+    #endif
+    NVIC_SystemReset();
+
+    #else
+
+    // Enter the bootloader via a direct jump.
+    branch_to_bootloader(r0, bl_addr);
+
+    #endif
 }
 
 void powerctrl_check_enter_bootloader(void) {
+    #if MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET
     uint32_t bl_addr = BL_STATE[1];
     BL_STATE[1] = 1; // invalidate bootloader address
     if ((bl_addr & 0xfff) == 0 && (RCC->RCC_SR & RCC_SR_SFTRSTF)) {
@@ -115,6 +132,7 @@ void powerctrl_check_enter_bootloader(void) {
         uint32_t r0 = BL_STATE[0];
         branch_to_bootloader(r0, bl_addr);
     }
+    #endif
 }
 
 #if !defined(STM32F0) && !defined(STM32L0) && !defined(STM32WB)

From 9ee116c452e6569d70cdebaade5dd25a1555b82b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 May 2021 10:49:43 +1000
Subject: [PATCH 103/349] stm32/boardctrl: Adjust logic for running boot.py,
 main.py.

This new logic is equivalent to the old logic when the only possibilities
for reset_mode are NORMAL, SAFE_MODE and FILESYSTEM, which is the standard
case.  But the new logic also allows other reset_mode values (eg
BOOTLOADER) to run boot.py and main.py.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boardctrl.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/boardctrl.c b/ports/stm32/boardctrl.c
index 8cc519d8e9..f1b7a4e81c 100644
--- a/ports/stm32/boardctrl.c
+++ b/ports/stm32/boardctrl.c
@@ -143,8 +143,7 @@ void boardctrl_top_soft_reset_loop(boardctrl_state_t *state) {
 }
 
 int boardctrl_run_boot_py(boardctrl_state_t *state) {
-    bool run_boot_py = state->reset_mode == BOARDCTRL_RESET_MODE_NORMAL
-        || state->reset_mode == BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM;
+    bool run_boot_py = state->reset_mode != BOARDCTRL_RESET_MODE_SAFE_MODE;
 
     if (run_boot_py) {
         // Run boot.py, if it exists.
@@ -176,8 +175,7 @@ int boardctrl_run_boot_py(boardctrl_state_t *state) {
 }
 
 int boardctrl_run_main_py(boardctrl_state_t *state) {
-    bool run_main_py = (state->reset_mode == BOARDCTRL_RESET_MODE_NORMAL
-        || state->reset_mode == BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM)
+    bool run_main_py = state->reset_mode != BOARDCTRL_RESET_MODE_SAFE_MODE
         && pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL;
 
     if (run_main_py) {

From 6639e282c762b1f878c2c66a1e0153ee8cb61e1a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 12 May 2021 13:29:01 +1000
Subject: [PATCH 104/349] stm32/mboot: Add MBOOT_LEAVE_BOOTLOADER_VIA_RESET
 option.

It is enabled by default to get the standard behaviour of doing a reset
after it is finished, but can be disabled by a board to jump straight to
the application (likely the board needs to use MBOOT_BOARD_CLEANUP to make
this work).

The application is passed a reset mode of BOARDCTRL_RESET_MODE_BOOTLOADER
if the bootloader was active and entered via a jump.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/main.c | 64 ++++++++++++++++++++++++++++++++--------
 1 file changed, 51 insertions(+), 13 deletions(-)

diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 36b6890361..2bee5a666f 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -40,6 +40,11 @@
 #include "dfu.h"
 #include "pack.h"
 
+// Whether the bootloader will leave via reset, or direct jump to the application.
+#ifndef MBOOT_LEAVE_BOOTLOADER_VIA_RESET
+#define MBOOT_LEAVE_BOOTLOADER_VIA_RESET (1)
+#endif
+
 // This option selects whether to use explicit polling or IRQs for USB events.
 // In some test cases polling mode can run slightly faster, but it uses more power.
 // Polling mode will also cause failures with the mass-erase command because USB
@@ -1329,6 +1334,45 @@ static int get_reset_mode(void) {
     return reset_mode;
 }
 
+NORETURN static __attribute__((naked)) void branch_to_application(uint32_t r0, uint32_t bl_addr) {
+    __asm volatile (
+        "ldr r2, [r1, #0]\n"    // get address of stack pointer
+        "msr msp, r2\n"         // set stack pointer
+        "ldr r2, [r1, #4]\n"    // get address of destination
+        "bx r2\n"               // branch to application
+        );
+    MP_UNREACHABLE;
+}
+
+static void try_enter_application(int reset_mode) {
+    uint32_t msp = *(volatile uint32_t*)APPLICATION_ADDR;
+    if ((msp & APP_VALIDITY_BITS) != 0) {
+        // Application is invalid.
+        return;
+    }
+
+    // undo our DFU settings
+    // TODO probably should disable all IRQ sources first
+    #if defined(MBOOT_BOARD_CLEANUP)
+    MBOOT_BOARD_CLEANUP(reset_mode);
+    #endif
+    #if USE_CACHE && defined(STM32F7)
+    SCB_DisableICache();
+    SCB_DisableDCache();
+    #endif
+
+    // Jump to the application.
+    branch_to_application(reset_mode, APPLICATION_ADDR);
+}
+
+static void leave_bootloader(void) {
+    #if !MBOOT_LEAVE_BOOTLOADER_VIA_RESET
+    // Try to enter the application via a jump, if it's valid.
+    try_enter_application(BOARDCTRL_RESET_MODE_BOOTLOADER);
+    #endif
+    NVIC_SystemReset();
+}
+
 static void do_reset(void) {
     led_state_all(0);
     mp_hal_delay_ms(50);
@@ -1337,7 +1381,7 @@ static void do_reset(void) {
     i2c_slave_shutdown(MBOOT_I2Cx, I2Cx_EV_IRQn);
     #endif
     mp_hal_delay_ms(50);
-    NVIC_SystemReset();
+    leave_bootloader();
 }
 
 extern PCD_HandleTypeDef pcd_fs_handle;
@@ -1402,17 +1446,11 @@ void stm32_main(int initial_r0) {
     }
 
     int reset_mode = get_reset_mode();
-    uint32_t msp = *(volatile uint32_t*)APPLICATION_ADDR;
-    if (reset_mode != BOARDCTRL_RESET_MODE_BOOTLOADER && (msp & APP_VALIDITY_BITS) == 0) {
-        // not DFU mode so jump to application, passing through reset_mode
-        // undo our DFU settings
-        // TODO probably should disable all IRQ sources first
-        #if USE_CACHE && defined(STM32F7)
-        SCB_DisableICache();
-        SCB_DisableDCache();
-        #endif
-        __set_MSP(msp);
-        ((void (*)(uint32_t)) *((volatile uint32_t*)(APPLICATION_ADDR + 4)))(reset_mode);
+    if (reset_mode != BOARDCTRL_RESET_MODE_BOOTLOADER) {
+        // Bootloader mode was not selected so try to enter the application,
+        // passing through the reset_mode.  This will return if the application
+        // is invalid.
+        try_enter_application(reset_mode);
     }
 
 enter_bootloader:
@@ -1461,7 +1499,7 @@ enter_bootloader:
         }
         // Always reset because the application is expecting to resume
         led_state_all(0);
-        NVIC_SystemReset();
+        leave_bootloader();
     }
     #endif
 

From 9a0bca2c2a6aef7b032d9c5bde378058c8258a08 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 12 May 2021 13:33:56 +1000
Subject: [PATCH 105/349] stm32/mboot: Make LEDs and reset-mode selection more
 configurable.

A board can now customise mboot with:
- MBOOT_LED1, MBOOT_LED2, MBOOT_LED3, MBOOT_LED4: if it needs to have
  different LEDs for mboot compared to the application
- MBOOT_BOARD_LED_INIT: if it needs a fully customised LED init function
- MBOOT_BOARD_LED_STATE: if it needs a fully customised LED state-setting
  function
- MBOOT_BOARD_GET_RESET_MODE: if it needs a fully customised function to
  get the reset mode

With full customisation, the only requirement is a single LED to show the
status of the bootloader (idle, erasing, flashing, etc), which can be
configured to do nothing if needed.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/main.c  | 71 ++++++++++++++++++++++++++++++---------
 ports/stm32/mboot/mboot.h |  2 ++
 2 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 2bee5a666f..3a0242a8d6 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -374,12 +374,27 @@ void mp_hal_pin_config_speed(uint32_t port_pin, uint32_t speed) {
 /******************************************************************************/
 // LED
 
+#if defined(MBOOT_LED1)
+#define LED0 MBOOT_LED1
+#elif defined(MICROPY_HW_LED1)
 #define LED0 MICROPY_HW_LED1
+#endif
+
+#if defined(MBOOT_LED2)
+#define LED1 MBOOT_LED2
+#elif defined(MICROPY_HW_LED2)
 #define LED1 MICROPY_HW_LED2
-#ifdef MICROPY_HW_LED3
+#endif
+
+#if defined(MBOOT_LED3)
+#define LED2 MBOOT_LED3
+#elif defined(MICROPY_HW_LED3)
 #define LED2 MICROPY_HW_LED3
 #endif
-#ifdef MICROPY_HW_LED4
+
+#if defined(MBOOT_LED4)
+#define LED3 MBOOT_LED4
+#elif defined(MICROPY_HW_LED4)
 #define LED3 MICROPY_HW_LED4
 #endif
 
@@ -397,28 +412,45 @@ static uint32_t led0_ms_interval = 0;
 static int led0_toggle_count = 0;
 
 MP_WEAK void led_init(void) {
+    #if defined(MBOOT_BOARD_LED_INIT)
+    // Custom LED init function provided by the board.
+    MBOOT_BOARD_LED_INIT();
+    #else
+    // Init LEDs using GPIO calls.
     mp_hal_pin_output(LED0);
+    #ifdef LED1
     mp_hal_pin_output(LED1);
+    #endif
     #ifdef LED2
     mp_hal_pin_output(LED2);
     #endif
     #ifdef LED3
     mp_hal_pin_output(LED3);
     #endif
+    #endif
+
     led0_cur_state = LED0_STATE_OFF;
 }
 
 MP_WEAK void led_state(uint32_t led, int val) {
+    #if defined(MBOOT_BOARD_LED_STATE)
+    // Custom LED state function provided by the board.
+    return MBOOT_BOARD_LED_STATE(led, val);
+    #else
+    // Set LEDs using GPIO calls.
     if (val) {
         MICROPY_HW_LED_ON(led);
     } else {
         MICROPY_HW_LED_OFF(led);
     }
+    #endif
 }
 
 void led_state_all(unsigned int mask) {
     led_state(LED0, mask & 1);
+    #ifdef LED1
     led_state(LED1, mask & 2);
+    #endif
     #ifdef LED2
     led_state(LED2, mask & 4);
     #endif
@@ -445,17 +477,6 @@ void led0_update() {
     }
 }
 
-/******************************************************************************/
-// USR BUTTON
-
-static void usrbtn_init(void) {
-    mp_hal_pin_config(MICROPY_HW_USRSW_PIN, MP_HAL_PIN_MODE_INPUT, MICROPY_HW_USRSW_PULL, 0);
-}
-
-static int usrbtn_state(void) {
-    return mp_hal_pin_read(MICROPY_HW_USRSW_PIN) == MICROPY_HW_USRSW_PRESSED;
-}
-
 /******************************************************************************/
 // FLASH
 
@@ -1287,6 +1308,14 @@ static int pyb_usbdd_shutdown(void) {
 /******************************************************************************/
 // main
 
+#if defined(MBOOT_BOARD_GET_RESET_MODE)
+
+static inline int mboot_get_reset_mode(void) {
+    return MBOOT_BOARD_GET_RESET_MODE();
+}
+
+#else
+
 #define RESET_MODE_NUM_STATES (4)
 #define RESET_MODE_TIMEOUT_CYCLES (8)
 #ifdef LED2
@@ -1299,7 +1328,15 @@ static int pyb_usbdd_shutdown(void) {
 #define RESET_MODE_LED_STATES 0x3210
 #endif
 
-static int get_reset_mode(void) {
+static void usrbtn_init(void) {
+    mp_hal_pin_config(MICROPY_HW_USRSW_PIN, MP_HAL_PIN_MODE_INPUT, MICROPY_HW_USRSW_PULL, 0);
+}
+
+static int usrbtn_state(void) {
+    return mp_hal_pin_read(MICROPY_HW_USRSW_PIN) == MICROPY_HW_USRSW_PRESSED;
+}
+
+static int mboot_get_reset_mode(void) {
     usrbtn_init();
     int reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
     if (usrbtn_state()) {
@@ -1334,6 +1371,8 @@ static int get_reset_mode(void) {
     return reset_mode;
 }
 
+#endif
+
 NORETURN static __attribute__((naked)) void branch_to_application(uint32_t r0, uint32_t bl_addr) {
     __asm volatile (
         "ldr r2, [r1, #0]\n"    // get address of stack pointer
@@ -1445,7 +1484,7 @@ void stm32_main(int initial_r0) {
         goto enter_bootloader;
     }
 
-    int reset_mode = get_reset_mode();
+    int reset_mode = mboot_get_reset_mode();
     if (reset_mode != BOARDCTRL_RESET_MODE_BOOTLOADER) {
         // Bootloader mode was not selected so try to enter the application,
         // passing through the reset_mode.  This will return if the application
@@ -1455,7 +1494,7 @@ void stm32_main(int initial_r0) {
 
 enter_bootloader:
 
-    // Init subsystems (get_reset_mode() may call these, calling them again is ok)
+    // Init subsystems (mboot_get_reset_mode() may call these, calling them again is ok)
     led_init();
 
     // set the system clock to be HSE
diff --git a/ports/stm32/mboot/mboot.h b/ports/stm32/mboot/mboot.h
index 8f8a8afdd7..3a27ce08ef 100644
--- a/ports/stm32/mboot/mboot.h
+++ b/ports/stm32/mboot/mboot.h
@@ -85,6 +85,8 @@ enum {
 
 extern uint8_t _estack[ELEM_DATA_SIZE];
 
+void systick_init(void);
+
 uint32_t get_le32(const uint8_t *b);
 void led_state_all(unsigned int mask);
 

From 6affcb0104336e629390b2bfba997f3446f9ea58 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 13 May 2021 16:26:07 +1000
Subject: [PATCH 106/349] tests/run-multitests.py: Flush stdout for each line
 of trace output.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-multitests.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/run-multitests.py b/tests/run-multitests.py
index 3163a48e63..66ca799675 100755
--- a/tests/run-multitests.py
+++ b/tests/run-multitests.py
@@ -243,6 +243,7 @@ def trace_instance_output(instance_idx, line):
     if cmd_args.trace_output:
         t_ms = round((time.time() - trace_t0) * 1000)
         print("{:6} i{} :".format(t_ms, instance_idx), line)
+        sys.stdout.flush()
 
 
 def run_test_on_instances(test_file, num_instances, instances):

From 57365d855734142deb030ebcd00c10efcedf554b Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Wed, 12 May 2021 17:02:06 +0200
Subject: [PATCH 107/349] py/objarray: Prohibit comparison of mismatching
 types.

Array equality is defined as each element being equal but to keep
code size down MicroPython implements a binary comparison.  This
can only be used correctly for elements with the same binary layout
though so turn it into an NotImplementedError when comparing types
for which the binary comparison yielded incorrect results: types
with different sizes, and floating point numbers because nan != nan.
---
 py/objarray.c                            | 25 +++++++++++++++++++++++-
 tests/basics/array1.py                   |  9 +++++++++
 tests/basics/array_micropython.py        | 12 ++++++++++++
 tests/cpydiff/module_array_comparison.py |  9 +++++++++
 4 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 tests/cpydiff/module_array_comparison.py

diff --git a/py/objarray.c b/py/objarray.c
index c27366d720..2f1f68d81a 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -258,6 +258,16 @@ STATIC mp_obj_t array_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
     }
 }
 
+STATIC int typecode_for_comparison(int typecode) {
+    if (typecode == BYTEARRAY_TYPECODE) {
+        typecode = 'B';
+    }
+    if (typecode <= 'Z') {
+        typecode += 32; // to lowercase
+    }
+    return typecode;
+}
+
 STATIC mp_obj_t array_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
     mp_obj_array_t *lhs = MP_OBJ_TO_PTR(lhs_in);
     switch (op) {
@@ -319,7 +329,20 @@ STATIC mp_obj_t array_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs
             if (!mp_get_buffer(rhs_in, &rhs_bufinfo, MP_BUFFER_READ)) {
                 return mp_const_false;
             }
-            return mp_obj_new_bool(mp_seq_cmp_bytes(op, lhs_bufinfo.buf, lhs_bufinfo.len, rhs_bufinfo.buf, rhs_bufinfo.len));
+            // mp_seq_cmp_bytes is used so only compatible representations can be correctly compared.
+            // The type doesn't matter: array/bytearray/str/bytes all have the same buffer layout, so
+            // just check if the typecodes are compatible; for testing equality the types should have the
+            // same code except for signedness, and not be floating point because nan never equals nan.
+            // Note that typecode_for_comparison always returns lowercase letters to save code size.
+            // No need for (& TYPECODE_MASK) here: xxx_get_buffer already takes care of that.
+            const int lhs_code = typecode_for_comparison(lhs_bufinfo.typecode);
+            const int rhs_code = typecode_for_comparison(rhs_bufinfo.typecode);
+            if (lhs_code == rhs_code && lhs_code != 'f' && lhs_code != 'd') {
+                return mp_obj_new_bool(mp_seq_cmp_bytes(op, lhs_bufinfo.buf, lhs_bufinfo.len, rhs_bufinfo.buf, rhs_bufinfo.len));
+            }
+            // mp_obj_equal_not_equal treats returning MP_OBJ_NULL as 'fall back to pointer comparison'
+            // for MP_BINARY_OP_EQUAL but that is incompatible with CPython.
+            mp_raise_NotImplementedError(NULL);
         }
 
         default:
diff --git a/tests/basics/array1.py b/tests/basics/array1.py
index 5b3f475786..15789e2c99 100644
--- a/tests/basics/array1.py
+++ b/tests/basics/array1.py
@@ -41,14 +41,23 @@ except ValueError:
 # equality (CPython requires both sides are array)
 print(bytes(array.array('b', [0x61, 0x62, 0x63])) == b'abc')
 print(array.array('b', [0x61, 0x62, 0x63]) == b'abc')
+print(array.array('B', [0x61, 0x62, 0x63]) == b'abc')
 print(array.array('b', [0x61, 0x62, 0x63]) != b'abc')
 print(array.array('b', [0x61, 0x62, 0x63]) == b'xyz')
 print(array.array('b', [0x61, 0x62, 0x63]) != b'xyz')
 print(b'abc' == array.array('b', [0x61, 0x62, 0x63]))
+print(b'abc' == array.array('B', [0x61, 0x62, 0x63]))
 print(b'abc' != array.array('b', [0x61, 0x62, 0x63]))
 print(b'xyz' == array.array('b', [0x61, 0x62, 0x63]))
 print(b'xyz' != array.array('b', [0x61, 0x62, 0x63]))
 
+compatible_typecodes = []
+for t in ["b", "h", "i", "l", "q"]:
+  compatible_typecodes.append((t, t))
+  compatible_typecodes.append((t, t.upper()))
+for a, b in compatible_typecodes:
+  print(array.array(a, [1, 2]) == array.array(b, [1, 2]))
+
 class X(array.array):
     pass
 
diff --git a/tests/basics/array_micropython.py b/tests/basics/array_micropython.py
index 6b3dc7a93b..44dc1d83d8 100644
--- a/tests/basics/array_micropython.py
+++ b/tests/basics/array_micropython.py
@@ -17,3 +17,15 @@ print(a[0])
 a = array.array('P')
 a.append(1)
 print(a[0])
+
+# comparison between mismatching binary layouts is not implemented
+typecodes = ["b", "h", "i", "l", "q", "P", "O", "S", "f", "d"]
+for a in typecodes:
+    for b in typecodes:
+        if a == b and a not in ["f", "d"]:
+            continue
+        try:
+            array.array(a) == array.array(b)
+            print('FAIL')
+        except NotImplementedError:
+            pass
diff --git a/tests/cpydiff/module_array_comparison.py b/tests/cpydiff/module_array_comparison.py
new file mode 100644
index 0000000000..a442af3f5b
--- /dev/null
+++ b/tests/cpydiff/module_array_comparison.py
@@ -0,0 +1,9 @@
+"""
+categories: Modules,array
+description: Comparison between different typecodes not supported
+cause: Code size
+workaround: Compare individual elements
+"""
+import array
+
+array.array("b", [1, 2]) == array.array("i", [1, 2])

From 09be0c083cb493c70b38079aa6fd785aa9b0b90a Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Mon, 10 May 2021 16:40:51 +0200
Subject: [PATCH 108/349] py/objarray: Implement more/less comparisons for
 array.

---
 py/objarray.c              | 17 ++++++++++++-----
 tests/basics/array1.py     | 21 +++++++++++++++++++++
 tests/basics/bytearray1.py | 20 ++++++++++++++++++++
 3 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/py/objarray.c b/py/objarray.c
index 2f1f68d81a..5bd9454716 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -258,12 +258,13 @@ STATIC mp_obj_t array_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
     }
 }
 
-STATIC int typecode_for_comparison(int typecode) {
+STATIC int typecode_for_comparison(int typecode, bool *is_unsigned) {
     if (typecode == BYTEARRAY_TYPECODE) {
         typecode = 'B';
     }
     if (typecode <= 'Z') {
         typecode += 32; // to lowercase
+        *is_unsigned = true;
     }
     return typecode;
 }
@@ -322,7 +323,11 @@ STATIC mp_obj_t array_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs
             return mp_const_false;
         }
 
-        case MP_BINARY_OP_EQUAL: {
+        case MP_BINARY_OP_EQUAL:
+        case MP_BINARY_OP_LESS:
+        case MP_BINARY_OP_LESS_EQUAL:
+        case MP_BINARY_OP_MORE:
+        case MP_BINARY_OP_MORE_EQUAL: {
             mp_buffer_info_t lhs_bufinfo;
             mp_buffer_info_t rhs_bufinfo;
             array_get_buffer(lhs_in, &lhs_bufinfo, MP_BUFFER_READ);
@@ -333,11 +338,13 @@ STATIC mp_obj_t array_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs
             // The type doesn't matter: array/bytearray/str/bytes all have the same buffer layout, so
             // just check if the typecodes are compatible; for testing equality the types should have the
             // same code except for signedness, and not be floating point because nan never equals nan.
+            // For > and < the types should be the same and unsigned.
             // Note that typecode_for_comparison always returns lowercase letters to save code size.
             // No need for (& TYPECODE_MASK) here: xxx_get_buffer already takes care of that.
-            const int lhs_code = typecode_for_comparison(lhs_bufinfo.typecode);
-            const int rhs_code = typecode_for_comparison(rhs_bufinfo.typecode);
-            if (lhs_code == rhs_code && lhs_code != 'f' && lhs_code != 'd') {
+            bool is_unsigned = false;
+            const int lhs_code = typecode_for_comparison(lhs_bufinfo.typecode, &is_unsigned);
+            const int rhs_code = typecode_for_comparison(rhs_bufinfo.typecode, &is_unsigned);
+            if (lhs_code == rhs_code && lhs_code != 'f' && lhs_code != 'd' && (op == MP_BINARY_OP_EQUAL || is_unsigned)) {
                 return mp_obj_new_bool(mp_seq_cmp_bytes(op, lhs_bufinfo.buf, lhs_bufinfo.len, rhs_bufinfo.buf, rhs_bufinfo.len));
             }
             // mp_obj_equal_not_equal treats returning MP_OBJ_NULL as 'fall back to pointer comparison'
diff --git a/tests/basics/array1.py b/tests/basics/array1.py
index 15789e2c99..f21ad4bd75 100644
--- a/tests/basics/array1.py
+++ b/tests/basics/array1.py
@@ -66,3 +66,24 @@ print(X('b', [0x61, 0x62, 0x63]) == b'abc')
 print(X('b', [0x61, 0x62, 0x63]) != b'abc')
 print(X('b', [0x61, 0x62, 0x63]) == array.array('b', [0x61, 0x62, 0x63]))
 print(X('b', [0x61, 0x62, 0x63]) != array.array('b', [0x61, 0x62, 0x63]))
+
+# other comparisons
+for typecode in ["B", "H", "I", "L", "Q"]:
+    a = array.array(typecode, [1, 1])
+    print(a < a)
+    print(a <= a)
+    print(a > a)
+    print(a >= a)
+
+    al = array.array(typecode, [1, 0])
+    ab = array.array(typecode, [1, 2])
+
+    print(a < al)
+    print(a <= al)
+    print(a > al)
+    print(a >= al)
+
+    print(a < ab)
+    print(a <= ab)
+    print(a > ab)
+    print(a >= ab)
diff --git a/tests/basics/bytearray1.py b/tests/basics/bytearray1.py
index b598500264..d12292e879 100644
--- a/tests/basics/bytearray1.py
+++ b/tests/basics/bytearray1.py
@@ -27,6 +27,26 @@ print(bytearray([1]) == b"1")
 print(b"1" == bytearray([1]))
 print(bytearray() == bytearray())
 
+b1 = bytearray([1, 2, 3])
+b2 = bytearray([1, 2, 3])
+b3 = bytearray([1, 3])
+print(b1 == b2)
+print(b2 != b3)
+print(b1 <= b2)
+print(b1 <= b3)
+print(b1 < b3)
+print(b1 >= b2)
+print(b3 >= b2)
+print(b3 > b2)
+print(b1 != b2)
+print(b2 == b3)
+print(b1 > b2)
+print(b1 > b3)
+print(b1 >= b3)
+print(b1 < b2)
+print(b3 < b2)
+print(b3 <= b2)
+
 # comparison with other type should return False
 print(bytearray() == 1)
 

From 43e7e5f00a601b36b5b39f1fef036d6c25d5562c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 11 May 2021 12:54:03 +1000
Subject: [PATCH 109/349] lib/lwip: Switch to use GitHub mirror repo.

It is hopefully more reliable.

Signed-off-by: Damien George <damien@micropython.org>
---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index ceaa5342b4..faa89c4f5c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,7 +7,7 @@
 	url = https://github.com/atgreen/libffi
 [submodule "lib/lwip"]
 	path = lib/lwip
-	url = https://git.savannah.gnu.org/r/lwip.git
+	url = https://github.com/lwip-tcpip/lwip.git
 [submodule "lib/berkeley-db-1.xx"]
 	path = lib/berkeley-db-1.xx
 	url = https://github.com/pfalcon/berkeley-db-1.xx

From 94a3f8a4b0b29e49b8f83c522b5478c94e4d3643 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 11 May 2021 08:24:36 -0500
Subject: [PATCH 110/349] tests/run-tests.py: Parallelize running tests by
 default.

This significantly reduces the time taken to run the test suite (on the
unix port).  Use `-j1` to disable this feature.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 tests/run-tests.py | 92 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 71 insertions(+), 21 deletions(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index a5a9b60637..619df5ed36 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -8,6 +8,10 @@ import argparse
 import inspect
 import re
 from glob import glob
+import multiprocessing
+from multiprocessing.pool import ThreadPool
+import threading
+import tempfile
 
 # See stackoverflow.com/questions/2632199: __file__ nor sys.argv[0]
 # are guaranteed to always work, this one should though.
@@ -157,12 +161,14 @@ def run_micropython(pyb, args, test_file, is_special=False):
 
             # if running via .mpy, first compile the .py file
             if args.via_mpy:
+                mpy_modname = tempfile.mktemp(dir="")
+                mpy_filename = mpy_modname + ".mpy"
                 subprocess.check_output(
                     [MPYCROSS]
                     + args.mpy_cross_flags.split()
-                    + ["-o", "mpytest.mpy", "-X", "emit=" + args.emit, test_file]
+                    + ["-o", mpy_filename, "-X", "emit=" + args.emit, test_file]
                 )
-                cmdlist.extend(["-m", "mpytest"])
+                cmdlist.extend(["-m", mpy_modname])
             else:
                 cmdlist.append(test_file)
 
@@ -175,7 +181,7 @@ def run_micropython(pyb, args, test_file, is_special=False):
 
             # clean up if we had an intermediate .mpy file
             if args.via_mpy:
-                rm_f("mpytest.mpy")
+                rm_f(mpy_filename)
 
     else:
         # run on pyboard
@@ -247,12 +253,32 @@ def run_feature_check(pyb, args, base_path, test_file):
     return run_micropython(pyb, args, base_path("feature_check", test_file), is_special=True)
 
 
-def run_tests(pyb, tests, args, result_dir):
-    test_count = 0
-    testcase_count = 0
-    passed_count = 0
-    failed_tests = []
-    skipped_tests = []
+class ThreadSafeCounter:
+    def __init__(self, start=0):
+        self._value = start
+        self._lock = threading.Lock()
+
+    def increment(self):
+        self.add(1)
+
+    def add(self, to_add):
+        with self._lock:
+            self._value += to_add
+
+    def append(self, arg):
+        self.add([arg])
+
+    @property
+    def value(self):
+        return self._value
+
+
+def run_tests(pyb, tests, args, result_dir, num_threads=1):
+    test_count = ThreadSafeCounter()
+    testcase_count = ThreadSafeCounter()
+    passed_count = ThreadSafeCounter()
+    failed_tests = ThreadSafeCounter([])
+    skipped_tests = ThreadSafeCounter([])
 
     skip_tests = set()
     skip_native = False
@@ -490,7 +516,7 @@ def run_tests(pyb, tests, args, result_dir):
         )  # native doesn't have proper traceback info
         skip_tests.add("micropython/schedule.py")  # native code doesn't check pending events
 
-    for test_file in tests:
+    def run_one_test(test_file):
         test_file = test_file.replace("\\", "/")
 
         if args.filters:
@@ -500,7 +526,7 @@ def run_tests(pyb, tests, args, result_dir):
                 if pat.search(test_file):
                     verdict = action
             if verdict == "exclude":
-                continue
+                return
 
         test_basename = test_file.replace("..", "_").replace("./", "").replace("/", "_")
         test_name = os.path.splitext(os.path.basename(test_file))[0]
@@ -533,12 +559,12 @@ def run_tests(pyb, tests, args, result_dir):
         if args.list_tests:
             if not skip_it:
                 print(test_file)
-            continue
+            return
 
         if skip_it:
             print("skip ", test_file)
             skipped_tests.append(test_name)
-            continue
+            return
 
         # get expected output
         test_file_expected = test_file + ".exp"
@@ -560,7 +586,7 @@ def run_tests(pyb, tests, args, result_dir):
         output_expected = output_expected.replace(b"\r\n", b"\n")
 
         if args.write_exp:
-            continue
+            return
 
         # run MicroPython
         output_mupy = run_micropython(pyb, args, test_file)
@@ -568,16 +594,16 @@ def run_tests(pyb, tests, args, result_dir):
         if output_mupy == b"SKIP\n":
             print("skip ", test_file)
             skipped_tests.append(test_name)
-            continue
+            return
 
-        testcase_count += len(output_expected.splitlines())
+        testcase_count.add(len(output_expected.splitlines()))
 
         filename_expected = os.path.join(result_dir, test_basename + ".exp")
         filename_mupy = os.path.join(result_dir, test_basename + ".out")
 
         if output_expected == output_mupy:
             print("pass ", test_file)
-            passed_count += 1
+            passed_count.increment()
             rm_f(filename_expected)
             rm_f(filename_mupy)
         else:
@@ -588,16 +614,32 @@ def run_tests(pyb, tests, args, result_dir):
             print("FAIL ", test_file)
             failed_tests.append(test_name)
 
-        test_count += 1
+        test_count.increment()
+
+    if pyb or args.list_tests:
+        num_threads = 1
+
+    if num_threads > 1:
+        pool = ThreadPool(num_threads)
+        pool.map(run_one_test, tests)
+    else:
+        for test in tests:
+            run_one_test(test)
 
     if args.list_tests:
         return True
 
-    print("{} tests performed ({} individual testcases)".format(test_count, testcase_count))
-    print("{} tests passed".format(passed_count))
+    print(
+        "{} tests performed ({} individual testcases)".format(
+            test_count.value, testcase_count.value
+        )
+    )
+    print("{} tests passed".format(passed_count.value))
 
+    skipped_tests = sorted(skipped_tests.value)
     if len(skipped_tests) > 0:
         print("{} tests skipped: {}".format(len(skipped_tests), " ".join(skipped_tests)))
+    failed_tests = sorted(failed_tests.value)
     if len(failed_tests) > 0:
         print("{} tests failed: {}".format(len(failed_tests), " ".join(failed_tests)))
         return False
@@ -698,6 +740,14 @@ the last matching regex is used:
     cmd_parser.add_argument(
         "--keep-path", action="store_true", help="do not clear MICROPYPATH when running tests"
     )
+    cmd_parser.add_argument(
+        "-j",
+        "--jobs",
+        default=multiprocessing.cpu_count(),
+        metavar="N",
+        type=int,
+        help="Number of tests to run simultaneously",
+    )
     cmd_parser.add_argument("files", nargs="*", help="input test files")
     cmd_parser.add_argument(
         "--print-failures",
@@ -800,7 +850,7 @@ the last matching regex is used:
 
     try:
         os.makedirs(args.result_dir, exist_ok=True)
-        res = run_tests(pyb, tests, args, args.result_dir)
+        res = run_tests(pyb, tests, args, args.result_dir, args.jobs)
     finally:
         if pyb:
             pyb.close()

From 30cbcf881daeecbc100554879e8a92d71185d9f6 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 30 Apr 2021 14:24:44 +1000
Subject: [PATCH 111/349] docs/esp32: Add APA106 to quickref.

---
 docs/esp32/quickref.rst | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index a569ff0a4e..68938feedc 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -483,10 +483,10 @@ Be sure to put a 4.7k pull-up resistor on the data line.  Note that
 the ``convert_temp()`` method must be called each time you want to
 sample the temperature.
 
-NeoPixel driver
----------------
+NeoPixel and APA106 driver
+--------------------------
 
-Use the ``neopixel`` module::
+Use the ``neopixel`` and ``apa106`` modules::
 
     from machine import Pin
     from neopixel import NeoPixel
@@ -497,6 +497,13 @@ Use the ``neopixel`` module::
     np.write()              # write data to all pixels
     r, g, b = np[0]         # get first pixel colour
 
+
+The APA106 driver extends NeoPixel, but internally uses a different colour order::
+
+    from apa106 import APA106
+    ap = APA106(pin, 8)
+    r, g, b = ap[0]
+
 For low-level driving of a NeoPixel::
 
     import esp
@@ -508,6 +515,7 @@ For low-level driving of a NeoPixel::
    400kHz) devices by passing ``timing=0`` when constructing the
    ``NeoPixel`` object.
 
+APA102 (DotStar) uses a different driver as it has an additional clock pin.
 
 Capacitive touch
 ----------------

From 85c51a548fc83d0776029b01b1be3748f82e296a Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 30 Apr 2021 15:57:20 +1000
Subject: [PATCH 112/349] docs/esp32: Mention Signal in GPIO section of
 quickref.

---
 docs/esp32/quickref.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 68938feedc..1709891265 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -171,6 +171,10 @@ Notes:
 * The pull value of some pins can be set to ``Pin.PULL_HOLD`` to reduce power
   consumption during deepsleep.
 
+There's a higher-level abstraction :ref:`machine.Signal <machine.Signal>`
+which can be used to invert a pin. Useful for illuminating active-low LEDs
+using ``on()`` or ``value(1)``.
+
 UART (serial bus)
 -----------------
 

From d43ed087aee3444a96da059dfdb532c810f7656c Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 30 Apr 2021 15:54:28 +1000
Subject: [PATCH 113/349] docs/esp8266: Mention Signal in GPIO section of
 quickref.

---
 docs/esp8266/quickref.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/esp8266/quickref.rst b/docs/esp8266/quickref.rst
index af2ef1ca1a..c4fa779c21 100644
--- a/docs/esp8266/quickref.rst
+++ b/docs/esp8266/quickref.rst
@@ -138,6 +138,10 @@ Also note that Pin(16) is a special pin (used for wakeup from deepsleep
 mode) and may be not available for use with higher-level classes like
 ``Neopixel``.
 
+There's a higher-level abstraction :ref:`machine.Signal <machine.Signal>`
+which can be used to invert a pin. Useful for illuminating active-low LEDs
+using ``on()`` or ``value(1)``.
+
 UART (serial bus)
 -----------------
 

From 97fee47716627b06bfb11dbcc43f6a000d6e7257 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 30 Apr 2021 14:00:13 +1000
Subject: [PATCH 114/349] docs/esp8266: Add SSD1306 to quickref and tutorial.

---
 docs/esp8266/quickref.rst         | 14 +++++
 docs/esp8266/tutorial/index.rst   |  1 +
 docs/esp8266/tutorial/ssd1306.rst | 93 +++++++++++++++++++++++++++++++
 3 files changed, 108 insertions(+)
 create mode 100644 docs/esp8266/tutorial/ssd1306.rst

diff --git a/docs/esp8266/quickref.rst b/docs/esp8266/quickref.rst
index c4fa779c21..bc648a348a 100644
--- a/docs/esp8266/quickref.rst
+++ b/docs/esp8266/quickref.rst
@@ -424,6 +424,20 @@ The DHT driver is implemented in software and works on all pins::
     d.temperature() # eg. 23.6 (°C)
     d.humidity()    # eg. 41.3 (% RH)
 
+SSD1306 driver
+--------------
+
+Driver for SSD1306 monochrome OLED displays. See tutorial :ref:`ssd1306`. ::
+
+    from machine import Pin, I2C
+    import ssd1306
+
+    i2c = I2C(scl=Pin(5), sda=Pin(4), freq=100000)
+    display = ssd1306.SSD1306_I2C(128, 64, i2c)
+
+    display.text('Hello World', 0, 0, 1)
+    display.show()
+
 WebREPL (web browser interactive prompt)
 ----------------------------------------
 
diff --git a/docs/esp8266/tutorial/index.rst b/docs/esp8266/tutorial/index.rst
index 4ba211a4b2..79ebd92279 100644
--- a/docs/esp8266/tutorial/index.rst
+++ b/docs/esp8266/tutorial/index.rst
@@ -31,4 +31,5 @@ to `<https://www.python.org>`__.
    neopixel.rst
    apa102.rst
    dht.rst
+   ssd1306.rst
    nextsteps.rst
diff --git a/docs/esp8266/tutorial/ssd1306.rst b/docs/esp8266/tutorial/ssd1306.rst
new file mode 100644
index 0000000000..4dca82afc4
--- /dev/null
+++ b/docs/esp8266/tutorial/ssd1306.rst
@@ -0,0 +1,93 @@
+.. _ssd1306:
+
+Using a SSD1306 OLED display
+============================
+
+The SSD1306 OLED display uses either a SPI or I2C interface and comes in a variety of
+sizes (128x64, 128x32, 72x40, 64x48) and colours (white, yellow, blue, yellow + blue).
+
+Hardware SPI interface::
+
+    from machine import Pin, SPI
+    import ssd1306
+
+    hspi = SPI(1)  # sck=14 (scl), mosi=13 (sda), miso=12 (unused)
+
+    dc = Pin(4)    # data/command
+    rst = Pin(5)   # reset
+    cs = Pin(15)   # chip select, some modules do not have a pin for this
+
+    display = ssd1306.SSD1306_SPI(128, 64, hspi, dc, rst, cs)
+
+Software SPI interface::
+
+    from machine import Pin, SoftSPI
+    import ssd1306
+
+    spi = SoftSPI(baudrate=500000, polarity=1, phase=0, sck=Pin(14), mosi=Pin(13), miso=Pin(12))
+
+    dc = Pin(4)   # data/command
+    rst = Pin(5)  # reset
+    cs = Pin(15)  # chip select, some modules do not have a pin for this
+
+    display = ssd1306.SSD1306_SPI(128, 64, spi, dc, rst, cs)
+
+I2C interface::
+
+    from machine import Pin, I2C
+    import ssd1306
+
+    # using default address 0x3C
+    i2c = I2C(sda=Pin(4), scl=Pin(5))
+    display = ssd1306.SSD1306_I2C(128, 64, i2c)
+
+Print Hello World on the first line::
+
+    display.text('Hello, World!', 0, 0, 1)
+    display.show()
+
+Basic functions::
+
+    display.poweroff()     # power off the display, pixels persist in memory
+    display.poweron()      # power on the display, pixels redrawn
+    display.contrast(0)    # dim
+    display.contrast(255)  # bright
+    display.invert(1)      # display inverted
+    display.invert(0)      # display normal
+    display.rotate(True)   # rotate 180 degrees
+    display.rotate(False)  # rotate 0 degrees
+    display.show()         # write the contents of the FrameBuffer to display memory
+
+Subclassing FrameBuffer provides support for graphics primitives::
+
+    display.fill(0)                         # fill entire screen with colour=0
+    display.pixel(0, 10)                    # get pixel at x=0, y=10
+    display.pixel(0, 10, 1)                 # set pixel at x=0, y=10 to colour=1
+    display.hline(0, 8, 4, 1)               # draw horizontal line x=0, y=8, width=4, colour=1
+    display.vline(0, 8, 4, 1)               # draw vertical line x=0, y=8, height=4, colour=1
+    display.line(0, 0, 127, 63, 1)          # draw a line from 0,0 to 127,63
+    display.rect(10, 10, 107, 43, 1)        # draw a rectangle outline 10,10 to 107,43, colour=1
+    display.fill_rect(10, 10, 107, 43, 1)   # draw a solid rectangle 10,10 to 107,43, colour=1
+    display.text('Hello World', 0, 0, 1)    # draw some text at x=0, y=0, colour=1
+    display.scroll(20, 0)                   # scroll 20 pixels to the right
+
+    # draw another FrameBuffer on top of the current one at the given coordinates
+    import framebuf
+    fbuf = framebuf.FrameBuffer(bytearray(8 * 8 * 1), 8, 8, framebuf.MONO_VLSB)
+    fbuf.line(0, 0, 7, 7, 1)
+    display.blit(fbuf, 10, 10, 0)           # draw on top at x=10, y=10, key=0
+    display.show()
+
+Draw the MicroPython logo and print some text::
+
+    display.fill(0)
+    display.fill_rect(0, 0, 32, 32, 1)
+    display.fill_rect(2, 2, 28, 28, 0)
+    display.vline(9, 8, 22, 1)
+    display.vline(16, 2, 22, 1)
+    display.vline(23, 8, 22, 1)
+    display.fill_rect(26, 24, 2, 4, 1)
+    display.text('MicroPython', 40, 0, 1)
+    display.text('SSD1306', 40, 12, 1)
+    display.text('OLED 128x64', 40, 24, 1)
+    display.show()

From 538b9a9be5e914eae302d31d8ddedec0f049482a Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 14 May 2021 13:23:44 +1000
Subject: [PATCH 115/349] esp32/machine_i2c: Allow boards to configure I2C pins
 using new macros.

Following how SPI is configured (and how stm32 does it).
---
 ports/esp32/machine_i2c.c | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index fd5180b8d0..d9003f45b5 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -32,14 +32,19 @@
 
 #include "driver/i2c.h"
 
-#define I2C_0_DEFAULT_SCL (GPIO_NUM_18)
-#define I2C_0_DEFAULT_SDA (GPIO_NUM_19)
+#ifndef MICROPY_HW_I2C0_SCL
+#define MICROPY_HW_I2C0_SCL (GPIO_NUM_18)
+#define MICROPY_HW_I2C0_SDA (GPIO_NUM_19)
+#endif
+
+#ifndef MICROPY_HW_I2C1_SCL
 #if CONFIG_IDF_TARGET_ESP32
-#define I2C_1_DEFAULT_SCL (GPIO_NUM_25)
-#define I2C_1_DEFAULT_SDA (GPIO_NUM_26)
+#define MICROPY_HW_I2C1_SCL (GPIO_NUM_25)
+#define MICROPY_HW_I2C1_SDA (GPIO_NUM_26)
 #else
-#define I2C_1_DEFAULT_SCL (GPIO_NUM_9)
-#define I2C_1_DEFAULT_SDA (GPIO_NUM_8)
+#define MICROPY_HW_I2C1_SCL (GPIO_NUM_9)
+#define MICROPY_HW_I2C1_SDA (GPIO_NUM_8)
+#endif
 #endif
 
 #define I2C_DEFAULT_TIMEOUT_US (10000) // 10ms
@@ -149,11 +154,11 @@ mp_obj_t machine_hw_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_
         self->base.type = &machine_hw_i2c_type;
         self->port = i2c_id;
         if (self->port == I2C_NUM_0) {
-            self->scl = I2C_0_DEFAULT_SCL;
-            self->sda = I2C_0_DEFAULT_SDA;
+            self->scl = MICROPY_HW_I2C0_SCL;
+            self->sda = MICROPY_HW_I2C0_SDA;
         } else {
-            self->scl = I2C_1_DEFAULT_SCL;
-            self->sda = I2C_1_DEFAULT_SDA;
+            self->scl = MICROPY_HW_I2C1_SCL;
+            self->sda = MICROPY_HW_I2C1_SDA;
         }
         first_init = true;
     }

From 9e65662a11c37599299ba4ab9c3ddf0510306498 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 14 May 2021 14:00:01 +1000
Subject: [PATCH 116/349] esp32/boards: Set default I2C and SPI pins on UM_xxx
 boards.

And fix incorrect I2C and SPI pins in the feathers2 module.
---
 ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py | 8 ++++----
 ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h      | 9 ++++++++-
 ports/esp32/boards/UM_TINYPICO/mpconfigboard.h       | 3 +++
 ports/esp32/boards/UM_TINYS2/mpconfigboard.h         | 3 +++
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py b/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py
index 32126fc9c9..93c50a1810 100644
--- a/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py
+++ b/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py
@@ -22,12 +22,12 @@ DOTSTAR_DATA = const(40)
 
 # SPI
 SPI_MOSI = const(35)
-SPI_MISO = const(36)
-SPI_CLK = const(37)
+SPI_MISO = const(37)
+SPI_CLK = const(36)
 
 # I2C
-I2C_SDA = const(38)
-I2C_SCL = const(33)
+I2C_SDA = const(8)
+I2C_SCL = const(9)
 
 # DAC
 DAC1 = const(17)
diff --git a/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h b/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h
index c045adccd9..8d0c9f78c8 100644
--- a/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h
+++ b/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h
@@ -2,4 +2,11 @@
 #define MICROPY_HW_MCU_NAME "ESP32-S2"
 
 #define MICROPY_PY_BLUETOOTH                (0)
-#define MICROPY_HW_ENABLE_SDCARD            (0)
\ No newline at end of file
+#define MICROPY_HW_ENABLE_SDCARD            (0)
+
+#define MICROPY_HW_I2C0_SCL (9)
+#define MICROPY_HW_I2C0_SDA (8)
+
+#define MICROPY_HW_SPI1_MOSI (35)  // SDO
+#define MICROPY_HW_SPI1_MISO (37)  // SDI
+#define MICROPY_HW_SPI1_SCK (36)
diff --git a/ports/esp32/boards/UM_TINYPICO/mpconfigboard.h b/ports/esp32/boards/UM_TINYPICO/mpconfigboard.h
index 05ee5eaf72..6bf70cc13b 100644
--- a/ports/esp32/boards/UM_TINYPICO/mpconfigboard.h
+++ b/ports/esp32/boards/UM_TINYPICO/mpconfigboard.h
@@ -1,6 +1,9 @@
 #define MICROPY_HW_BOARD_NAME "TinyPICO"
 #define MICROPY_HW_MCU_NAME "ESP32-PICO-D4"
 
+#define MICROPY_HW_I2C0_SCL (22)
+#define MICROPY_HW_I2C0_SDA (21)
+
 #define MICROPY_HW_SPI1_SCK (18)
 #define MICROPY_HW_SPI1_MOSI (23)
 #define MICROPY_HW_SPI1_MISO (19)
diff --git a/ports/esp32/boards/UM_TINYS2/mpconfigboard.h b/ports/esp32/boards/UM_TINYS2/mpconfigboard.h
index 87d266e58c..1052f6d79c 100644
--- a/ports/esp32/boards/UM_TINYS2/mpconfigboard.h
+++ b/ports/esp32/boards/UM_TINYS2/mpconfigboard.h
@@ -4,6 +4,9 @@
 #define MICROPY_PY_BLUETOOTH                (0)
 #define MICROPY_HW_ENABLE_SDCARD            (0)
 
+#define MICROPY_HW_I2C0_SCL (9)
+#define MICROPY_HW_I2C0_SDA (8)
+
 #define MICROPY_HW_SPI1_MOSI (35)
 #define MICROPY_HW_SPI1_MISO (36)
 #define MICROPY_HW_SPI1_SCK (37)

From 605b74f390e1ce9acdbca32d0b3215d37b96852e Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 14 May 2021 15:36:59 +1000
Subject: [PATCH 117/349] esp32/boards: Fix spelling mistakes in comments for
 UM_xxx boards.

---
 ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py |  4 ++--
 ports/esp32/boards/UM_TINYPICO/modules/tinypico.py   |  2 +-
 ports/esp32/boards/UM_TINYS2/modules/tinys2.py       | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py b/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py
index 93c50a1810..95e1f52681 100644
--- a/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py
+++ b/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py
@@ -50,7 +50,7 @@ def toggle_led(state):
     l.value(not l.value())
 
 
-# Create ADC and set attenuation and return teh ambient light value from the onboard sensor
+# Create ADC and set attenuation and return the ambient light value from the onboard sensor
 def get_amb_light():
     adc = ADC(Pin(AMB_LIGHT))
     adc.atten(ADC.ATTN_11DB)
@@ -62,7 +62,7 @@ def get_amb_light():
 # prevent parasitic power from lighting the LED even with the LDO off, causing current use.
 # The DotStar is a beautiful LED, but parasitic power makes it a terrible choice for battery use :(
 def set_ldo2_power(state):
-    """Set the power for the on-board Dostar to allow no current draw when not needed."""
+    """Set the power for the on-board Dotstar to allow no current draw when not needed."""
     # Set the power pin to the inverse of state
     ldo2 = Pin(LDO2, Pin.OUT)
     ldo2.value(state)
diff --git a/ports/esp32/boards/UM_TINYPICO/modules/tinypico.py b/ports/esp32/boards/UM_TINYPICO/modules/tinypico.py
index 846e07960a..04b274bb53 100644
--- a/ports/esp32/boards/UM_TINYPICO/modules/tinypico.py
+++ b/ports/esp32/boards/UM_TINYPICO/modules/tinypico.py
@@ -80,7 +80,7 @@ def get_battery_charging():
 # need to be able to cut power to it to minimise power consumption during deep sleep or with general battery powered use
 # to minimise unneeded battery drain
 def set_dotstar_power(state):
-    """Set the power for the on-board Dostar to allow no current draw when not needed."""
+    """Set the power for the on-board Dotstar to allow no current draw when not needed."""
     # Set the power pin to the inverse of state
     if state:
         Pin(DOTSTAR_PWR, Pin.OUT, None)  # Break the PULL_HOLD on the pin
diff --git a/ports/esp32/boards/UM_TINYS2/modules/tinys2.py b/ports/esp32/boards/UM_TINYS2/modules/tinys2.py
index ca59cb1235..0a3eaf14d4 100644
--- a/ports/esp32/boards/UM_TINYS2/modules/tinys2.py
+++ b/ports/esp32/boards/UM_TINYS2/modules/tinys2.py
@@ -38,7 +38,7 @@ DAC2 = const(18)
 
 # Helper functions
 def set_pixel_power(state):
-    """Enable or Disable power to the onboard NeoPixel to either show colour, or to reduce power fro deep sleep."""
+    """Enable or Disable power to the onboard NeoPixel to either show colour, or to reduce power for deep sleep."""
     Pin(RGB_PWR, Pin.OUT).value(state)
 
 
@@ -59,7 +59,7 @@ def get_vbus_present():
     return Pin(VBUS_SENSE, Pin.IN).value() == 1
 
 
-# Dotstar rainbow colour wheel
+# NeoPixel rainbow colour wheel
 def rgb_color_wheel(wheel_pos):
     """Color wheel to allow for cycling through the rainbow of RGB colors."""
     wheel_pos = wheel_pos % 255
@@ -74,9 +74,9 @@ def rgb_color_wheel(wheel_pos):
         return wheel_pos * 3, 255 - wheel_pos * 3, 0
 
 
-# Go into deep sleep but shut down the APA first to save power
-# Use this if you want lowest deep  sleep current
+# Go into deep sleep but shut down the RGB LED first to save power
+# Use this if you want lowest deep sleep current
 def go_deepsleep(t):
-    """Deep sleep helper that also powers down the on-board Dotstar."""
+    """Deep sleep helper that also powers down the on-board NeoPixel."""
     set_pixel_power(False)
     machine.deepsleep(t)

From 47e6c52f0c2bf058c5d099dd2993192e0978e172 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 14 May 2021 22:05:03 +1000
Subject: [PATCH 118/349] tests/cpydiff: Add test and workaround for
 function.__module__ attr.

MicroPython does not store any reference from a function object to the
module it was defined in, but there is a way to use function.__globals__ to
indirectly get the module.

See issue #7259.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/cpydiff/core_function_moduleattr.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 tests/cpydiff/core_function_moduleattr.py

diff --git a/tests/cpydiff/core_function_moduleattr.py b/tests/cpydiff/core_function_moduleattr.py
new file mode 100644
index 0000000000..71747c1f40
--- /dev/null
+++ b/tests/cpydiff/core_function_moduleattr.py
@@ -0,0 +1,13 @@
+"""
+categories: Core,Functions
+description: Function objects do not have the ``__module__`` attribute
+cause: MicroPython is optimized for reduced code size and RAM usage.
+workaround: Use ``sys.modules[function.__globals__['__name__']]`` for non-builtin modules.
+"""
+
+
+def f():
+    pass
+
+
+print(f.__module__)

From 1446107b4d24915143f8212c2f649a0e628735cc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 18 May 2021 00:22:53 +1000
Subject: [PATCH 119/349] py/objarray: Use mp_obj_memoryview_init helper in
 mp_obj_new_memoryview.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objarray.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/py/objarray.c b/py/objarray.c
index 5bd9454716..be85674f87 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -201,11 +201,7 @@ STATIC mp_obj_t bytearray_make_new(const mp_obj_type_t *type_in, size_t n_args,
 
 mp_obj_t mp_obj_new_memoryview(byte typecode, size_t nitems, void *items) {
     mp_obj_array_t *self = m_new_obj(mp_obj_array_t);
-    self->base.type = &mp_type_memoryview;
-    self->typecode = typecode;
-    self->memview_offset = 0;
-    self->len = nitems;
-    self->items = items;
+    mp_obj_memoryview_init(self, typecode, 0, nitems, items);
     return MP_OBJ_FROM_PTR(self);
 }
 

From 6d2680fa36696fd0b2fd7a595f4a26153cd84e07 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 18 May 2021 00:23:13 +1000
Subject: [PATCH 120/349] py/objarray: Fix constructing a memoryview from a
 memoryview.

Fixes issue #7261.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objarray.c                 |  8 ++++++++
 tests/basics/memoryview_gc.py | 10 ++++++++++
 2 files changed, 18 insertions(+)

diff --git a/py/objarray.c b/py/objarray.c
index be85674f87..16a4d4aac7 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -220,6 +220,14 @@ STATIC mp_obj_t memoryview_make_new(const mp_obj_type_t *type_in, size_t n_args,
         bufinfo.len / mp_binary_get_size('@', bufinfo.typecode, NULL),
         bufinfo.buf));
 
+    // If the input object is a memoryview then need to point the items of the
+    // new memoryview to the start of the buffer so the GC can trace it.
+    if (mp_obj_get_type(args[0]) == &mp_type_memoryview) {
+        mp_obj_array_t *other = MP_OBJ_TO_PTR(args[0]);
+        self->memview_offset = other->memview_offset;
+        self->items = other->items;
+    }
+
     // test if the object can be written to
     if (mp_get_buffer(args[0], &bufinfo, MP_BUFFER_RW)) {
         self->typecode |= MP_OBJ_ARRAY_TYPECODE_FLAG_RW; // indicate writable buffer
diff --git a/tests/basics/memoryview_gc.py b/tests/basics/memoryview_gc.py
index d366cbbb15..5cd6124ada 100644
--- a/tests/basics/memoryview_gc.py
+++ b/tests/basics/memoryview_gc.py
@@ -21,3 +21,13 @@ for i in range(100000):
 
 # check that the memoryview is still what we want
 print(list(m))
+
+# check that creating a memoryview of a memoryview retains the underlying data
+m = None
+gc.collect()  # cleanup from previous test
+m = memoryview(memoryview(bytearray(i for i in range(50)))[5:-5])
+print(sum(m), list(m[:10]))
+gc.collect()
+for i in range(10):
+    list(range(10))  # allocate memory to overwrite any reclaimed heap
+print(sum(m), list(m[:10]))

From 126b1c727118352923703719a2a3d45b9fad3c97 Mon Sep 17 00:00:00 2001
From: Bob Abeles <phil99boyd@gmail.com>
Date: Fri, 14 May 2021 07:57:19 -0700
Subject: [PATCH 121/349] py/nlraarch64: Add underscore prefix to function
 symbols for Darwin ABI.

The proper way to do this is to test for __APPLE__ and __MACH__, where
__APPLE__ tests for an Apple OS and __MACH__ tests that it is based on CMU
Mach.  Using both tests ensures that just Darwin (Apple's open source base
for MacOS, iOS, etc.) is recognized. __APPLE__ by itself will test for any
Apple OS, which can include older OS 7-9 and any future Apple OS. __MACH__
tests for any OS based on CMU Mach, including Darwin and GNU Hurd.

Fixes #7232.
---
 py/nlraarch64.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/py/nlraarch64.c b/py/nlraarch64.c
index 2df0dc9c85..1295351cbe 100644
--- a/py/nlraarch64.c
+++ b/py/nlraarch64.c
@@ -34,8 +34,13 @@
 // Implemented purely as inline assembly; inside a function, we have to deal with undoing the prologue, restoring
 // SP and LR. This way, we don't.
 __asm(
+    #if defined(__APPLE__) && defined(__MACH__)
+    "_nlr_push:              \n"
+    ".global _nlr_push       \n"
+    #else
     "nlr_push:               \n"
     ".global nlr_push        \n"
+    #endif
     "mov x9, sp              \n"
     "stp lr,  x9,  [x0,  #16]\n" // 16 == offsetof(nlr_buf_t, regs)
     "stp x19, x20, [x0,  #32]\n"
@@ -44,7 +49,11 @@ __asm(
     "stp x25, x26, [x0,  #80]\n"
     "stp x27, x28, [x0,  #96]\n"
     "str x29,      [x0, #112]\n"
+    #if defined(__APPLE__) && defined(__MACH__)
+    "b _nlr_push_tail        \n" // do the rest in C
+    #else
     "b nlr_push_tail         \n" // do the rest in C
+    #endif
     );
 
 NORETURN void nlr_jump(void *val) {

From 7ceccad4e2f1e9d073f5781c32e5b377e8391a25 Mon Sep 17 00:00:00 2001
From: Bob Abeles <phil99boyd@gmail.com>
Date: Fri, 14 May 2021 08:05:40 -0700
Subject: [PATCH 122/349] py/nlrx64: Correct the detection of Darwin ABI.

__APPLE__ tests for an Apple OS and __MACH__ tests that it is based on CMU
Mach.  Using both tests ensures that just Darwin is recognized.
---
 py/nlrx64.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/nlrx64.c b/py/nlrx64.c
index f5d02afbdb..6f006e755e 100644
--- a/py/nlrx64.c
+++ b/py/nlrx64.c
@@ -58,7 +58,7 @@ unsigned int nlr_push(nlr_buf_t *nlr) {
     #else
 
     __asm volatile (
-        #if defined(__APPLE__) || defined(__MACH__)
+        #if defined(__APPLE__) && defined(__MACH__)
         "pop    %rbp                \n" // undo function's prelude
         #endif
         "movq   (%rsp), %rax        \n" // load return %rip
@@ -70,7 +70,7 @@ unsigned int nlr_push(nlr_buf_t *nlr) {
         "movq   %r13, 56(%rdi)      \n" // store %r13 into nlr_buf
         "movq   %r14, 64(%rdi)      \n" // store %r14 into nlr_buf
         "movq   %r15, 72(%rdi)      \n" // store %r15 into nlr_buf
-        #if defined(__APPLE__) || defined(__MACH__)
+        #if defined(__APPLE__) && defined(__MACH__)
         "jmp    _nlr_push_tail      \n" // do the rest in C
         #else
         "jmp    nlr_push_tail       \n" // do the rest in C

From 94fb5e7f5a409e9596657508c6a9ed1c609de267 Mon Sep 17 00:00:00 2001
From: Bruno Martins <bruno963852@gmail.com>
Date: Fri, 14 May 2021 08:35:43 -0300
Subject: [PATCH 123/349] nrf: Add machine.memXX, and allow boards to customise
 some features.

---
 ports/nrf/modules/machine/modmachine.c | 4 ++++
 ports/nrf/mpconfigport.h               | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index 3330349cd5..7e45b83df8 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -201,6 +201,10 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_deepsleep),          MP_ROM_PTR(&machine_deepsleep_obj) },
     { MP_ROM_QSTR(MP_QSTR_reset_cause),        MP_ROM_PTR(&machine_reset_cause_obj) },
     { MP_ROM_QSTR(MP_QSTR_Pin),                MP_ROM_PTR(&pin_type) },
+    { MP_ROM_QSTR(MP_QSTR_mem8),               MP_ROM_PTR(&machine_mem8_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mem16),              MP_ROM_PTR(&machine_mem16_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mem32),              MP_ROM_PTR(&machine_mem32_obj) },
+    
 #if MICROPY_PY_MACHINE_UART
     { MP_ROM_QSTR(MP_QSTR_UART),               MP_ROM_PTR(&machine_hard_uart_type) },
 #endif
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index c246c53dd5..714b1cc24f 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -44,8 +44,6 @@
 #endif
 #define MICROPY_ALLOC_PATH_MAX      (512)
 #define MICROPY_PERSISTENT_CODE_LOAD (0)
-#define MICROPY_EMIT_THUMB          (0)
-#define MICROPY_EMIT_INLINE_THUMB   (0)
 #define MICROPY_COMP_MODULE_CONST   (0)
 #define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (0)
 #define MICROPY_READER_VFS          (MICROPY_VFS)
@@ -123,7 +121,6 @@
 #define MICROPY_PY_CMATH            (0)
 #define MICROPY_PY_IO               (0)
 #define MICROPY_PY_IO_FILEIO        (0)
-#define MICROPY_PY_UERRNO           (0)
 #define MICROPY_PY_URANDOM          (1)
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS (1)
 #define MICROPY_PY_UCTYPES          (0)
@@ -131,7 +128,6 @@
 #define MICROPY_PY_UJSON            (0)
 #define MICROPY_PY_URE              (0)
 #define MICROPY_PY_UHEAPQ           (0)
-#define MICROPY_PY_UHASHLIB         (0)
 #define MICROPY_PY_UTIME_MP_HAL     (1)
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_PULSE    (0)

From ea2d83e96175ef1ed260cca917024502e01a5546 Mon Sep 17 00:00:00 2001
From: Bruno Martins <bruno963852@gmail.com>
Date: Thu, 13 May 2021 18:18:04 -0300
Subject: [PATCH 124/349] nrf/boards: Add support for evk_nina_b3 board.

---
 ports/nrf/boards/evk_nina_b3/mpconfigboard.h  | 85 +++++++++++++++++++
 ports/nrf/boards/evk_nina_b3/mpconfigboard.mk |  7 ++
 ports/nrf/boards/evk_nina_b3/pins.csv         | 48 +++++++++++
 3 files changed, 140 insertions(+)
 create mode 100644 ports/nrf/boards/evk_nina_b3/mpconfigboard.h
 create mode 100644 ports/nrf/boards/evk_nina_b3/mpconfigboard.mk
 create mode 100644 ports/nrf/boards/evk_nina_b3/pins.csv

diff --git a/ports/nrf/boards/evk_nina_b3/mpconfigboard.h b/ports/nrf/boards/evk_nina_b3/mpconfigboard.h
new file mode 100644
index 0000000000..eaca796be4
--- /dev/null
+++ b/ports/nrf/boards/evk_nina_b3/mpconfigboard.h
@@ -0,0 +1,85 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Glenn Ruben Bakke
+ *
+ * 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.
+ */
+
+// Pin numbering scheme for nrf52840-based boards
+//
+// Software Pins 0-31 correspond to physical pins
+// 0.x and software Pins 32-47 correspond to physical pins 1.x.
+//
+// Example: Pin(47) would be 1.15 on the PCA10059
+
+// Board data
+#define MICROPY_HW_BOARD_NAME       "EVK_NINA_B3"
+#define MICROPY_HW_MCU_NAME         "NRF52840"
+#define MICROPY_PY_SYS_PLATFORM     "nrf52"
+
+// Enable @viper and @native
+#define MICROPY_EMIT_THUMB          (1)
+#define MICROPY_EMIT_INLINE_THUMB   (1)
+
+// Enable optional modules
+#define MICROPY_PY_UERRNO           (1)
+#define MICROPY_PY_UHASHLIB         (1)
+
+// Peripherals Config
+#define MICROPY_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_HW_PWM   (1)
+#define MICROPY_PY_MACHINE_HW_SPI   (1)
+#define MICROPY_PY_MACHINE_TIMER    (1)
+#define MICROPY_PY_MACHINE_RTCOUNTER (1)
+#define MICROPY_PY_MACHINE_I2C      (1)
+#define MICROPY_PY_MACHINE_ADC      (1)
+#define MICROPY_PY_MACHINE_TEMP     (1)
+#define MICROPY_HW_ENABLE_RNG       (1)
+
+// Configure LEDS
+#define MICROPY_HW_HAS_LED          (1)
+#define MICROPY_HW_LED_COUNT        (3)
+#define MICROPY_HW_LED_PULLUP       (1)
+#define MICROPY_HW_LED1             (13) // LED1 RED
+#define MICROPY_HW_LED2             (25) // LED2 GREEN
+#define MICROPY_HW_LED3             (32) // LED3 BLUE
+
+// UART config
+#define MICROPY_HW_UART1_RX         (29)
+#define MICROPY_HW_UART1_TX         (45)
+#define MICROPY_HW_UART1_CTS        (44)
+#define MICROPY_HW_UART1_RTS        (31)
+#define MICROPY_HW_UART1_HWFC       (1)
+
+// SPI config
+#define MICROPY_HW_SPI0_NAME        "SPI0"
+#define MICROPY_HW_SPI0_SCK         (12)
+#define MICROPY_HW_SPI0_MOSI        (14)
+#define MICROPY_HW_SPI0_MISO        (15)
+
+// PWM Names
+#define MICROPY_HW_PWM0_NAME        "PWM0"
+#define MICROPY_HW_PWM1_NAME        "PWM1"
+#define MICROPY_HW_PWM2_NAME        "PWM2"
+
+// How Many LED indexes appear in the help() message
+#define HELP_TEXT_BOARD_LED         "1,2,3"
diff --git a/ports/nrf/boards/evk_nina_b3/mpconfigboard.mk b/ports/nrf/boards/evk_nina_b3/mpconfigboard.mk
new file mode 100644
index 0000000000..ca555d3932
--- /dev/null
+++ b/ports/nrf/boards/evk_nina_b3/mpconfigboard.mk
@@ -0,0 +1,7 @@
+MCU_SERIES = m4
+MCU_VARIANT = nrf52
+MCU_SUB_VARIANT = nrf52840
+SOFTDEV_VERSION = 6.1.1
+LD_FILES += boards/nrf52840_1M_256k.ld
+
+NRF_DEFINES += -DNRF52840_XXAA
diff --git a/ports/nrf/boards/evk_nina_b3/pins.csv b/ports/nrf/boards/evk_nina_b3/pins.csv
new file mode 100644
index 0000000000..e6190bac0a
--- /dev/null
+++ b/ports/nrf/boards/evk_nina_b3/pins.csv
@@ -0,0 +1,48 @@
+P0,P0
+P1,P1
+P2,P2,ADC0_IN0
+P3,P3,ADC0_IN1
+P4,P4,ADC0_IN2
+P5,P5,ADC0_IN3
+P6,P6
+P7,P7
+P8,P8
+P9,P9
+P10,P10
+P11,P11
+P12,P12
+P13,P13
+P14,P14
+P15,P15
+P16,P16
+P17,P17
+P18,P18
+P19,P19
+P20,P20
+P21,P21
+P22,P22
+P23,P23
+P24,P24
+P25,P25
+P26,P26
+P27,P27
+P28,P28,ADC0_IN4
+P29,P29,ADC0_IN5
+P30,P30,ADC0_IN6
+P31,P31,ADC0_IN7
+P32,P32
+P33,P33
+P34,P34
+P35,P35
+P36,P36
+P37,P37
+P38,P38
+P39,P39
+P40,P40
+P41,P41
+P42,P42
+P43,P43
+P44,P44
+P45,P45
+P46,P46
+P47,P47

From 07528d1f855cf7a970913477b40c664700a0aa4d Mon Sep 17 00:00:00 2001
From: Brett Cannon <brett@python.org>
Date: Sun, 16 May 2021 20:11:44 -0700
Subject: [PATCH 125/349] docs/library: Clarify what type of algorithm is
 implemented in heapq.

---
 docs/library/uheapq.rst | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/docs/library/uheapq.rst b/docs/library/uheapq.rst
index f822f1e7f3..9ae1f61a17 100644
--- a/docs/library/uheapq.rst
+++ b/docs/library/uheapq.rst
@@ -6,9 +6,11 @@
 
 |see_cpython_module| :mod:`python:heapq`.
 
-This module implements the heap queue algorithm.
+This module implements the
+`min heap queue algorithm <https://en.wikipedia.org/wiki/Heap_%28data_structure%29>`_.
 
-A heap queue is simply a list that has its elements stored in a certain way.
+A heap queue is essentially a list that has its elements stored in such a way
+that the first item of the list is always the smallest.
 
 Functions
 ---------
@@ -19,8 +21,10 @@ Functions
 
 .. function:: heappop(heap)
 
-   Pop the first item from the ``heap``, and return it.  Raises IndexError if
-   heap is empty.
+   Pop the first item from the ``heap``, and return it.  Raise ``IndexError`` if
+   ``heap`` is empty.
+   
+   The returned item will be the smallest item in the ``heap``.
 
 .. function:: heapify(x)
 

From 452fa3f8d4cd8880da06b8a41e191e2acac59c3f Mon Sep 17 00:00:00 2001
From: Brett Cannon <brett@python.org>
Date: Sun, 16 May 2021 20:21:26 -0700
Subject: [PATCH 126/349] docs/library: Add a blank line to fix formatting for
 ussl docs.

---
 docs/library/ussl.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/library/ussl.rst b/docs/library/ussl.rst
index 14e3f3ad14..77d278d41d 100644
--- a/docs/library/ussl.rst
+++ b/docs/library/ussl.rst
@@ -13,7 +13,8 @@ facilities for network sockets, both client-side and server-side.
 Functions
 ---------
 
-.. function:: ussl.wrap_socket(sock, server_side=False, keyfile=None, certfile=None, cert_reqs=CERT_NONE, ca_certs=None, do_handshake=True) 
+.. function:: ussl.wrap_socket(sock, server_side=False, keyfile=None, certfile=None, cert_reqs=CERT_NONE, ca_certs=None, do_handshake=True)
+
    Takes a `stream` *sock* (usually usocket.socket instance of ``SOCK_STREAM`` type),
    and returns an instance of ssl.SSLSocket, which wraps the underlying stream in
    an SSL context. Returned object has the usual `stream` interface methods like

From 7408ca1d7857df5ea348da35c9ee12f70a024478 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 16 May 2021 13:27:54 +1000
Subject: [PATCH 127/349] mimxrt: Improve ticks and sleep functions using GPT.

SysTick cannot wake the CPU from WFI/WFE so a hardware timer is needed to
keep track of ticks/delay (similar to the nrf port).

Fixes issue #7234.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/mimxrt/Makefile     |   2 +
 ports/mimxrt/board_init.c |   7 --
 ports/mimxrt/main.c       |   2 +
 ports/mimxrt/mphalport.c  |  17 +----
 ports/mimxrt/mphalport.h  |  16 +++--
 ports/mimxrt/ticks.c      | 137 ++++++++++++++++++++++++++++++++++++++
 ports/mimxrt/ticks.h      |  35 ++++++++++
 7 files changed, 189 insertions(+), 27 deletions(-)
 create mode 100644 ports/mimxrt/ticks.c
 create mode 100644 ports/mimxrt/ticks.h

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 85e77b978e..3a001182a0 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -82,6 +82,7 @@ SRC_TINYUSB_IMX_C += \
 	$(MCU_DIR)/project_template/clock_config.c \
 	$(MCU_DIR)/drivers/fsl_clock.c \
 	$(MCU_DIR)/drivers/fsl_gpio.c \
+	$(MCU_DIR)/drivers/fsl_gpt.c \
 	$(MCU_DIR)/drivers/fsl_common.c \
 	$(MCU_DIR)/drivers/fsl_lpuart.c \
 	$(MCU_DIR)/drivers/fsl_flexram.c \
@@ -90,6 +91,7 @@ SRC_C = \
 	main.c \
 	led.c \
 	pin.c \
+	ticks.c \
 	tusb_port.c \
 	board_init.c \
 	$(BOARD_DIR)/flash_config.c \
diff --git a/ports/mimxrt/board_init.c b/ports/mimxrt/board_init.c
index cd7dc9a7dd..9095c88048 100644
--- a/ports/mimxrt/board_init.c
+++ b/ports/mimxrt/board_init.c
@@ -53,9 +53,6 @@ void board_init(void) {
     // Enable IOCON clock
     CLOCK_EnableClock(kCLOCK_Iomuxc);
 
-    // 1ms tick timer
-    SysTick_Config(SystemCoreClock / 1000);
-
     // ------------- USB0 ------------- //
 
     // Clock
@@ -85,10 +82,6 @@ void board_init(void) {
     //  CLOCK_EnableUsbhs1Clock(kCLOCK_Usb480M, 480000000U);
 }
 
-void SysTick_Handler(void) {
-    systick_ms++;
-}
-
 void USB_OTG1_IRQHandler(void) {
     tud_int_handler(0);
     tud_task();
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index e06283a8ab..7832afffcb 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -32,6 +32,7 @@
 #include "py/stackctrl.h"
 #include "lib/utils/gchelper.h"
 #include "lib/utils/pyexec.h"
+#include "ticks.h"
 #include "tusb.h"
 #include "led.h"
 
@@ -41,6 +42,7 @@ void board_init(void);
 
 int main(void) {
     board_init();
+    ticks_init();
     tusb_init();
     led_init();
 
diff --git a/ports/mimxrt/mphalport.c b/ports/mimxrt/mphalport.c
index 9fee3e85d0..02a61a4f2a 100644
--- a/ports/mimxrt/mphalport.c
+++ b/ports/mimxrt/mphalport.c
@@ -27,6 +27,7 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
+#include "ticks.h"
 #include "tusb.h"
 
 #include CPU_HEADER_H
@@ -46,22 +47,6 @@ void mp_hal_set_interrupt_char(int c) {
 
 #endif
 
-void mp_hal_delay_ms(mp_uint_t ms) {
-    ms += 1;
-    uint32_t t0 = systick_ms;
-    while (systick_ms - t0 < ms) {
-        MICROPY_EVENT_POLL_HOOK
-    }
-}
-
-void mp_hal_delay_us(mp_uint_t us) {
-    uint32_t ms = us / 1000 + 1;
-    uint32_t t0 = systick_ms;
-    while (systick_ms - t0 < ms) {
-        __WFI();
-    }
-}
-
 int mp_hal_stdin_rx_chr(void) {
     for (;;) {
         // TODO
diff --git a/ports/mimxrt/mphalport.h b/ports/mimxrt/mphalport.h
index 2b9e49432c..993e151566 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -28,21 +28,29 @@
 #define MICROPY_INCLUDED_MIMXRT_MPHALPORT_H
 
 #include <stdint.h>
+#include "ticks.h"
 
 #define mp_hal_pin_high(p) (GPIO_PinWrite(p->gpio, p->pin, 1U))
 #define mp_hal_pin_low(p) (GPIO_PinWrite(p->gpio, p->pin, 0U))
 #define mp_hal_pin_toggle(p) (GPIO_PortToggle(p->gpio, (1 << p->pin)))
 
-extern volatile uint32_t systick_ms;
-
 void mp_hal_set_interrupt_char(int c);
 
 static inline mp_uint_t mp_hal_ticks_ms(void) {
-    return systick_ms;
+    return ticks_ms32();
 }
 
 static inline mp_uint_t mp_hal_ticks_us(void) {
-    return systick_ms * 1000;
+    return ticks_us32();
+}
+
+static inline void mp_hal_delay_ms(mp_uint_t ms) {
+    uint64_t us = (uint64_t)ms * 1000;
+    ticks_delay_us64(us);
+}
+
+static inline void mp_hal_delay_us(mp_uint_t us) {
+    ticks_delay_us64(us);
 }
 
 static inline mp_uint_t mp_hal_ticks_cpu(void) {
diff --git a/ports/mimxrt/ticks.c b/ports/mimxrt/ticks.c
new file mode 100644
index 0000000000..676f81b30e
--- /dev/null
+++ b/ports/mimxrt/ticks.c
@@ -0,0 +1,137 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ *
+ * 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/mphal.h"
+#include "ticks.h"
+#include "fsl_gpt.h"
+
+// General purpose timer for keeping microsecond and millisecond tick values.
+#define GPTx GPT2
+#define GPTx_IRQn GPT2_IRQn
+#define GPTx_IRQHandler GPT2_IRQHandler
+
+static uint32_t ticks_us64_upper;
+static uint32_t ticks_ms_upper;
+
+void ticks_init(void) {
+    ticks_us64_upper = 0;
+    ticks_ms_upper = 0;
+
+    gpt_config_t config;
+    config.clockSource = kGPT_ClockSource_Osc;
+    config.divider = 24; // XTAL is 24MHz
+    config.enableFreeRun = true;
+    config.enableRunInWait = true;
+    config.enableRunInStop = true;
+    config.enableRunInDoze = true;
+    config.enableRunInDbg = false;
+    config.enableMode = true;
+    GPT_Init(GPTx, &config);
+
+    GPT_EnableInterrupts(GPTx, kGPT_RollOverFlagInterruptEnable);
+    NVIC_SetPriority(GPTx_IRQn, 0); // highest priority
+    NVIC_EnableIRQ(GPTx_IRQn);
+
+    GPT_StartTimer(GPTx);
+}
+
+void GPTx_IRQHandler(void) {
+    if (GPT_GetStatusFlags(GPTx, kGPT_OutputCompare1Flag)) {
+        GPT_ClearStatusFlags(GPTx, kGPT_OutputCompare1Flag);
+        GPT_DisableInterrupts(GPTx, kGPT_OutputCompare1InterruptEnable);
+        __SEV();
+    }
+    if (GPT_GetStatusFlags(GPTx, kGPT_RollOverFlag)) {
+        GPT_ClearStatusFlags(GPTx, kGPT_RollOverFlag);
+        ++ticks_us64_upper;
+        if (++ticks_ms_upper >= 1000) {
+            // Wrap upper counter at a multiple of 1000 so that when mp_hal_ticks_ms()
+            // wraps due to overflow it wraps smoothly.
+            ticks_ms_upper = 0;
+        }
+    }
+}
+
+static void ticks_wake_after_us32(uint32_t us) {
+    if (us < 2) {
+        // Delay too short to guarantee that we won't miss it when setting the OCR below.
+        __SEV();
+    } else {
+        // Disable IRQs so setting the OCR is done without any interruption.
+        uint32_t irq_state = DisableGlobalIRQ();
+        GPT_EnableInterrupts(GPTx, kGPT_OutputCompare1InterruptEnable);
+        uint32_t oc = GPT_GetCurrentTimerCount(GPTx) + us;
+        GPT_SetOutputCompareValue(GPTx, kGPT_OutputCompare_Channel1, oc);
+        EnableGlobalIRQ(irq_state);
+    }
+}
+
+static uint64_t ticks_us64_with(uint32_t *upper_ptr) {
+    uint32_t irq_state = DisableGlobalIRQ();
+    uint32_t lower = GPT_GetCurrentTimerCount(GPTx);
+    uint32_t upper = *upper_ptr;
+    uint32_t overflow = GPT_GetStatusFlags(GPTx, kGPT_RollOverFlag);
+    EnableGlobalIRQ(irq_state);
+    if (overflow && lower < 0x80000000) {
+        // The timer counter overflowed before reading it but the IRQ handler
+        // has not yet been called, so perform the IRQ arithmetic now.
+        ++upper;
+    }
+    return (uint64_t)upper << 32 | (uint64_t)lower;
+}
+
+uint32_t ticks_us32(void) {
+    return GPT_GetCurrentTimerCount(GPTx);
+}
+
+uint64_t ticks_us64(void) {
+    return ticks_us64_with(&ticks_us64_upper);
+}
+
+uint32_t ticks_ms32(void) {
+    // This will return a value that only has the lower 32-bits valid.
+    return ticks_us64_with(&ticks_ms_upper) / 1000;
+}
+
+void ticks_delay_us64(uint64_t us) {
+    uint64_t t0 = ticks_us64();
+    for (;;) {
+        uint64_t dt = ticks_us64() - t0;
+        if (dt >= us) {
+            return;
+        }
+        dt = us - dt;
+        if (dt > 0xffffffff) {
+            dt = 0xffffffff;
+        }
+        ticks_wake_after_us32((uint32_t)dt);
+        if (dt < 50) {
+            __WFE();
+        } else {
+            MICROPY_EVENT_POLL_HOOK
+        }
+    }
+}
diff --git a/ports/mimxrt/ticks.h b/ports/mimxrt/ticks.h
new file mode 100644
index 0000000000..11127c29cc
--- /dev/null
+++ b/ports/mimxrt/ticks.h
@@ -0,0 +1,35 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ *
+ * 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_MIMXRT_TICKS_H
+#define MICROPY_INCLUDED_MIMXRT_TICKS_H
+
+void ticks_init(void);
+uint32_t ticks_us32(void);
+uint64_t ticks_us64(void);
+uint32_t ticks_ms32(void);
+void ticks_delay_us64(uint64_t us);
+
+#endif // MICROPY_INCLUDED_MIMXRT_TICKS_H

From 9d58d46e0a28b7bd3344cae049e8085bcd75cb75 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Tue, 28 Jul 2020 16:27:19 +1000
Subject: [PATCH 128/349] docs/library/pyb.Pin.rst: Update the arguments for
 Pin.init().

Add details for Pin.init() value and alt arguments.
---
 docs/library/pyb.Pin.rst | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/docs/library/pyb.Pin.rst b/docs/library/pyb.Pin.rst
index 3d019cd8e0..6465653f74 100644
--- a/docs/library/pyb.Pin.rst
+++ b/docs/library/pyb.Pin.rst
@@ -98,11 +98,11 @@ Class methods
 Methods
 -------
 
-.. method:: Pin.init(mode, pull=Pin.PULL_NONE, af=-1)
+.. method:: Pin.init(mode, pull=Pin.PULL_NONE, \*, value=None, alt=-1)
 
    Initialise the pin:
 
-     - ``mode`` can be one of:
+     - *mode* can be one of:
 
         - ``Pin.IN`` - configure the pin for input;
         - ``Pin.OUT_PP`` - configure the pin for output, with push-pull control;
@@ -111,14 +111,17 @@ Methods
         - ``Pin.AF_OD`` - configure the pin for alternate function, open-drain;
         - ``Pin.ANALOG`` - configure the pin for analog.
 
-     - ``pull`` can be one of:
+     - *pull* can be one of:
 
         - ``Pin.PULL_NONE`` - no pull up or down resistors;
         - ``Pin.PULL_UP`` - enable the pull-up resistor;
         - ``Pin.PULL_DOWN`` - enable the pull-down resistor.
 
-     - when mode is ``Pin.AF_PP`` or ``Pin.AF_OD``, then af can be the index or name
-       of one of the alternate functions associated with a pin.
+     - *value* if not None will set the port output value before enabling the pin.
+
+     - *alt* can be used when mode is ``Pin.AF_PP`` or ``Pin.AF_OD`` to set the
+       index or name of one of the alternate functions associated with a pin. 
+       This arg was previously called *af* which can still be used if needed.
 
    Returns: ``None``.
 

From c24003abec78ee443ddc1bdc375c48513e45a54a Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Mon, 13 Jan 2020 17:25:01 +1100
Subject: [PATCH 129/349] stm32/boards: Add VCC_GND_F407VE board.

---
 ports/stm32/boards/VCC_GND_F407VE/bdev.c      |  28 +++
 .../stm32/boards/VCC_GND_F407VE/board_init.c  |   7 +
 .../boards/VCC_GND_F407VE/mpconfigboard.h     | 163 ++++++++++++++++++
 .../boards/VCC_GND_F407VE/mpconfigboard.mk    |   6 +
 ports/stm32/boards/VCC_GND_F407VE/pins.csv    | 112 ++++++++++++
 .../VCC_GND_F407VE/stm32f4xx_hal_conf.h       |  15 ++
 6 files changed, 331 insertions(+)
 create mode 100644 ports/stm32/boards/VCC_GND_F407VE/bdev.c
 create mode 100644 ports/stm32/boards/VCC_GND_F407VE/board_init.c
 create mode 100644 ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.h
 create mode 100644 ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/VCC_GND_F407VE/pins.csv
 create mode 100644 ports/stm32/boards/VCC_GND_F407VE/stm32f4xx_hal_conf.h

diff --git a/ports/stm32/boards/VCC_GND_F407VE/bdev.c b/ports/stm32/boards/VCC_GND_F407VE/bdev.c
new file mode 100644
index 0000000000..18b5b85b18
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_F407VE/bdev.c
@@ -0,0 +1,28 @@
+#include "storage.h"
+
+#if !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+
+// External SPI flash uses standard SPI interface
+
+STATIC const mp_soft_spi_obj_t soft_spi_bus = {
+    .delay_half = MICROPY_HW_SOFTSPI_MIN_DELAY,
+    .polarity = 0,
+    .phase = 0,
+    .sck = MICROPY_HW_SPIFLASH_SCK,
+    .mosi = MICROPY_HW_SPIFLASH_MOSI,
+    .miso = MICROPY_HW_SPIFLASH_MISO,
+};
+
+STATIC mp_spiflash_cache_t spi_bdev_cache;
+
+const mp_spiflash_config_t spiflash_config = {
+    .bus_kind = MP_SPIFLASH_BUS_SPI,
+    .bus.u_spi.cs = MICROPY_HW_SPIFLASH_CS,
+    .bus.u_spi.data = (void*)&soft_spi_bus,
+    .bus.u_spi.proto = &mp_soft_spi_proto,
+    .cache = &spi_bdev_cache,
+};
+
+spi_bdev_t spi_bdev;
+
+#endif
diff --git a/ports/stm32/boards/VCC_GND_F407VE/board_init.c b/ports/stm32/boards/VCC_GND_F407VE/board_init.c
new file mode 100644
index 0000000000..1d5900de55
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_F407VE/board_init.c
@@ -0,0 +1,7 @@
+#include "py/mphal.h"
+
+void VCC_GND_F407VE_board_early_init(void) {
+    // set SPI flash CS pin high
+    mp_hal_pin_output(pin_A4);
+    mp_hal_pin_write(pin_A4, 1);
+}
diff --git a/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.h b/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.h
new file mode 100644
index 0000000000..fd896c6666
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.h
@@ -0,0 +1,163 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * MIT License; Copyright (c) 2021 Damien P. George
+ */
+
+// STM32F407VET6 Mini by VCC-GND Studio
+// http://vcc-gnd.com/
+// https://item.taobao.com/item.htm?ft=t&id=523361737493
+// https://www.aliexpress.com/wholesale?SearchText=STM32F407VET6+Mini
+
+// DFU mode can be accessed by switching BOOT0 DIP ON (towards USB)
+
+#define MICROPY_HW_BOARD_NAME       "VCC-GND STM32F407VE"
+#define MICROPY_HW_MCU_NAME         "STM32F407VE"
+#define MICROPY_HW_FLASH_FS_LABEL   "VCCGNDF407VE"
+
+// 1 = use internal flash (512 KByte)
+// 0 = use external SPI flash
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
+
+#define MICROPY_HW_HAS_FLASH        (1)
+#define MICROPY_HW_ENABLE_RNG       (1)
+#define MICROPY_HW_ENABLE_RTC       (1)
+#define MICROPY_HW_ENABLE_DAC       (1)
+#define MICROPY_HW_ENABLE_USB       (1)
+#define MICROPY_HW_ENABLE_SDCARD    (1)
+
+// HSE is 25MHz
+#define MICROPY_HW_CLK_PLLM (25)            // divide external clock by this to get 1MHz
+#define MICROPY_HW_CLK_PLLN (336)           // PLL clock in MHz
+#define MICROPY_HW_CLK_PLLP (RCC_PLLP_DIV2) // divide PLL clock by this to get core clock
+#define MICROPY_HW_CLK_PLLQ (7)             // divide core clock by this to get 48MHz
+
+// The board has a 32kHz crystal for the RTC
+#define MICROPY_HW_RTC_USE_LSE      (1)
+#define MICROPY_HW_RTC_USE_US       (0)
+// #define MICROPY_HW_RTC_USE_CALOUT   (1)  // turn on/off PC13 512Hz output
+
+// USART1
+#define MICROPY_HW_UART1_TX     (pin_A9)   // PA9,PB6
+#define MICROPY_HW_UART1_RX     (pin_A10)  // PA10,PB7
+
+// USART2
+#define MICROPY_HW_UART2_TX     (pin_A2)  // PA2,PD5
+#define MICROPY_HW_UART2_RX     (pin_A3)  // PA3,PD6
+#define MICROPY_HW_UART2_RTS    (pin_A1)  // PA1,PD4
+#define MICROPY_HW_UART2_CTS    (pin_A0)  // PA0,PD3
+
+// USART3
+#define MICROPY_HW_UART3_TX     (pin_D8)  // PB10,PC10,PD8
+#define MICROPY_HW_UART3_RX     (pin_D9)  // PB11,PC11,PD9
+#define MICROPY_HW_UART3_RTS    (pin_D12) // PB14,PD12
+#define MICROPY_HW_UART3_CTS    (pin_D11) // PB13,PD11
+
+// UART4
+#define MICROPY_HW_UART4_TX     (pin_A0)  // PA0,PC10
+#define MICROPY_HW_UART4_RX     (pin_A1)  // PA1,PC11
+
+// UART5
+#define MICROPY_HW_UART5_TX     (pin_C12) // PC12
+#define MICROPY_HW_UART5_RX     (pin_D2)  // PD2
+
+// USART6
+#define MICROPY_HW_UART6_TX     (pin_C6) // PC6,PG14
+#define MICROPY_HW_UART6_RX     (pin_C7) // PC7,PG9
+
+// I2C buses
+#define MICROPY_HW_I2C1_SCL     (pin_B6)  // PB8,PB6
+#define MICROPY_HW_I2C1_SDA     (pin_B7)  // PB9,PB7
+#define MICROPY_HW_I2C2_SCL     (pin_B10) // PB10
+#define MICROPY_HW_I2C2_SDA     (pin_B11) // PB11
+#define MICROPY_HW_I2C3_SCL     (pin_A8)  // PA8
+#define MICROPY_HW_I2C3_SDA     (pin_C9)  // PC9
+// AT24C08 EEPROM on I2C1 0x50-0x53
+
+// I2S buses
+// I2S2_CK  PB13
+// I2S2_MCK PC6
+// I2S2_SD  PB15
+// I2S2_WS  PB12
+// I2S3_CK  PB3
+// I2S3_MCK PC7
+// I2S3_SD  PB5
+// I2S3_WS  PA15
+
+// SPI buses
+#define MICROPY_HW_SPI1_NSS     (pin_A4)  // PA4
+#define MICROPY_HW_SPI1_SCK     (pin_A5)  // PA5,PB3
+#define MICROPY_HW_SPI1_MISO    (pin_A6)  // PA6,PB4
+#define MICROPY_HW_SPI1_MOSI    (pin_A7)  // PA7,PB5
+
+#define MICROPY_HW_SPI2_NSS     (pin_B12) // PB12
+#define MICROPY_HW_SPI2_SCK     (pin_B13) // PB13
+#define MICROPY_HW_SPI2_MISO    (pin_B14) // PB14
+#define MICROPY_HW_SPI2_MOSI    (pin_B15) // PB15
+
+#define MICROPY_HW_SPI3_NSS     (pin_A15) // PA15
+#define MICROPY_HW_SPI3_SCK     (pin_B3)  // PB3
+#define MICROPY_HW_SPI3_MISO    (pin_B4)  // PB4
+#define MICROPY_HW_SPI3_MOSI    (pin_B5)  // PB5
+
+// CAN buses
+#define MICROPY_HW_CAN1_TX      (pin_B9)  // PB9,PD1,PA12
+#define MICROPY_HW_CAN1_RX      (pin_B8)  // PB8,PD0,PA11
+#define MICROPY_HW_CAN2_TX      (pin_B13) // PB13
+#define MICROPY_HW_CAN2_RX      (pin_B12) // PB12
+
+// DAC
+// DAC_OUT1 PA4
+// DAC_OUT2 PA5
+
+// LEDs
+#define MICROPY_HW_LED1         (pin_B9) // blue
+#define MICROPY_HW_LED_ON(pin)  (mp_hal_pin_low(pin))
+#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
+
+// If using external SPI flash
+#if !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+
+// The board does not have onboard SPI flash. You need to add an external one.
+#define MICROPY_HW_SPIFLASH_SIZE_BITS (4 * 1024 * 1024) // W25X40 - 4 Mbit (512 KByte)
+// #define MICROPY_HW_SPIFLASH_SIZE_BITS (32 * 1024 * 1024) // W25Q32 - 32 Mbit (4 MByte)
+// #define MICROPY_HW_SPIFLASH_SIZE_BITS (64 * 1024 * 1024) // W25Q64 - 64 Mbit (8 MByte)
+// #define MICROPY_HW_SPIFLASH_SIZE_BITS (128 * 1024 * 1024) // W25Q128 - 128 Mbit (16 MByte)
+
+#define MICROPY_HW_SPIFLASH_CS      (pin_A4) // also in board_init.c
+#define MICROPY_HW_SPIFLASH_SCK     (pin_A5)
+#define MICROPY_HW_SPIFLASH_MISO    (pin_A6)
+#define MICROPY_HW_SPIFLASH_MOSI    (pin_A7)
+
+#define MICROPY_BOARD_EARLY_INIT    VCC_GND_F407VE_board_early_init
+void VCC_GND_F407VE_board_early_init(void);
+
+extern const struct _mp_spiflash_config_t spiflash_config;
+extern struct _spi_bdev_t spi_bdev;
+#define MICROPY_HW_BDEV_IOCTL(op, arg) ( \
+    (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE) : \
+    (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \
+    spi_bdev_ioctl(&spi_bdev, (op), (arg)) \
+)
+#define MICROPY_HW_BDEV_READBLOCKS(dest, bl, n) spi_bdev_readblocks(&spi_bdev, (dest), (bl), (n))
+#define MICROPY_HW_BDEV_WRITEBLOCKS(src, bl, n) spi_bdev_writeblocks(&spi_bdev, (src), (bl), (n))
+
+#endif
+
+// SD card detect switch
+#define MICROPY_HW_SDCARD_DETECT_PIN        (pin_A8)
+#define MICROPY_HW_SDCARD_DETECT_PULL       (GPIO_PULLUP)
+#define MICROPY_HW_SDCARD_DETECT_PRESENT    (GPIO_PIN_RESET)
+// 1      - PC10 - DAT2/RES
+// 2      - PC11 - CD/DAT3/CS
+// 3      - PD2  - CMD/DI
+// 4      - VCC  - VDD
+// 5      - PC12 - CLK/SCLK
+// 6      - GND  - VSS
+// 7      - PC8  - DAT0/D0
+// 8      - PC9  - DAT1/RES
+// 9  SW2 - GND
+// 10 SW1 - PA8
+
+// USB config
+#define MICROPY_HW_USB_FS (1)
+// #define MICROPY_HW_USB_VBUS_DETECT_PIN (pin_A9)
+// #define MICROPY_HW_USB_OTG_ID_PIN      (pin_A10)
diff --git a/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.mk b/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.mk
new file mode 100644
index 0000000000..b154dcfbac
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.mk
@@ -0,0 +1,6 @@
+MCU_SERIES = f4
+CMSIS_MCU = STM32F407xx
+AF_FILE = boards/stm32f405_af.csv
+LD_FILES = boards/stm32f405.ld boards/common_ifs.ld
+TEXT0_ADDR = 0x08000000
+TEXT1_ADDR = 0x08020000
diff --git a/ports/stm32/boards/VCC_GND_F407VE/pins.csv b/ports/stm32/boards/VCC_GND_F407VE/pins.csv
new file mode 100644
index 0000000000..f04d96771b
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_F407VE/pins.csv
@@ -0,0 +1,112 @@
+P1_1,GND
+P1_2,GND
+P1_3,VBAT
+P1_4,VCC_3V3
+P1_5,VIN_5V
+P1_6,VIN_5V
+P1_7,PE0
+P1_8,PE1
+P1_9,PE2
+P1_10,PE3
+P1_11,PE4
+P1_12,PE5
+P1_13,PE6
+P1_14,PC13
+P1_15,PC14
+P1_16,PC15
+P1_17,PC0
+P1_18,PC1
+P1_19,PC2
+P1_20,PC3
+P1_21,PA0
+P1_22,PA2
+P1_23,PA1
+P1_24,PA3
+P1_25,PA4
+P1_26,PA5
+P1_27,PA6
+P1_28,PA7
+P1_29,PC4
+P1_30,PC5
+P1_31,PB0
+P1_32,PB1
+P1_33,PB2
+P1_34,PE7
+P1_35,PE8
+P1_36,PE9
+P2_1,PE11
+P2_2,PE10
+P2_3,PE13
+P2_4,PE12
+P2_5,PE15
+P2_6,PE14
+P2_7,PB11
+P2_8,PB10
+P2_9,PB13
+P2_10,PB12
+P2_11,PB15
+P2_12,PB14
+P2_13,PD9
+P2_14,PD8
+P2_15,PD11
+P2_16,PD10
+P2_17,PD13
+P2_18,PD12
+P2_19,PD15
+P2_20,PD14
+P3_1,PC8
+P3_2,PC6
+P3_3,PC9
+P3_4,PC7
+P3_5,PA9
+P3_6,PA8
+P3_7,PA11
+P3_8,PA10
+P3_9,PA13
+P3_10,PA12
+P3_11,PA15
+P3_12,PA14
+P3_13,PC11
+P3_14,PC10
+P3_15,PC12
+P3_16,PD0
+P3_17,PD1
+P3_18,PD2
+P3_19,PD3
+P3_20,PD4
+P3_21,PD5
+P3_22,PD6
+P3_23,PD7
+P3_24,PB3
+P3_25,PB4
+P3_26,PB5
+P3_27,PB6
+P3_28,PB7
+P3_29,PB8
+P3_30,PB9
+P3_31,GND
+P3_32,GND
+P3_33,VCC_3V3
+P3_34,VCC_3V3
+P3_35,GND
+P3_36,GND
+DAC1,PA4
+DAC2,PA5
+BLUE_LED,PB9
+BOOT1,PB2
+USB_VBUS,PA9
+USB_ID,PA10
+USB_DM,PA11
+USB_DP,PA12
+SWCLK,PA14
+SWDIO,PA13
+OSC32_IN,PC14
+OSC32_OUT,PC15
+SD_D0,PC8
+SD_D1,PC9
+SD_D2,PC10
+SD_D3,PC11
+SD_CK,PC12
+SD_CMD,PD2
+SD,PA8
+SD_SW,PA8
diff --git a/ports/stm32/boards/VCC_GND_F407VE/stm32f4xx_hal_conf.h b/ports/stm32/boards/VCC_GND_F407VE/stm32f4xx_hal_conf.h
new file mode 100644
index 0000000000..fe2069fe14
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_F407VE/stm32f4xx_hal_conf.h
@@ -0,0 +1,15 @@
+#ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
+#define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
+
+#include "boards/stm32f4xx_hal_conf_base.h"
+
+// Oscillator values in Hz
+#define HSE_VALUE (25000000)
+#define LSE_VALUE (32768)
+#define EXTERNAL_CLOCK_VALUE (12288000)
+
+// Oscillator timeouts in ms
+#define HSE_STARTUP_TIMEOUT (100)
+#define LSE_STARTUP_TIMEOUT (5000)
+
+#endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H

From 1ca66efbf7be4f57ab31df5ecb81d27da4aefd0d Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Mon, 13 Jan 2020 17:26:01 +1100
Subject: [PATCH 130/349] stm32/boards: Add VCC_GND_F407ZG board.

---
 ports/stm32/boards/VCC_GND_F407ZG/bdev.c      |  28 +++
 .../stm32/boards/VCC_GND_F407ZG/board_init.c  |   7 +
 .../boards/VCC_GND_F407ZG/mpconfigboard.h     | 182 ++++++++++++++++++
 .../boards/VCC_GND_F407ZG/mpconfigboard.mk    |  10 +
 ports/stm32/boards/VCC_GND_F407ZG/pins.csv    | 157 +++++++++++++++
 .../VCC_GND_F407ZG/stm32f4xx_hal_conf.h       |  15 ++
 6 files changed, 399 insertions(+)
 create mode 100644 ports/stm32/boards/VCC_GND_F407ZG/bdev.c
 create mode 100644 ports/stm32/boards/VCC_GND_F407ZG/board_init.c
 create mode 100644 ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.h
 create mode 100644 ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/VCC_GND_F407ZG/pins.csv
 create mode 100644 ports/stm32/boards/VCC_GND_F407ZG/stm32f4xx_hal_conf.h

diff --git a/ports/stm32/boards/VCC_GND_F407ZG/bdev.c b/ports/stm32/boards/VCC_GND_F407ZG/bdev.c
new file mode 100644
index 0000000000..18b5b85b18
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_F407ZG/bdev.c
@@ -0,0 +1,28 @@
+#include "storage.h"
+
+#if !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+
+// External SPI flash uses standard SPI interface
+
+STATIC const mp_soft_spi_obj_t soft_spi_bus = {
+    .delay_half = MICROPY_HW_SOFTSPI_MIN_DELAY,
+    .polarity = 0,
+    .phase = 0,
+    .sck = MICROPY_HW_SPIFLASH_SCK,
+    .mosi = MICROPY_HW_SPIFLASH_MOSI,
+    .miso = MICROPY_HW_SPIFLASH_MISO,
+};
+
+STATIC mp_spiflash_cache_t spi_bdev_cache;
+
+const mp_spiflash_config_t spiflash_config = {
+    .bus_kind = MP_SPIFLASH_BUS_SPI,
+    .bus.u_spi.cs = MICROPY_HW_SPIFLASH_CS,
+    .bus.u_spi.data = (void*)&soft_spi_bus,
+    .bus.u_spi.proto = &mp_soft_spi_proto,
+    .cache = &spi_bdev_cache,
+};
+
+spi_bdev_t spi_bdev;
+
+#endif
diff --git a/ports/stm32/boards/VCC_GND_F407ZG/board_init.c b/ports/stm32/boards/VCC_GND_F407ZG/board_init.c
new file mode 100644
index 0000000000..1f4663fdf9
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_F407ZG/board_init.c
@@ -0,0 +1,7 @@
+#include "py/mphal.h"
+
+void VCC_GND_F407ZG_board_early_init(void) {
+    // set SPI flash CS pin high
+    mp_hal_pin_output(pin_C4);
+    mp_hal_pin_write(pin_C4, 1);
+}
diff --git a/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.h b/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.h
new file mode 100644
index 0000000000..bd17ab410f
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.h
@@ -0,0 +1,182 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * MIT License; Copyright (c) 2021 Damien P. George
+ */
+
+// STM32F407ZGT6 Mini by VCC-GND Studio
+// http://vcc-gnd.com/
+// https://item.taobao.com/item.htm?ft=t&id=523383164199
+// https://www.aliexpress.com/wholesale?SearchText=STM32F407ZGT6+Mini
+
+// DFU mode can be accessed by switching BOOT0 DIP ON (towards USB)
+
+#define MICROPY_HW_BOARD_NAME       "VCC-GND STM32F407ZG"
+#define MICROPY_HW_MCU_NAME         "STM32F407ZG"
+#define MICROPY_HW_FLASH_FS_LABEL   "VCCGNDF407ZG"
+
+// 1 = use internal flash (1 MByte)
+// 0 = use onboard SPI flash (512 KByte) Winbond W25X40
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
+
+#define MICROPY_HW_HAS_FLASH        (1)
+#define MICROPY_HW_ENABLE_RNG       (1)
+#define MICROPY_HW_ENABLE_RTC       (1)
+#define MICROPY_HW_ENABLE_DAC       (1)
+#define MICROPY_HW_ENABLE_USB       (1)
+#define MICROPY_HW_ENABLE_SDCARD    (1)
+
+// HSE is 25MHz
+#define MICROPY_HW_CLK_PLLM (25)            // divide external clock by this to get 1MHz
+#define MICROPY_HW_CLK_PLLN (336)           // PLL clock in MHz
+#define MICROPY_HW_CLK_PLLP (RCC_PLLP_DIV2) // divide PLL clock by this to get core clock
+#define MICROPY_HW_CLK_PLLQ (7)             // divide core clock by this to get 48MHz
+
+// The board has a 32kHz crystal for the RTC
+#define MICROPY_HW_RTC_USE_LSE      (1)
+#define MICROPY_HW_RTC_USE_US       (0)
+// #define MICROPY_HW_RTC_USE_CALOUT   (1)  // turn on/off PC13 512Hz output
+
+// USART1
+#define MICROPY_HW_UART1_TX     (pin_A9)   // PA9,PB6
+#define MICROPY_HW_UART1_RX     (pin_A10)  // PA10,PB7
+#define MICROPY_HW_UART1_RTS    (pin_A12)
+#define MICROPY_HW_UART1_CTS    (pin_A11)
+// USART1_CK  PA8
+
+// USART2
+#define MICROPY_HW_UART2_TX     (pin_A2)  // PA2,PD5
+#define MICROPY_HW_UART2_RX     (pin_A3)  // PA3,PD6
+#define MICROPY_HW_UART2_RTS    (pin_A1)  // PA1,PD4
+#define MICROPY_HW_UART2_CTS    (pin_A0)  // PA0,PD3
+// USART2_CK  PA4,PD7
+
+// USART3
+#define MICROPY_HW_UART3_TX     (pin_D8)  // PB10,PC10,PD8
+#define MICROPY_HW_UART3_RX     (pin_D9)  // PB11,PC11,PD9
+#define MICROPY_HW_UART3_RTS    (pin_D12) // PB14,PD12
+#define MICROPY_HW_UART3_CTS    (pin_D11) // PB13,PD11
+// USART3_CK  PB12,PC12,PD10
+
+// UART4
+#define MICROPY_HW_UART4_TX     (pin_A0)  // PA0,PC10
+#define MICROPY_HW_UART4_RX     (pin_A1)  // PA1,PC11
+
+// UART5
+#define MICROPY_HW_UART5_TX     (pin_C12) // PC12
+#define MICROPY_HW_UART5_RX     (pin_D2)  // PD2
+
+// USART6
+#define MICROPY_HW_UART6_TX     (pin_C6)  // PC6,PG14
+#define MICROPY_HW_UART6_RX     (pin_C7)  // PC7,PG9
+#define MICROPY_HW_UART6_RTS    (pin_G8)  // PG8,PG12
+#define MICROPY_HW_UART6_CTS    (pin_G13) // PG13,PG15
+// USART6_CK  PC8,PG7
+
+// I2C buses
+#define MICROPY_HW_I2C1_SCL     (pin_B6)  // PB8,PB6
+#define MICROPY_HW_I2C1_SDA     (pin_B7)  // PB9,PB7
+// I2C1_SMBA  PB5
+#define MICROPY_HW_I2C2_SCL     (pin_B10) // PB10,PF1
+#define MICROPY_HW_I2C2_SDA     (pin_B11) // PB11,PF0
+// I2C2_SMBA  PB12,PF2
+#define MICROPY_HW_I2C3_SCL     (pin_A8)  // PA8
+#define MICROPY_HW_I2C3_SDA     (pin_C9)  // PC9
+// I2C3_SMBA  PA9
+
+// AT24C08 EEPROM on I2C1 0x50-0x53
+
+// I2S buses - multiplexed with SPI2 and SPI3
+// I2S2_CK  PB10,PB13
+// I2S2_MCK PC6
+// I2S2_SD  PB15,PC3
+// I2S2_WS  PB9,PB12
+// I2S3_CK  PB3,PC10
+// I2S3_MCK PC7
+// I2S3_SD  PB5,PC12
+// I2S3_WS  PA4,PA15
+
+// SPI buses
+#define MICROPY_HW_SPI1_NSS     (pin_A4)  // PA4,PA15
+#define MICROPY_HW_SPI1_SCK     (pin_A5)  // PA5,PB3
+#define MICROPY_HW_SPI1_MISO    (pin_A6)  // PA6,PB4
+#define MICROPY_HW_SPI1_MOSI    (pin_A7)  // PA7,PB5
+
+#define MICROPY_HW_SPI2_NSS     (pin_B12) // PB12,PB9
+#define MICROPY_HW_SPI2_SCK     (pin_B13) // PB13,PB10
+#define MICROPY_HW_SPI2_MISO    (pin_B14) // PB14,PC2
+#define MICROPY_HW_SPI2_MOSI    (pin_B15) // PB15,PC3
+
+#define MICROPY_HW_SPI3_NSS     (pin_A15) // PA15,PA4
+#define MICROPY_HW_SPI3_SCK     (pin_B3)  // PB3,PC10
+#define MICROPY_HW_SPI3_MISO    (pin_B4)  // PB4,PC11
+#define MICROPY_HW_SPI3_MOSI    (pin_B5)  // PB5,PC12
+
+// CAN buses
+#define MICROPY_HW_CAN1_TX      (pin_B9)  // PB9,PD1,PA12
+#define MICROPY_HW_CAN1_RX      (pin_B8)  // PB8,PD0,PA11
+#define MICROPY_HW_CAN2_TX      (pin_B13) // PB13,PB6
+#define MICROPY_HW_CAN2_RX      (pin_B12) // PB12,PB5
+
+// DAC
+// DAC_OUT1 PA4
+// DAC_OUT2 PA5
+
+// LEDs
+#define MICROPY_HW_LED1         (pin_G15) // blue
+#define MICROPY_HW_LED_ON(pin)  (mp_hal_pin_low(pin))
+#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
+
+// If using onboard SPI flash
+#if !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+
+// W25X40 SPI Flash = 4 Mbit (512 KByte)
+#define MICROPY_HW_SPIFLASH_SIZE_BITS (4 * 1024 * 1024)
+#define MICROPY_HW_SPIFLASH_CS      (pin_C4)
+#define MICROPY_HW_SPIFLASH_SCK     (pin_A5)
+#define MICROPY_HW_SPIFLASH_MISO    (pin_A6)
+#define MICROPY_HW_SPIFLASH_MOSI    (pin_A7)
+
+#define MICROPY_BOARD_EARLY_INIT    VCC_GND_F407ZG_board_early_init
+void VCC_GND_F407ZG_board_early_init(void);
+
+extern const struct _mp_spiflash_config_t spiflash_config;
+extern struct _spi_bdev_t spi_bdev;
+#define MICROPY_HW_BDEV_IOCTL(op, arg) ( \
+    (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE) : \
+    (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \
+    spi_bdev_ioctl(&spi_bdev, (op), (arg)) \
+)
+#define MICROPY_HW_BDEV_READBLOCKS(dest, bl, n) spi_bdev_readblocks(&spi_bdev, (dest), (bl), (n))
+#define MICROPY_HW_BDEV_WRITEBLOCKS(src, bl, n) spi_bdev_writeblocks(&spi_bdev, (src), (bl), (n))
+
+#endif
+
+// SD card detect switch
+#define MICROPY_HW_SDCARD_DETECT_PIN        (pin_F10)
+#define MICROPY_HW_SDCARD_DETECT_PULL       (GPIO_PULLUP)
+#define MICROPY_HW_SDCARD_DETECT_PRESENT    (GPIO_PIN_RESET)
+// 1      - PC10 - DAT2/RES
+// 2      - PC11 - CD/DAT3/CS
+// 3      - PD2  - CMD/DI
+// 4      - VCC  - VDD
+// 5      - PC12 - CLK/SCLK
+// 6      - GND  - VSS
+// 7      - PC8  - DAT0/D0
+// 8      - PC9  - DAT1/RES
+// 9  SW2 - GND
+// 10 SW1 - PF10
+
+// USB config
+#define MICROPY_HW_USB_FS (1)
+// #define MICROPY_HW_USB_VBUS_DETECT_PIN (pin_A9)
+// #define MICROPY_HW_USB_OTG_ID_PIN      (pin_A10)
+
+// Ethernet via RMII
+#define MICROPY_HW_ETH_MDC          (pin_C1)
+#define MICROPY_HW_ETH_MDIO         (pin_A2)
+#define MICROPY_HW_ETH_RMII_REF_CLK (pin_A1)
+#define MICROPY_HW_ETH_RMII_CRS_DV  (pin_A7)
+#define MICROPY_HW_ETH_RMII_RXD0    (pin_C4)
+#define MICROPY_HW_ETH_RMII_RXD1    (pin_C5)
+#define MICROPY_HW_ETH_RMII_TX_EN   (pin_B11)
+#define MICROPY_HW_ETH_RMII_TXD0    (pin_B12)
+#define MICROPY_HW_ETH_RMII_TXD1    (pin_B13)
diff --git a/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.mk b/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.mk
new file mode 100644
index 0000000000..c67807867e
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.mk
@@ -0,0 +1,10 @@
+MCU_SERIES = f4
+CMSIS_MCU = STM32F407xx
+AF_FILE = boards/stm32f405_af.csv
+LD_FILES = boards/stm32f405.ld boards/common_ifs.ld
+TEXT0_ADDR = 0x08000000
+TEXT1_ADDR = 0x08020000
+
+MICROPY_PY_LWIP = 1
+MICROPY_PY_USSL = 1
+MICROPY_SSL_MBEDTLS = 1
diff --git a/ports/stm32/boards/VCC_GND_F407ZG/pins.csv b/ports/stm32/boards/VCC_GND_F407ZG/pins.csv
new file mode 100644
index 0000000000..780523a075
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_F407ZG/pins.csv
@@ -0,0 +1,157 @@
+P1_1,GND
+P1_2,GND
+P1_3,VBAT
+P1_4,VCC_3V3
+P1_5,VIN_5V
+P1_6,VIN_5V
+P1_7,PF2
+P1_8,PF3
+P1_9,PF4
+P1_10,PF5
+P1_11,PF6
+P1_12,PF7
+P1_13,PF8
+P1_14,PF9
+P1_15,PF10
+P1_16,PC0
+P1_17,PC1
+P1_18,PC2
+P1_19,PC3
+P1_20,PA0
+P1_21,PA1
+P1_22,PA2
+P1_23,PA3
+P1_24,PA4
+P1_25,PA5
+P1_26,PA6
+P1_27,PA7
+P1_28,PC4
+P1_29,PC5
+P1_30,PB0
+P1_31,PB1
+P1_32,PB2
+P1_33,PF11
+P1_34,PF12
+P1_35,PF13
+P1_36,PF14
+P1_37,PF15
+P1_38,PG0
+P1_39,PG1
+P1_40,PE7
+P1_41,PE8
+P1_42,PE9
+P1_43,GND
+P1_44,GND
+P2_1,PG7
+P2_2,PG6
+P2_3,PG5
+P2_4,PG4
+P2_5,PG3
+P2_6,PG2
+P2_7,PD15
+P2_8,PD14
+P2_9,PD13
+P2_10,PD12
+P2_11,PD11
+P2_12,PD10
+P2_13,PD9
+P2_14,PD8
+P2_15,PB15
+P2_16,PB14
+P2_17,PB13
+P2_18,PB12
+P2_19,PB11
+P2_20,PB10
+P2_21,PE15
+P2_22,PE14
+P2_23,PE13
+P2_24,PE12
+P2_25,PE11
+P2_26,PE10
+P3_1,PF1
+P3_2,PF0
+P3_3,PC15
+P3_4,PC14
+P3_5,PC13
+P3_6,PE6
+P3_7,PE5
+P3_8,PE4
+P3_9,PE3
+P3_10,PE2
+P3_11,PE1
+P3_12,PE0
+P4_1,GND
+P4_2,GND
+P4_3,VCC_3V3
+P4_4,VCC_3V3
+P4_5,PB9
+P4_6,PB8
+P4_7,PB7
+P4_8,PB6
+P4_9,PB5
+P4_10,PB4
+P4_11,PB3
+P4_12,PG15
+P4_13,PG14
+P4_14,PG13
+P4_15,PG12
+P4_16,PG11
+P4_17,PG10
+P4_18,PG9
+P4_19,PD7
+P4_20,PD6
+P4_21,PD5
+P4_22,PD4
+P4_23,PD3
+P4_24,PD2
+P4_25,PD1
+P4_26,PD0
+P4_27,PC12
+P4_28,PC11
+P4_29,PC10
+P4_30,PA15
+P4_31,PA14
+P4_32,PA13
+P4_33,PA12
+P4_34,PA11
+P4_35,PA10
+P4_36,PA9
+P4_37,PA8
+P4_38,PC9
+P4_39,PC8
+P4_40,PC7
+P4_41,PC6
+P4_42,PG8
+P4_43,GND
+P4_44,GND
+DAC1,PA4
+DAC2,PA5
+SRAM_CS,PG10
+SF_CS,PB12
+BLUE_LED,PG15
+BOOT1,PB2
+USB_VBUS,PA9
+USB_ID,PA10
+USB_DM,PA11
+USB_DP,PA12
+SWCLK,PA14
+SWDIO,PA13
+OSC32_IN,PC14
+OSC32_OUT,PC15
+SD_D0,PC8
+SD_D1,PC9
+SD_D2,PC10
+SD_D3,PC11
+SD_CK,PC12
+SD_CMD,PD2
+SD,PF10
+SD_SW,PF10
+ETH_MDC,PC1
+ETH_MDIO,PA2
+ETH_RMII_REF_CLK,PA1
+ETH_RMII_CRS_DV,PA7
+ETH_RMII_RXD0,PC4
+ETH_RMII_RXD1,PC5
+ETH_RMII_TX_EN,PB11
+ETH_RMII_TXD0,PB12
+ETH_RMII_TXD1,PB13
diff --git a/ports/stm32/boards/VCC_GND_F407ZG/stm32f4xx_hal_conf.h b/ports/stm32/boards/VCC_GND_F407ZG/stm32f4xx_hal_conf.h
new file mode 100644
index 0000000000..fe2069fe14
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_F407ZG/stm32f4xx_hal_conf.h
@@ -0,0 +1,15 @@
+#ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
+#define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
+
+#include "boards/stm32f4xx_hal_conf_base.h"
+
+// Oscillator values in Hz
+#define HSE_VALUE (25000000)
+#define LSE_VALUE (32768)
+#define EXTERNAL_CLOCK_VALUE (12288000)
+
+// Oscillator timeouts in ms
+#define HSE_STARTUP_TIMEOUT (100)
+#define LSE_STARTUP_TIMEOUT (5000)
+
+#endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H

From 47b778332a0e89740775db544e7c22065df528c2 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Thu, 20 May 2021 16:21:47 +1000
Subject: [PATCH 131/349] all: Replace busses with buses.

"buses" is the widely accepted plural form of "bus".
---
 docs/library/network.CC3K.rst                            | 2 +-
 docs/library/network.WIZNET5K.rst                        | 2 +-
 docs/library/pyb.CAN.rst                                 | 2 +-
 docs/library/pyb.I2C.rst                                 | 2 +-
 docs/library/pyb.SPI.rst                                 | 2 +-
 docs/library/pyb.UART.rst                                | 2 +-
 docs/library/pyb.rst                                     | 2 +-
 ports/stm32/boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h | 6 +++---
 ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h        | 4 ++--
 ports/stm32/boards/B_L475E_IOT01A/mpconfigboard.h        | 6 +++---
 ports/stm32/boards/CERB40/mpconfigboard.h                | 6 +++---
 ports/stm32/boards/ESPRUINO_PICO/mpconfigboard.h         | 4 ++--
 ports/stm32/boards/HYDRABUS/mpconfigboard.h              | 4 ++--
 ports/stm32/boards/LIMIFROG/mpconfigboard.h              | 4 ++--
 ports/stm32/boards/NETDUINO_PLUS_2/mpconfigboard.h       | 4 ++--
 ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h         | 4 ++--
 ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.h         | 4 ++--
 ports/stm32/boards/NUCLEO_F411RE/mpconfigboard.h         | 4 ++--
 ports/stm32/boards/NUCLEO_F413ZH/mpconfigboard.h         | 6 +++---
 ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.h         | 6 +++---
 ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h         | 4 ++--
 ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.h         | 6 +++---
 ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.h         | 6 +++---
 ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.h         | 4 ++--
 ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h         | 4 ++--
 ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h         | 4 ++--
 ports/stm32/boards/NUCLEO_L452RE/mpconfigboard.h         | 6 +++---
 ports/stm32/boards/NUCLEO_L476RG/mpconfigboard.h         | 6 +++---
 ports/stm32/boards/OLIMEX_E407/mpconfigboard.h           | 6 +++---
 ports/stm32/boards/PYBD_SF2/mpconfigboard.h              | 6 +++---
 ports/stm32/boards/PYBD_SF6/mpconfigboard.h              | 2 +-
 ports/stm32/boards/PYBLITEV10/mpconfigboard.h            | 4 ++--
 ports/stm32/boards/PYBV10/mpconfigboard.h                | 6 +++---
 ports/stm32/boards/PYBV11/mpconfigboard.h                | 6 +++---
 ports/stm32/boards/PYBV3/mpconfigboard.h                 | 4 ++--
 ports/stm32/boards/PYBV4/mpconfigboard.h                 | 6 +++---
 ports/stm32/boards/STM32F411DISC/mpconfigboard.h         | 4 ++--
 ports/stm32/boards/STM32F429DISC/mpconfigboard.h         | 6 +++---
 ports/stm32/boards/STM32F439/mpconfigboard.h             | 6 +++---
 ports/stm32/boards/STM32F4DISC/mpconfigboard.h           | 6 +++---
 ports/stm32/boards/STM32F769DISC/mpconfigboard.h         | 6 +++---
 ports/stm32/boards/STM32F7DISC/mpconfigboard.h           | 6 +++---
 ports/stm32/boards/STM32L476DISC/mpconfigboard.h         | 6 +++---
 ports/stm32/boards/STM32L496GDISC/mpconfigboard.h        | 4 ++--
 ports/stm32/machine_uart.c                               | 2 +-
 ports/stm32/pyb_i2c.c                                    | 2 +-
 ports/stm32/pyb_spi.c                                    | 2 +-
 ports/stm32/spi.c                                        | 2 +-
 ports/teensy/uart.c                                      | 2 +-
 49 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/docs/library/network.CC3K.rst b/docs/library/network.CC3K.rst
index 18210e2d26..41d3fb437e 100644
--- a/docs/library/network.CC3K.rst
+++ b/docs/library/network.CC3K.rst
@@ -25,7 +25,7 @@ For this example to work the CC3000 module must have the following connections:
     - VBEN connected to Y4
     - IRQ connected to Y3
 
-It is possible to use other SPI busses and other pins for CS, VBEN and IRQ.
+It is possible to use other SPI buses and other pins for CS, VBEN and IRQ.
 
 Constructors
 ------------
diff --git a/docs/library/network.WIZNET5K.rst b/docs/library/network.WIZNET5K.rst
index e21e3a4978..9e2c40f7f3 100644
--- a/docs/library/network.WIZNET5K.rst
+++ b/docs/library/network.WIZNET5K.rst
@@ -26,7 +26,7 @@ For this example to work the WIZnet5x00 module must have the following connectio
     - nSS connected to X5
     - nRESET connected to X4
 
-It is possible to use other SPI busses and other pins for nSS and nRESET.
+It is possible to use other SPI buses and other pins for nSS and nRESET.
 
 Constructors
 ------------
diff --git a/docs/library/pyb.CAN.rst b/docs/library/pyb.CAN.rst
index 649bcda108..bcaeeba9df 100644
--- a/docs/library/pyb.CAN.rst
+++ b/docs/library/pyb.CAN.rst
@@ -30,7 +30,7 @@ Constructors
    the bus, if any).  If extra arguments are given, the bus is initialised.
    See :meth:`CAN.init` for parameters of initialisation.
 
-   The physical pins of the CAN busses are:
+   The physical pins of the CAN buses are:
 
      - ``CAN(1)`` is on ``YA``: ``(RX, TX) = (Y3, Y4) = (PB8, PB9)``
      - ``CAN(2)`` is on ``YB``: ``(RX, TX) = (Y5, Y6) = (PB12, PB13)``
diff --git a/docs/library/pyb.I2C.rst b/docs/library/pyb.I2C.rst
index 641dcb8815..56b036e074 100644
--- a/docs/library/pyb.I2C.rst
+++ b/docs/library/pyb.I2C.rst
@@ -64,7 +64,7 @@ Constructors
    the bus, if any).  If extra arguments are given, the bus is initialised.
    See ``init`` for parameters of initialisation.
 
-   The physical pins of the I2C busses on Pyboards V1.0 and V1.1 are:
+   The physical pins of the I2C buses on Pyboards V1.0 and V1.1 are:
 
      - ``I2C(1)`` is on the X position: ``(SCL, SDA) = (X9, X10) = (PB6, PB7)``
      - ``I2C(2)`` is on the Y position: ``(SCL, SDA) = (Y9, Y10) = (PB10, PB11)``
diff --git a/docs/library/pyb.SPI.rst b/docs/library/pyb.SPI.rst
index 24e2ec5a73..c76b16789a 100644
--- a/docs/library/pyb.SPI.rst
+++ b/docs/library/pyb.SPI.rst
@@ -36,7 +36,7 @@ Constructors
    the bus, if any).  If extra arguments are given, the bus is initialised.
    See ``init`` for parameters of initialisation.
 
-   The physical pins of the SPI busses are:
+   The physical pins of the SPI buses are:
 
      - ``SPI(1)`` is on the X position: ``(NSS, SCK, MISO, MOSI) = (X5, X6, X7, X8) = (PA4, PA5, PA6, PA7)``
      - ``SPI(2)`` is on the Y position: ``(NSS, SCK, MISO, MOSI) = (Y5, Y6, Y7, Y8) = (PB12, PB13, PB14, PB15)``
diff --git a/docs/library/pyb.UART.rst b/docs/library/pyb.UART.rst
index a1d6e59002..e1735403c4 100644
--- a/docs/library/pyb.UART.rst
+++ b/docs/library/pyb.UART.rst
@@ -57,7 +57,7 @@ Constructors
    the bus, if any).  If extra arguments are given, the bus is initialised.
    See ``init`` for parameters of initialisation.
 
-   The physical pins of the UART busses on Pyboard are:
+   The physical pins of the UART buses on Pyboard are:
 
      - ``UART(4)`` is on ``XA``: ``(TX, RX) = (X1, X2) = (PA0, PA1)``
      - ``UART(1)`` is on ``XB``: ``(TX, RX) = (X9, X10) = (PB6, PB7)``
diff --git a/docs/library/pyb.rst b/docs/library/pyb.rst
index addcd20a91..321be3c52f 100644
--- a/docs/library/pyb.rst
+++ b/docs/library/pyb.rst
@@ -126,7 +126,7 @@ Power related functions
     - pclk2: frequency of the APB2 bus
 
    If given any arguments then the function sets the frequency of the CPU,
-   and the busses if additional arguments are given.  Frequencies are given in
+   and the buses if additional arguments are given.  Frequencies are given in
    Hz.  Eg freq(120000000) sets sysclk (the CPU frequency) to 120MHz.  Note that
    not all values are supported and the largest supported frequency not greater
    than the given value will be selected.
diff --git a/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h b/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h
index 36d1d31315..afa81a5ba0 100644
--- a/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h
+++ b/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h
@@ -39,7 +39,7 @@
 #define MICROPY_HW_UART6_TX     (pin_C6)  // D6
 #define MICROPY_HW_UART6_RX     (pin_C7)  // D5
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_NAME "I2C1"
 #define MICROPY_HW_I2C1_SCL (pin_B6)  // SCL
 #define MICROPY_HW_I2C1_SDA (pin_B7)  // SDA
@@ -47,7 +47,7 @@
 #define MICROPY_HW_I2C2_SCL (pin_B10)  // TX
 #define MICROPY_HW_I2C2_SDA (pin_B11)  // RX
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NAME "SPIFLASH"
 #define MICROPY_HW_SPI1_NSS  (pin_A15) // FLASH CS
 #define MICROPY_HW_SPI1_SCK  (pin_B3) // FLASH CLK
@@ -59,7 +59,7 @@
 #define MICROPY_HW_SPI2_MISO (pin_B14) // MISO
 #define MICROPY_HW_SPI2_MOSI (pin_B15) // MOSI
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_NAME "CAN1"
 #define MICROPY_HW_CAN1_TX   (pin_B9) // D10
 #define MICROPY_HW_CAN1_RX   (pin_B8) // D9
diff --git a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
index b330e8fdc1..0cded1bc86 100644
--- a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
+++ b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
@@ -35,11 +35,11 @@
 #define MICROPY_HW_UART_REPL        PYB_UART_2
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL         (pin_B8)
 #define MICROPY_HW_I2C1_SDA         (pin_B9)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS         (pin_A15)
 #define MICROPY_HW_SPI1_SCK         (pin_A5)
 #define MICROPY_HW_SPI1_MISO        (pin_A6)
diff --git a/ports/stm32/boards/B_L475E_IOT01A/mpconfigboard.h b/ports/stm32/boards/B_L475E_IOT01A/mpconfigboard.h
index a88bcf6756..b017edab99 100644
--- a/ports/stm32/boards/B_L475E_IOT01A/mpconfigboard.h
+++ b/ports/stm32/boards/B_L475E_IOT01A/mpconfigboard.h
@@ -28,20 +28,20 @@
 // USART3 config for internal use
 #define MICROPY_HW_UART3_TX     (pin_D8)
 #define MICROPY_HW_UART3_RX     (pin_D9)
-// USART4 config 
+// USART4 config
 #define MICROPY_HW_UART4_TX     (pin_A0)
 #define MICROPY_HW_UART4_RX     (pin_A1)
 // USART 1 is connected to the virtual com port on the ST-LINK
 #define MICROPY_HW_UART_REPL        PYB_UART_1
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B8)
 #define MICROPY_HW_I2C1_SDA (pin_B9)
 #define MICROPY_HW_I2C2_SCL (pin_B10)
 #define MICROPY_HW_I2C2_SDA (pin_B11)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS     (pin_A4)
 #define MICROPY_HW_SPI1_SCK     (pin_A5)
 #define MICROPY_HW_SPI1_MISO    (pin_A6)
diff --git a/ports/stm32/boards/CERB40/mpconfigboard.h b/ports/stm32/boards/CERB40/mpconfigboard.h
index 7c166922be..2f9199d4e0 100644
--- a/ports/stm32/boards/CERB40/mpconfigboard.h
+++ b/ports/stm32/boards/CERB40/mpconfigboard.h
@@ -31,7 +31,7 @@
 #define MICROPY_HW_UART6_TX     (pin_C6)
 #define MICROPY_HW_UART6_RX     (pin_C7)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B6)
 #define MICROPY_HW_I2C1_SDA (pin_B7)
 #define MICROPY_HW_I2C2_SCL (pin_B10)
@@ -39,7 +39,7 @@
 #define MICROPY_HW_I2C3_SCL (pin_A8)
 #define MICROPY_HW_I2C3_SDA (pin_C9)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS  (pin_A4)
 #define MICROPY_HW_SPI1_SCK  (pin_A5)
 #define MICROPY_HW_SPI1_MISO (pin_A6)
@@ -49,7 +49,7 @@
 #define MICROPY_HW_SPI3_MISO (pin_B4)
 #define MICROPY_HW_SPI3_MOSI (pin_B5)
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX (pin_B9)
 #define MICROPY_HW_CAN1_RX (pin_B8)
 #define MICROPY_HW_CAN2_TX (pin_B13)
diff --git a/ports/stm32/boards/ESPRUINO_PICO/mpconfigboard.h b/ports/stm32/boards/ESPRUINO_PICO/mpconfigboard.h
index 53c7f3cd50..ed8178d7d4 100644
--- a/ports/stm32/boards/ESPRUINO_PICO/mpconfigboard.h
+++ b/ports/stm32/boards/ESPRUINO_PICO/mpconfigboard.h
@@ -32,7 +32,7 @@
 #define MICROPY_HW_UART6_TX     (pin_A11)
 #define MICROPY_HW_UART6_RX     (pin_A12)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B6)
 #define MICROPY_HW_I2C1_SDA (pin_B7)
 #define MICROPY_HW_I2C2_SCL (pin_B10)
@@ -40,7 +40,7 @@
 #define MICROPY_HW_I2C3_SCL (pin_A8)
 #define MICROPY_HW_I2C3_SDA (pin_B4)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS  (pin_A4)
 #define MICROPY_HW_SPI1_SCK  (pin_A5)
 #define MICROPY_HW_SPI1_MISO (pin_A6)
diff --git a/ports/stm32/boards/HYDRABUS/mpconfigboard.h b/ports/stm32/boards/HYDRABUS/mpconfigboard.h
index d8f1a864b2..d894f1606c 100644
--- a/ports/stm32/boards/HYDRABUS/mpconfigboard.h
+++ b/ports/stm32/boards/HYDRABUS/mpconfigboard.h
@@ -30,13 +30,13 @@
 #define MICROPY_HW_UART6_TX     (pin_C6)
 #define MICROPY_HW_UART6_RX     (pin_C7)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B6)
 #define MICROPY_HW_I2C1_SDA (pin_B7)
 #define MICROPY_HW_I2C2_SCL (pin_B10)
 #define MICROPY_HW_I2C2_SDA (pin_B11)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS  (pin_A4)
 #define MICROPY_HW_SPI1_SCK  (pin_A5)
 #define MICROPY_HW_SPI1_MISO (pin_A6)
diff --git a/ports/stm32/boards/LIMIFROG/mpconfigboard.h b/ports/stm32/boards/LIMIFROG/mpconfigboard.h
index 4b750c17ff..be9b5a8bb8 100644
--- a/ports/stm32/boards/LIMIFROG/mpconfigboard.h
+++ b/ports/stm32/boards/LIMIFROG/mpconfigboard.h
@@ -25,13 +25,13 @@ void LIMIFROG_board_early_init(void);
 #define MICROPY_HW_UART3_TX (pin_C10)
 #define MICROPY_HW_UART3_RX (pin_C11)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B8)
 #define MICROPY_HW_I2C1_SDA (pin_B9)
 #define MICROPY_HW_I2C2_SCL (pin_B10)
 #define MICROPY_HW_I2C2_SDA (pin_B11)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS     (pin_A4)
 #define MICROPY_HW_SPI1_SCK     (pin_A5)
 #define MICROPY_HW_SPI1_MISO    (pin_A6)
diff --git a/ports/stm32/boards/NETDUINO_PLUS_2/mpconfigboard.h b/ports/stm32/boards/NETDUINO_PLUS_2/mpconfigboard.h
index d2075b52bf..38bf8b41e9 100644
--- a/ports/stm32/boards/NETDUINO_PLUS_2/mpconfigboard.h
+++ b/ports/stm32/boards/NETDUINO_PLUS_2/mpconfigboard.h
@@ -39,11 +39,11 @@ void NETDUINO_PLUS_2_board_early_init(void);
 #define MICROPY_HW_UART6_TX     (pin_C6)
 #define MICROPY_HW_UART6_RX     (pin_C7)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B6)
 #define MICROPY_HW_I2C1_SDA (pin_B7)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI2_NSS  (pin_B12)
 #define MICROPY_HW_SPI2_SCK  (pin_B13)
 #define MICROPY_HW_SPI2_MISO (pin_B14)
diff --git a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
index fb8de60221..7333dcd0c1 100644
--- a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
@@ -49,13 +49,13 @@
 #define MICROPY_HW_UART_REPL PYB_UART_2
 #define MICROPY_HW_UART_REPL_BAUD 115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B8)        // Arduino D15, pin 3 on CN10
 #define MICROPY_HW_I2C1_SDA (pin_B9)        // Arduino D14, pin 5 on CN10
 #define MICROPY_HW_I2C2_SCL (pin_B10)       // Arduino D6,  pin 25 on CN10
 #define MICROPY_HW_I2C2_SDA (pin_B11)       //              pin 18 on CN10
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS     (pin_A15)   //              pin 17 on CN7
 #define MICROPY_HW_SPI1_SCK     (pin_A5)    // Arduino D13, pin 11 on CN10
 #define MICROPY_HW_SPI1_MISO    (pin_A6)    // Arduino D12, pin 13 on CN10
diff --git a/ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.h
index babf63c7a1..6b874e298c 100644
--- a/ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.h
@@ -30,7 +30,7 @@
 #define MICROPY_HW_UART_REPL        PYB_UART_2
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B8)        // Arduino D15, pin 3 on CN10
 #define MICROPY_HW_I2C1_SDA (pin_B9)        //         D14, pin 5 on CN10
 #define MICROPY_HW_I2C2_SCL (pin_B10)       // Arduino D6,  pin 25 on CN10
@@ -38,7 +38,7 @@
 #define MICROPY_HW_I2C3_SCL (pin_A8)        // Arduino D7,  pin 23 on CN10
 #define MICROPY_HW_I2C3_SDA (pin_C9)        //              pin  1 on CN10
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS     (pin_A15)   //              pin 17 on CN7
 #define MICROPY_HW_SPI1_SCK     (pin_A5)    // Arduino D13, pin 11 on CN10
 #define MICROPY_HW_SPI1_MISO    (pin_A6)    // Arduino D12, pin 13 on CN10
diff --git a/ports/stm32/boards/NUCLEO_F411RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F411RE/mpconfigboard.h
index 26b1e0b619..e37ce889c3 100644
--- a/ports/stm32/boards/NUCLEO_F411RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F411RE/mpconfigboard.h
@@ -21,7 +21,7 @@
 #define MICROPY_HW_UART_REPL        PYB_UART_2
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B8)        // Arduino D15, pin 3 on CN10
 #define MICROPY_HW_I2C1_SDA (pin_B9)        //         D14, pin 5 on CN10
 #define MICROPY_HW_I2C2_SCL (pin_B10)       // Arduino D6,  pin 25 on CN10
@@ -29,7 +29,7 @@
 #define MICROPY_HW_I2C3_SCL (pin_A8)        // Arduino D7,  pin 23 on CN10
 #define MICROPY_HW_I2C3_SDA (pin_C9)        //              pin  1 on CN10
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS     (pin_A15)   //              pin 17 on CN7
 #define MICROPY_HW_SPI1_SCK     (pin_A5)    // Arduino D13, pin 11 on CN10
 #define MICROPY_HW_SPI1_MISO    (pin_A6)    // Arduino D12, pin 13 on CN10
diff --git a/ports/stm32/boards/NUCLEO_F413ZH/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F413ZH/mpconfigboard.h
index 2f488159a4..5297ceda5c 100644
--- a/ports/stm32/boards/NUCLEO_F413ZH/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F413ZH/mpconfigboard.h
@@ -41,7 +41,7 @@
 #define MICROPY_HW_UART_REPL        PYB_UART_3
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B8)
 #define MICROPY_HW_I2C1_SDA (pin_B9)
 #define MICROPY_HW_I2C2_SCL (pin_F1)
@@ -49,7 +49,7 @@
 #define MICROPY_HW_I2C3_SCL (pin_A8)
 #define MICROPY_HW_I2C3_SDA (pin_C9)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS     (pin_A4) // shared with DAC
 #define MICROPY_HW_SPI1_SCK     (pin_A5) // shared with DAC
 #define MICROPY_HW_SPI1_MISO    (pin_A6)
@@ -71,7 +71,7 @@
 #define MICROPY_HW_SPI5_MISO    (pin_E13)
 #define MICROPY_HW_SPI5_MOSI    (pin_E14)
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX (pin_G1)
 #define MICROPY_HW_CAN1_RX (pin_G0)
 #define MICROPY_HW_CAN2_TX (pin_G12)
diff --git a/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.h
index 05c98e113f..86c02b5178 100644
--- a/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.h
@@ -38,11 +38,11 @@
 #define MICROPY_HW_UART_REPL        PYB_UART_3
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C3_SCL (pin_A8)
 #define MICROPY_HW_I2C3_SDA (pin_C9)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS     (pin_A4)
 #define MICROPY_HW_SPI1_SCK     (pin_B3)
 #define MICROPY_HW_SPI1_MISO    (pin_B4)
@@ -58,7 +58,7 @@
 #define MICROPY_HW_SPI5_MISO    (pin_F8)
 #define MICROPY_HW_SPI5_MOSI    (pin_F9)
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX (pin_B9)
 #define MICROPY_HW_CAN1_RX (pin_B8)
 #define MICROPY_HW_CAN2_TX (pin_B13)
diff --git a/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h
index cd4ad36fa0..27845b33aa 100644
--- a/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h
@@ -24,7 +24,7 @@
 #define MICROPY_HW_UART_REPL        PYB_UART_2
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B6)        // Arduino D10, pin 17 on CN10
 #define MICROPY_HW_I2C1_SDA (pin_B7)        //              pin 21 on CN7
 #define MICROPY_HW_I2C2_SCL (pin_B10)       // Arduino D6,  pin 25 on CN10
@@ -32,7 +32,7 @@
 #define MICROPY_HW_I2C3_SCL (pin_A8)        // Arduino D7,  pin 23 on CN10
 #define MICROPY_HW_I2C3_SDA (pin_C9)        //              pin  1 on CN10
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS     (pin_A15)   //              pin 17 on CN7
 #define MICROPY_HW_SPI1_SCK     (pin_A5)    // Arduino D13, pin 11 on CN10
 #define MICROPY_HW_SPI1_MISO    (pin_A6)    // Arduino D12, pin 13 on CN10
diff --git a/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.h
index c9b0c60f27..402efcfe31 100644
--- a/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.h
@@ -40,19 +40,19 @@
 #define MICROPY_HW_UART_REPL        PYB_UART_3
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL         (pin_B8)
 #define MICROPY_HW_I2C1_SDA         (pin_B9)
 #define MICROPY_HW_I2C3_SCL         (pin_H7)
 #define MICROPY_HW_I2C3_SDA         (pin_H8)
 
-// SPI
+// SPI buses
 #define MICROPY_HW_SPI3_NSS         (pin_A4)
 #define MICROPY_HW_SPI3_SCK         (pin_B3)
 #define MICROPY_HW_SPI3_MISO        (pin_B4)
 #define MICROPY_HW_SPI3_MOSI        (pin_B5)
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX          (pin_B9)
 #define MICROPY_HW_CAN1_RX          (pin_B8)
 #define MICROPY_HW_CAN2_TX          (pin_B13)
diff --git a/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.h
index b659223b4d..4ed9f41832 100644
--- a/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.h
@@ -41,7 +41,7 @@ void NUCLEO_F767ZI_board_early_init(void);
 #define MICROPY_HW_UART_REPL        PYB_UART_3
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL         (pin_B8)
 #define MICROPY_HW_I2C1_SDA         (pin_B9)
 #define MICROPY_HW_I2C2_SCL         (pin_F1)
@@ -49,13 +49,13 @@ void NUCLEO_F767ZI_board_early_init(void);
 #define MICROPY_HW_I2C4_SCL         (pin_F14)
 #define MICROPY_HW_I2C4_SDA         (pin_F15)
 
-// SPI
+// SPI buses
 #define MICROPY_HW_SPI3_NSS         (pin_A4)
 #define MICROPY_HW_SPI3_SCK         (pin_B3)
 #define MICROPY_HW_SPI3_MISO        (pin_B4)
 #define MICROPY_HW_SPI3_MOSI        (pin_B5)
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX          (pin_D1)
 #define MICROPY_HW_CAN1_RX          (pin_D0)
 
diff --git a/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.h b/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.h
index 324f2b03ce..f25263fd2b 100644
--- a/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.h
@@ -49,7 +49,7 @@ void NUCLEO_H743ZI_board_early_init(void);
 #define MICROPY_HW_UART_REPL        PYB_UART_3
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL         (pin_B8)
 #define MICROPY_HW_I2C1_SDA         (pin_B9)
 #define MICROPY_HW_I2C2_SCL         (pin_F1)
@@ -57,7 +57,7 @@ void NUCLEO_H743ZI_board_early_init(void);
 #define MICROPY_HW_I2C4_SCL         (pin_F14)
 #define MICROPY_HW_I2C4_SDA         (pin_F15)
 
-// SPI
+// SPI buses
 #define MICROPY_HW_SPI3_NSS         (pin_A4)
 #define MICROPY_HW_SPI3_SCK         (pin_B3)
 #define MICROPY_HW_SPI3_MISO        (pin_B4)
diff --git a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
index a5c5dc9a0e..b7f7bc4c88 100644
--- a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
@@ -34,11 +34,11 @@
 #define MICROPY_HW_UART_REPL PYB_UART_2
 #define MICROPY_HW_UART_REPL_BAUD 115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B8)        // Arduino D15, pin 3 on CN10
 #define MICROPY_HW_I2C1_SDA (pin_B9)        // Arduino D14, pin 5 on CN10
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS     (pin_A15)   //              pin 17 on CN7
 #define MICROPY_HW_SPI1_SCK     (pin_A5)    // Arduino D13, pin 11 on CN10
 #define MICROPY_HW_SPI1_MISO    (pin_A6)    // Arduino D12, pin 13 on CN10
diff --git a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
index 14b3bab8a7..0a3ac1f185 100644
--- a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
@@ -42,13 +42,13 @@
 
 #define MICROPY_HW_FLASH_LATENCY    FLASH_LATENCY_4
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_A9)
 #define MICROPY_HW_I2C1_SDA (pin_A10)
 #define MICROPY_HW_I2C3_SCL (pin_A7)
 #define MICROPY_HW_I2C3_SDA (pin_B4)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS     (pin_B0)
 #define MICROPY_HW_SPI1_SCK     (pin_A5)
 #define MICROPY_HW_SPI1_MISO    (pin_A6)
diff --git a/ports/stm32/boards/NUCLEO_L452RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L452RE/mpconfigboard.h
index 9823ae9b9b..1b5827d5ae 100644
--- a/ports/stm32/boards/NUCLEO_L452RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L452RE/mpconfigboard.h
@@ -34,7 +34,7 @@
 #define MICROPY_HW_UART_REPL        PYB_UART_2
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL     (pin_B8)    // Arduino D15, pin 3 on CN10
 #define MICROPY_HW_I2C1_SDA     (pin_B9)    // Arduino D14, pin 5 on CN10
 #define MICROPY_HW_I2C2_SCL     (pin_B10)   // Arduino D6,  pin 25 on CN10
@@ -44,7 +44,7 @@
 #define MICROPY_HW_I2C4_SCL     (pin_C0)    //              pin 38 on CN7
 #define MICROPY_HW_I2C4_SDA     (pin_C1)    //              pin 36 on CN7
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS     (pin_A15)   //              pin 17 on CN7
 #define MICROPY_HW_SPI1_SCK     (pin_A5)    // Arduino D13, pin 11 on CN10
 #define MICROPY_HW_SPI1_MISO    (pin_A6)    // Arduino D12, pin 13 on CN10
@@ -58,7 +58,7 @@
 #define MICROPY_HW_SPI3_MISO    (pin_C11)   //              pin 2 on CN7
 #define MICROPY_HW_SPI3_MOSI    (pin_C12)   //              pin 3 on CN7
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX (pin_B9)
 #define MICROPY_HW_CAN1_RX (pin_B8)
 
diff --git a/ports/stm32/boards/NUCLEO_L476RG/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L476RG/mpconfigboard.h
index 2899a97ace..a7bb0b36bb 100644
--- a/ports/stm32/boards/NUCLEO_L476RG/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L476RG/mpconfigboard.h
@@ -46,7 +46,7 @@
 #define MICROPY_HW_UART_REPL        PYB_UART_2
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL         (pin_B8)
 #define MICROPY_HW_I2C1_SDA         (pin_B9)
 #define MICROPY_HW_I2C2_SCL         (pin_B10)
@@ -54,7 +54,7 @@
 #define MICROPY_HW_I2C3_SCL         (pin_C0)
 #define MICROPY_HW_I2C3_SDA         (pin_C1)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS         (pin_A4)
 #define MICROPY_HW_SPI1_SCK         (pin_B3)
 #define MICROPY_HW_SPI1_MISO        (pin_B4)
@@ -64,7 +64,7 @@
 #define MICROPY_HW_SPI2_MISO        (pin_B14)
 #define MICROPY_HW_SPI2_MOSI        (pin_B15)
 
-// CAN bus
+// CAN buses
 #define MICROPY_HW_CAN1_TX          (pin_A12)
 #define MICROPY_HW_CAN1_RX          (pin_A11)
 
diff --git a/ports/stm32/boards/OLIMEX_E407/mpconfigboard.h b/ports/stm32/boards/OLIMEX_E407/mpconfigboard.h
index d5cd7bb1ec..999f97a708 100644
--- a/ports/stm32/boards/OLIMEX_E407/mpconfigboard.h
+++ b/ports/stm32/boards/OLIMEX_E407/mpconfigboard.h
@@ -36,13 +36,13 @@
 #define MICROPY_HW_UART6_TX     (pin_C6)
 #define MICROPY_HW_UART6_RX     (pin_C7)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B8)
 #define MICROPY_HW_I2C1_SDA (pin_B9)
 #define MICROPY_HW_I2C2_SCL (pin_B10)
 #define MICROPY_HW_I2C2_SDA (pin_B11)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS  (pin_A4)
 #define MICROPY_HW_SPI1_SCK  (pin_A5)
 #define MICROPY_HW_SPI1_MISO (pin_A6)
@@ -52,7 +52,7 @@
 #define MICROPY_HW_SPI2_MISO (pin_B14)
 #define MICROPY_HW_SPI2_MOSI (pin_B15)
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX (pin_B9)
 #define MICROPY_HW_CAN1_RX (pin_B8)
 #define MICROPY_HW_CAN2_TX (pin_B13)
diff --git a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
index 57cc75efc6..48b3ee3eb9 100644
--- a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
+++ b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
@@ -122,7 +122,7 @@ extern struct _spi_bdev_t spi_bdev2;
 #define MICROPY_HW_UART6_RTS        (pyb_pin_BT_RTS)
 #define MICROPY_HW_UART6_CTS        (pyb_pin_BT_CTS)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_NAME        "X"
 #define MICROPY_HW_I2C1_SCL         (pyb_pin_X9)
 #define MICROPY_HW_I2C1_SDA         (pyb_pin_X10)
@@ -130,7 +130,7 @@ extern struct _spi_bdev_t spi_bdev2;
 #define MICROPY_HW_I2C2_SCL         (pyb_pin_Y9)
 #define MICROPY_HW_I2C2_SDA         (pyb_pin_Y10)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NAME        "X"
 #define MICROPY_HW_SPI1_NSS         (pyb_pin_X5)
 #define MICROPY_HW_SPI1_SCK         (pyb_pin_X6)
@@ -146,7 +146,7 @@ extern struct _spi_bdev_t spi_bdev2;
 #define MICROPY_HW_SPI3_MISO        (pyb_pin_W50)
 #define MICROPY_HW_SPI3_MOSI        (pyb_pin_W46)
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_NAME        "X"
 #define MICROPY_HW_CAN1_TX          (pyb_pin_X10)
 #define MICROPY_HW_CAN1_RX          (pyb_pin_X9)
diff --git a/ports/stm32/boards/PYBD_SF6/mpconfigboard.h b/ports/stm32/boards/PYBD_SF6/mpconfigboard.h
index cbfbe39945..8c11d7b2ee 100644
--- a/ports/stm32/boards/PYBD_SF6/mpconfigboard.h
+++ b/ports/stm32/boards/PYBD_SF6/mpconfigboard.h
@@ -49,7 +49,7 @@
 #define MICROPY_HW_UART7_TX         (pyb_pin_W16)
 #define MICROPY_HW_UART7_RX         (pyb_pin_W22B)
 
-// Extra CAN busses
+// Extra CAN buses
 #define MICROPY_HW_CAN2_NAME        "Y"
 #define MICROPY_HW_CAN2_TX          (pyb_pin_Y6)
 #define MICROPY_HW_CAN2_RX          (pyb_pin_Y5)
diff --git a/ports/stm32/boards/PYBLITEV10/mpconfigboard.h b/ports/stm32/boards/PYBLITEV10/mpconfigboard.h
index 77509a6003..1643e250cb 100644
--- a/ports/stm32/boards/PYBLITEV10/mpconfigboard.h
+++ b/ports/stm32/boards/PYBLITEV10/mpconfigboard.h
@@ -35,7 +35,7 @@
 #define MICROPY_HW_UART6_TX     (pin_C6)
 #define MICROPY_HW_UART6_RX     (pin_C7)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_NAME "X"
 #define MICROPY_HW_I2C1_SCL (pin_B6)
 #define MICROPY_HW_I2C1_SDA (pin_B7)
@@ -43,7 +43,7 @@
 #define MICROPY_HW_I2C3_SCL (pin_A8)
 #define MICROPY_HW_I2C3_SDA (pin_B8)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NAME "X"
 #define MICROPY_HW_SPI1_NSS  (pin_A4) // X5
 #define MICROPY_HW_SPI1_SCK  (pin_A5) // X6
diff --git a/ports/stm32/boards/PYBV10/mpconfigboard.h b/ports/stm32/boards/PYBV10/mpconfigboard.h
index dda98776cd..52382f44d5 100644
--- a/ports/stm32/boards/PYBV10/mpconfigboard.h
+++ b/ports/stm32/boards/PYBV10/mpconfigboard.h
@@ -44,7 +44,7 @@
 #define MICROPY_HW_UART6_TX     (pin_C6)
 #define MICROPY_HW_UART6_RX     (pin_C7)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_NAME "X"
 #define MICROPY_HW_I2C1_SCL (pin_B6)
 #define MICROPY_HW_I2C1_SDA (pin_B7)
@@ -52,7 +52,7 @@
 #define MICROPY_HW_I2C2_SCL (pin_B10)
 #define MICROPY_HW_I2C2_SDA (pin_B11)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NAME "X"
 #define MICROPY_HW_SPI1_NSS  (pin_A4) // X5
 #define MICROPY_HW_SPI1_SCK  (pin_A5) // X6
@@ -64,7 +64,7 @@
 #define MICROPY_HW_SPI2_MISO (pin_B14) // Y7
 #define MICROPY_HW_SPI2_MOSI (pin_B15) // Y8
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_NAME "YA"
 #define MICROPY_HW_CAN1_TX   (pin_B9) // Y4
 #define MICROPY_HW_CAN1_RX   (pin_B8) // Y3
diff --git a/ports/stm32/boards/PYBV11/mpconfigboard.h b/ports/stm32/boards/PYBV11/mpconfigboard.h
index 7d10c13e8f..8e84694048 100644
--- a/ports/stm32/boards/PYBV11/mpconfigboard.h
+++ b/ports/stm32/boards/PYBV11/mpconfigboard.h
@@ -44,7 +44,7 @@
 #define MICROPY_HW_UART6_TX     (pin_C6)
 #define MICROPY_HW_UART6_RX     (pin_C7)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_NAME "X"
 #define MICROPY_HW_I2C1_SCL (pin_B6)
 #define MICROPY_HW_I2C1_SDA (pin_B7)
@@ -52,7 +52,7 @@
 #define MICROPY_HW_I2C2_SCL (pin_B10)
 #define MICROPY_HW_I2C2_SDA (pin_B11)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NAME "X"
 #define MICROPY_HW_SPI1_NSS  (pin_A4) // X5
 #define MICROPY_HW_SPI1_SCK  (pin_A5) // X6
@@ -64,7 +64,7 @@
 #define MICROPY_HW_SPI2_MISO (pin_B14) // Y7
 #define MICROPY_HW_SPI2_MOSI (pin_B15) // Y8
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_NAME "YA"
 #define MICROPY_HW_CAN1_TX   (pin_B9) // Y4
 #define MICROPY_HW_CAN1_RX   (pin_B8) // Y3
diff --git a/ports/stm32/boards/PYBV3/mpconfigboard.h b/ports/stm32/boards/PYBV3/mpconfigboard.h
index 7f1531770f..9c956efd6d 100644
--- a/ports/stm32/boards/PYBV3/mpconfigboard.h
+++ b/ports/stm32/boards/PYBV3/mpconfigboard.h
@@ -44,7 +44,7 @@
 #define MICROPY_HW_I2C2_SCL (pin_B10)
 #define MICROPY_HW_I2C2_SDA (pin_B11)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NAME "X"
 #define MICROPY_HW_SPI1_NSS  (pin_A4) // X5
 #define MICROPY_HW_SPI1_SCK  (pin_A5) // X6
@@ -56,7 +56,7 @@
 #define MICROPY_HW_SPI2_MISO (pin_B14) // Y7
 #define MICROPY_HW_SPI2_MOSI (pin_B15) // Y8
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX (pin_B9) // Y4
 #define MICROPY_HW_CAN1_RX (pin_B8) // Y3
 #define MICROPY_HW_CAN2_TX (pin_B13) // Y6
diff --git a/ports/stm32/boards/PYBV4/mpconfigboard.h b/ports/stm32/boards/PYBV4/mpconfigboard.h
index c1c6075113..2bd569ecdf 100644
--- a/ports/stm32/boards/PYBV4/mpconfigboard.h
+++ b/ports/stm32/boards/PYBV4/mpconfigboard.h
@@ -41,7 +41,7 @@
 #define MICROPY_HW_UART6_PORT (GPIOC)
 #define MICROPY_HW_UART6_PINS (GPIO_PIN_6 | GPIO_PIN_7)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_NAME "X"
 #define MICROPY_HW_I2C1_SCL (pin_B6)
 #define MICROPY_HW_I2C1_SDA (pin_B7)
@@ -49,7 +49,7 @@
 #define MICROPY_HW_I2C2_SCL (pin_B10)
 #define MICROPY_HW_I2C2_SDA (pin_B11)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NAME "X"
 #define MICROPY_HW_SPI1_NSS  (pin_A4) // X5
 #define MICROPY_HW_SPI1_SCK  (pin_A5) // X6
@@ -61,7 +61,7 @@
 #define MICROPY_HW_SPI2_MISO (pin_B14) // Y7
 #define MICROPY_HW_SPI2_MOSI (pin_B15) // Y8
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_NAME "YA"
 #define MICROPY_HW_CAN1_TX   (pin_B9) // Y4
 #define MICROPY_HW_CAN1_RX   (pin_B8) // Y3
diff --git a/ports/stm32/boards/STM32F411DISC/mpconfigboard.h b/ports/stm32/boards/STM32F411DISC/mpconfigboard.h
index 13172333b7..97da204612 100644
--- a/ports/stm32/boards/STM32F411DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F411DISC/mpconfigboard.h
@@ -26,7 +26,7 @@
 #define MICROPY_HW_UART6_TX     (pin_C6)
 #define MICROPY_HW_UART6_RX     (pin_C7)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B6)
 #define MICROPY_HW_I2C1_SDA (pin_B9)
 //#define MICROPY_HW_I2C2_SCL (pin_B10)
@@ -34,7 +34,7 @@
 #define MICROPY_HW_I2C3_SCL (pin_A8)
 #define MICROPY_HW_I2C3_SDA (pin_A9)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS  (pin_A4)
 #define MICROPY_HW_SPI1_SCK  (pin_A5)
 #define MICROPY_HW_SPI1_MISO (pin_A6)
diff --git a/ports/stm32/boards/STM32F429DISC/mpconfigboard.h b/ports/stm32/boards/STM32F429DISC/mpconfigboard.h
index 9b65f61743..95cab08c8f 100644
--- a/ports/stm32/boards/STM32F429DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F429DISC/mpconfigboard.h
@@ -22,11 +22,11 @@
 #define MICROPY_HW_UART2_TX     (pin_D8)
 #define MICROPY_HW_UART2_RX     (pin_D9)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C3_SCL (pin_A8)
 #define MICROPY_HW_I2C3_SDA (pin_C9)
 
-// SPI busses
+// SPI buses
 //#define MICROPY_HW_SPI1_NSS     (pin_A4)
 //#define MICROPY_HW_SPI1_SCK     (pin_A5)
 //#define MICROPY_HW_SPI1_MISO    (pin_A6)
@@ -52,7 +52,7 @@
 //#define MICROPY_HW_SPI6_MISO    (pin_G12)
 //#define MICROPY_HW_SPI6_MOSI    (pin_G14)
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX (pin_B9)
 #define MICROPY_HW_CAN1_RX (pin_B8)
 #define MICROPY_HW_CAN2_TX (pin_B13)
diff --git a/ports/stm32/boards/STM32F439/mpconfigboard.h b/ports/stm32/boards/STM32F439/mpconfigboard.h
index a4e1093445..702ef265bb 100644
--- a/ports/stm32/boards/STM32F439/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F439/mpconfigboard.h
@@ -40,11 +40,11 @@
 #define MICROPY_HW_UART6_TX     (pin_C6)
 #define MICROPY_HW_UART6_RX     (pin_C7)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_A8)
 #define MICROPY_HW_I2C1_SDA (pin_C9)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS     (pin_A4)
 #define MICROPY_HW_SPI1_SCK     (pin_A5)
 #define MICROPY_HW_SPI1_MISO    (pin_A6)
@@ -74,7 +74,7 @@
 //#define MICROPY_HW_SPI6_MISO    (pin_G12)
 //#define MICROPY_HW_SPI6_MOSI    (pin_G14)
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX (pin_B9)
 #define MICROPY_HW_CAN1_RX (pin_B8)
 #define MICROPY_HW_CAN2_TX (pin_B13)
diff --git a/ports/stm32/boards/STM32F4DISC/mpconfigboard.h b/ports/stm32/boards/STM32F4DISC/mpconfigboard.h
index 3e4c8261cc..dbe52e6b10 100644
--- a/ports/stm32/boards/STM32F4DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F4DISC/mpconfigboard.h
@@ -43,13 +43,13 @@
 #define MICROPY_HW_UART6_TX     (pin_C6)
 #define MICROPY_HW_UART6_RX     (pin_C7)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B6)
 #define MICROPY_HW_I2C1_SDA (pin_B7)
 #define MICROPY_HW_I2C2_SCL (pin_B10)
 #define MICROPY_HW_I2C2_SDA (pin_B11)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS  (pin_A4)
 #define MICROPY_HW_SPI1_SCK  (pin_A5)
 #define MICROPY_HW_SPI1_MISO (pin_A6)
@@ -59,7 +59,7 @@
 #define MICROPY_HW_SPI2_MISO (pin_B14)
 #define MICROPY_HW_SPI2_MOSI (pin_B15)
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX (pin_B9)
 #define MICROPY_HW_CAN1_RX (pin_B8)
 #define MICROPY_HW_CAN2_TX (pin_B13)
diff --git a/ports/stm32/boards/STM32F769DISC/mpconfigboard.h b/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
index 5004a8ecac..87cefb5017 100644
--- a/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
@@ -59,19 +59,19 @@ extern struct _spi_bdev_t spi_bdev;
 #define MICROPY_HW_UART_REPL        PYB_UART_1
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL         (pin_B8)
 #define MICROPY_HW_I2C1_SDA         (pin_B9)
 #define MICROPY_HW_I2C3_SCL         (pin_H7)
 #define MICROPY_HW_I2C3_SDA         (pin_H8)
 
-// SPI
+// SPI buses
 #define MICROPY_HW_SPI2_NSS         (pin_A11)
 #define MICROPY_HW_SPI2_SCK         (pin_A12)
 #define MICROPY_HW_SPI2_MISO        (pin_B14)
 #define MICROPY_HW_SPI2_MOSI        (pin_B15)
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX          (pin_B9)
 #define MICROPY_HW_CAN1_RX          (pin_B8)
 #define MICROPY_HW_CAN2_TX          (pin_B13)
diff --git a/ports/stm32/boards/STM32F7DISC/mpconfigboard.h b/ports/stm32/boards/STM32F7DISC/mpconfigboard.h
index b07f0a7b8f..cf7061902e 100644
--- a/ports/stm32/boards/STM32F7DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F7DISC/mpconfigboard.h
@@ -38,20 +38,20 @@ void STM32F7DISC_board_early_init(void);
 #define MICROPY_HW_UART_REPL        PYB_UART_1
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL         (pin_B8)
 #define MICROPY_HW_I2C1_SDA         (pin_B9)
 
 #define MICROPY_HW_I2C3_SCL         (pin_H7)
 #define MICROPY_HW_I2C3_SDA         (pin_H8)
 
-// SPI
+// SPI buses
 #define MICROPY_HW_SPI2_NSS         (pin_I0)
 #define MICROPY_HW_SPI2_SCK         (pin_I1)
 #define MICROPY_HW_SPI2_MISO        (pin_B14)
 #define MICROPY_HW_SPI2_MOSI        (pin_B15)
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX          (pin_B9)
 #define MICROPY_HW_CAN1_RX          (pin_B8)
 #define MICROPY_HW_CAN2_TX          (pin_B13)
diff --git a/ports/stm32/boards/STM32L476DISC/mpconfigboard.h b/ports/stm32/boards/STM32L476DISC/mpconfigboard.h
index ad62f761e5..58fb8ef144 100644
--- a/ports/stm32/boards/STM32L476DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32L476DISC/mpconfigboard.h
@@ -50,19 +50,19 @@ extern struct _spi_bdev_t spi_bdev;
 #define MICROPY_HW_UART_REPL        PYB_UART_2
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B6)
 #define MICROPY_HW_I2C1_SDA (pin_B7)
 #define MICROPY_HW_I2C2_SCL (pin_B10)
 #define MICROPY_HW_I2C2_SDA (pin_B11)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI2_NSS     (pin_D0)
 #define MICROPY_HW_SPI2_SCK     (pin_D1)
 #define MICROPY_HW_SPI2_MISO    (pin_D3)
 #define MICROPY_HW_SPI2_MOSI    (pin_D4)
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX (pin_B9)
 #define MICROPY_HW_CAN1_RX (pin_B8)
 
diff --git a/ports/stm32/boards/STM32L496GDISC/mpconfigboard.h b/ports/stm32/boards/STM32L496GDISC/mpconfigboard.h
index 5d9fa25bc3..d4d78454af 100644
--- a/ports/stm32/boards/STM32L496GDISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32L496GDISC/mpconfigboard.h
@@ -26,13 +26,13 @@
 #define MICROPY_HW_UART_REPL        PYB_UART_2
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_G14)
 #define MICROPY_HW_I2C1_SDA (pin_G13)
 #define MICROPY_HW_I2C2_SCL (pin_H4)
 #define MICROPY_HW_I2C2_SDA (pin_B14)
 
-// SPI busses
+// SPI buses
 // -> To the arduino connector
 #define MICROPY_HW_SPI1_NSS     (pin_A15)
 #define MICROPY_HW_SPI1_SCK     (pin_A5)
diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index eceb5b6e7a..1b8db2e3e6 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -294,7 +294,7 @@ STATIC mp_obj_t pyb_uart_init_helper(pyb_uart_obj_t *self, size_t n_args, const
 /// the bus, if any).  If extra arguments are given, the bus is initialised.
 /// See `init` for parameters of initialisation.
 ///
-/// The physical pins of the UART busses are:
+/// The physical pins of the UART buses are:
 ///
 ///   - `UART(4)` is on `XA`: `(TX, RX) = (X1, X2) = (PA0, PA1)`
 ///   - `UART(1)` is on `XB`: `(TX, RX) = (X9, X10) = (PB6, PB7)`
diff --git a/ports/stm32/pyb_i2c.c b/ports/stm32/pyb_i2c.c
index ee8b498a13..f0bd38333d 100644
--- a/ports/stm32/pyb_i2c.c
+++ b/ports/stm32/pyb_i2c.c
@@ -660,7 +660,7 @@ STATIC mp_obj_t pyb_i2c_init_helper(const pyb_i2c_obj_t *self, size_t n_args, co
 /// the bus, if any).  If extra arguments are given, the bus is initialised.
 /// See `init` for parameters of initialisation.
 ///
-/// The physical pins of the I2C busses are:
+/// The physical pins of the I2C buses are:
 ///
 ///   - `I2C(1)` is on the X position: `(SCL, SDA) = (X9, X10) = (PB6, PB7)`
 ///   - `I2C(2)` is on the Y position: `(SCL, SDA) = (Y9, Y10) = (PB10, PB11)`
diff --git a/ports/stm32/pyb_spi.c b/ports/stm32/pyb_spi.c
index cc9dd11636..99a1cd77b4 100644
--- a/ports/stm32/pyb_spi.c
+++ b/ports/stm32/pyb_spi.c
@@ -125,7 +125,7 @@ STATIC mp_obj_t pyb_spi_init_helper(const pyb_spi_obj_t *self, size_t n_args, co
 // the bus, if any).  If extra arguments are given, the bus is initialised.
 // See `init` for parameters of initialisation.
 //
-// The physical pins of the SPI busses are:
+// The physical pins of the SPI buses are:
 //   - `SPI(1)` is on the X position: `(NSS, SCK, MISO, MOSI) = (X5, X6, X7, X8) = (PA4, PA5, PA6, PA7)`
 //   - `SPI(2)` is on the Y position: `(NSS, SCK, MISO, MOSI) = (Y5, Y6, Y7, Y8) = (PB12, PB13, PB14, PB15)`
 //
diff --git a/ports/stm32/spi.c b/ports/stm32/spi.c
index f8ab791898..d3b3a784e8 100644
--- a/ports/stm32/spi.c
+++ b/ports/stm32/spi.c
@@ -31,7 +31,7 @@
 #include "py/mphal.h"
 #include "spi.h"
 
-// Possible DMA configurations for SPI busses:
+// Possible DMA configurations for SPI buses:
 // SPI1_TX: DMA2_Stream3.CHANNEL_3 or DMA2_Stream5.CHANNEL_3
 // SPI1_RX: DMA2_Stream0.CHANNEL_3 or DMA2_Stream2.CHANNEL_3
 // SPI2_TX: DMA1_Stream4.CHANNEL_0
diff --git a/ports/teensy/uart.c b/ports/teensy/uart.c
index 471b40ee01..6373047b00 100644
--- a/ports/teensy/uart.c
+++ b/ports/teensy/uart.c
@@ -302,7 +302,7 @@ STATIC mp_obj_t pyb_uart_init_helper(pyb_uart_obj_t *self, uint n_args, const mp
 /// the bus, if any).  If extra arguments are given, the bus is initialised.
 /// See `init` for parameters of initialisation.
 ///
-/// The physical pins of the UART busses are:
+/// The physical pins of the UART buses are:
 ///
 ///   - `UART(4)` is on `XA`: `(TX, RX) = (X1, X2) = (PA0, PA1)`
 ///   - `UART(1)` is on `XB`: `(TX, RX) = (X9, X10) = (PB6, PB7)`

From 04927dfaca06d68a35ff1a5700a5e4eb283b5f2d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 14 Nov 2020 18:54:26 +1100
Subject: [PATCH 132/349] tools/mpy_ld.py: Support R_X86_64_GOTPCREL reloc for
 x86-64 arch.

This can be treated by the linker the same as R_X86_64_REX_GOTPCRELX,
according to https://reviews.llvm.org/D18301.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpy_ld.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index 774966a7f6..8522499438 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -73,6 +73,7 @@ R_XTENSA_SLOT0_OP = 20
 R_ARM_BASE_PREL = 25  # aka R_ARM_GOTPC
 R_ARM_GOT_BREL = 26  # aka R_ARM_GOT32
 R_ARM_THM_JUMP24 = 30
+R_X86_64_GOTPCREL = 9
 R_X86_64_REX_GOTPCRELX = 42
 R_386_GOT32X = 43
 
@@ -132,7 +133,7 @@ ARCH_DATA = {
         | MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE,
         2,
         8,
-        (R_X86_64_REX_GOTPCRELX,),
+        (R_X86_64_GOTPCREL, R_X86_64_REX_GOTPCRELX),
         asm_jump_x86,
     ),
     "armv7m": ArchData(
@@ -536,7 +537,10 @@ def do_relocation_text(env, text_addr, r):
         # Relcation pointing to GOT
         reloc = addr = env.got_entries[s.name].offset
 
-    elif env.arch.name == "EM_X86_64" and r_info_type == R_X86_64_REX_GOTPCRELX:
+    elif env.arch.name == "EM_X86_64" and r_info_type in (
+        R_X86_64_GOTPCREL,
+        R_X86_64_REX_GOTPCRELX,
+    ):
         # Relcation pointing to GOT
         got_entry = env.got_entries[s.name]
         addr = env.got_section.addr + got_entry.offset

From f49d47c167ce97b48ff3e9cbbc016b09664390f5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 24 Nov 2020 23:37:05 +1100
Subject: [PATCH 133/349] py/asmx64: Support use of top 8 regs in src_r64
 argument.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/asmx64.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/py/asmx64.c b/py/asmx64.c
index fd64eaf98b..62df5c6d4a 100644
--- a/py/asmx64.c
+++ b/py/asmx64.c
@@ -285,31 +285,28 @@ void asm_x64_mov_r64_to_mem64(asm_x64_t *as, int src_r64, int dest_r64, int dest
 }
 
 void asm_x64_mov_mem8_to_r64zx(asm_x64_t *as, int src_r64, int src_disp, int dest_r64) {
-    assert(src_r64 < 8);
-    if (dest_r64 < 8) {
+    if (src_r64 < 8 && dest_r64 < 8) {
         asm_x64_write_byte_2(as, 0x0f, OPCODE_MOVZX_RM8_TO_R64);
     } else {
-        asm_x64_write_byte_3(as, REX_PREFIX | REX_R, 0x0f, OPCODE_MOVZX_RM8_TO_R64);
+        asm_x64_write_byte_3(as, REX_PREFIX | REX_R_FROM_R64(dest_r64) | REX_B_FROM_R64(src_r64), 0x0f, OPCODE_MOVZX_RM8_TO_R64);
     }
     asm_x64_write_r64_disp(as, dest_r64, src_r64, src_disp);
 }
 
 void asm_x64_mov_mem16_to_r64zx(asm_x64_t *as, int src_r64, int src_disp, int dest_r64) {
-    assert(src_r64 < 8);
-    if (dest_r64 < 8) {
+    if (src_r64 < 8 && dest_r64 < 8) {
         asm_x64_write_byte_2(as, 0x0f, OPCODE_MOVZX_RM16_TO_R64);
     } else {
-        asm_x64_write_byte_3(as, REX_PREFIX | REX_R, 0x0f, OPCODE_MOVZX_RM16_TO_R64);
+        asm_x64_write_byte_3(as, REX_PREFIX | REX_R_FROM_R64(dest_r64) | REX_B_FROM_R64(src_r64), 0x0f, OPCODE_MOVZX_RM16_TO_R64);
     }
     asm_x64_write_r64_disp(as, dest_r64, src_r64, src_disp);
 }
 
 void asm_x64_mov_mem32_to_r64zx(asm_x64_t *as, int src_r64, int src_disp, int dest_r64) {
-    assert(src_r64 < 8);
-    if (dest_r64 < 8) {
+    if (src_r64 < 8 && dest_r64 < 8) {
         asm_x64_write_byte_1(as, OPCODE_MOV_RM64_TO_R64);
     } else {
-        asm_x64_write_byte_2(as, REX_PREFIX | REX_R, OPCODE_MOV_RM64_TO_R64);
+        asm_x64_write_byte_2(as, REX_PREFIX | REX_R_FROM_R64(dest_r64) | REX_B_FROM_R64(src_r64), OPCODE_MOV_RM64_TO_R64);
     }
     asm_x64_write_r64_disp(as, dest_r64, src_r64, src_disp);
 }

From 5176a2d7325d941d8f2f41b31eab87b6e7a83f06 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 24 Nov 2020 23:37:58 +1100
Subject: [PATCH 134/349] py/emitnative: Fix x86-64 emitter to generate correct
 8/16-bit stores.

Fixes issue #6643.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/emitnative.c                      |  4 ++--
 tests/micropython/viper_misc2.py     | 21 +++++++++++++++++++++
 tests/micropython/viper_misc2.py.exp |  1 +
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 tests/micropython/viper_misc2.py
 create mode 100644 tests/micropython/viper_misc2.py.exp

diff --git a/py/emitnative.c b/py/emitnative.c
index 052a505911..425ba2d33e 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -1769,7 +1769,7 @@ STATIC void emit_native_store_subscr(emit_t *emit) {
             int reg_index = REG_ARG_2;
             int reg_value = REG_ARG_3;
             emit_pre_pop_reg_flexible(emit, &vtype_base, &reg_base, reg_index, reg_value);
-            #if N_X86
+            #if N_X64 || N_X86
             // special case: x86 needs byte stores to be from lower 4 regs (REG_ARG_3 is EDX)
             emit_pre_pop_reg(emit, &vtype_value, reg_value);
             #else
@@ -1856,7 +1856,7 @@ STATIC void emit_native_store_subscr(emit_t *emit) {
                 EMIT_NATIVE_VIPER_TYPE_ERROR(emit,
                     MP_ERROR_TEXT("can't store with '%q' index"), vtype_to_qstr(vtype_index));
             }
-            #if N_X86
+            #if N_X64 || N_X86
             // special case: x86 needs byte stores to be from lower 4 regs (REG_ARG_3 is EDX)
             emit_pre_pop_reg(emit, &vtype_value, reg_value);
             #else
diff --git a/tests/micropython/viper_misc2.py b/tests/micropython/viper_misc2.py
new file mode 100644
index 0000000000..8f0be487d6
--- /dev/null
+++ b/tests/micropython/viper_misc2.py
@@ -0,0 +1,21 @@
+# Miscellaneous viper tests
+
+# Test correct use of registers in load and store
+@micropython.viper
+def expand(dest: ptr8, source: ptr8, length: int):
+    n = 0
+    for x in range(0, length, 2):
+        c = source[x]
+        d = source[x + 1]
+        dest[n] = (c & 0xE0) | ((c & 0x1C) >> 1)
+        n += 1
+        dest[n] = ((c & 3) << 6) | ((d & 0xE0) >> 4)
+        n += 1
+        dest[n] = ((d & 0x1C) << 3) | ((d & 3) << 2)
+        n += 1
+
+
+source = b"\xaa\xaa\xff\xff"
+dest = bytearray(len(source) // 2 * 3)
+expand(dest, source, len(source))
+print(dest)
diff --git a/tests/micropython/viper_misc2.py.exp b/tests/micropython/viper_misc2.py.exp
new file mode 100644
index 0000000000..eff2f5e41d
--- /dev/null
+++ b/tests/micropython/viper_misc2.py.exp
@@ -0,0 +1 @@
+bytearray(b'\xa4\x8aH\xee\xce\xec')

From a96afae90f6e5d693173382561d06e583b0b5fa5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 14 May 2021 14:10:37 +1000
Subject: [PATCH 135/349] stm32/sdio: Fix case of SDIO DMA turning off mid
 transfer.

The DMA driver will turn off DMA if it hasn't been used for an amount of
time (to save power).  The SDIO driver for cyw43 WLAN was not informing the
DMA driver that it was using DMA and there was a chance that the DMA would
turn off in the middle of an SDIO DMA transfer.  The symptoms of this would
be printing of SDIO error messages and a failure to communicate with the
cyw43 WLAN module.

This commit fixes this issue by changing the SDIO driver to use the
dma_nohal_XXX API to initialise and start the DMA.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/dma.c  |  2 +-
 ports/stm32/sdio.c | 35 +++++++++++++++++++----------------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/ports/stm32/dma.c b/ports/stm32/dma.c
index 4320315ba4..d4b41771b0 100644
--- a/ports/stm32/dma.c
+++ b/ports/stm32/dma.c
@@ -40,7 +40,7 @@
 #define DMA_IDLE_TICK_MAX   (8) // 8*8 = 64 msec
 #define DMA_IDLE_TICK(tick) (((tick) & ~(SYSTICK_DISPATCH_NUM_SLOTS - 1) & DMA_SYSTICK_MASK) == 0)
 
-#define ENABLE_SDIO (MICROPY_HW_ENABLE_SDCARD || MICROPY_HW_ENABLE_MMCARD)
+#define ENABLE_SDIO (MICROPY_HW_ENABLE_SDCARD || MICROPY_HW_ENABLE_MMCARD || MICROPY_PY_NETWORK_CYW43)
 
 typedef enum {
     dma_id_not_defined=-1,
diff --git a/ports/stm32/sdio.c b/ports/stm32/sdio.c
index dfd4092577..0291e3e81d 100644
--- a/ports/stm32/sdio.c
+++ b/ports/stm32/sdio.c
@@ -28,6 +28,7 @@
 
 #include "py/mperrno.h"
 #include "py/mphal.h"
+#include "dma.h"
 #include "pin.h"
 #include "pin_static_af.h"
 #include "pendsv.h"
@@ -382,27 +383,21 @@ int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t le
         }
 
         #if defined(STM32F7)
-        DMA2->LIFCR = 0x3f << 22;
-        DMA2_Stream3->FCR = 0x07; // ?
-        DMA2_Stream3->PAR = (uint32_t)&SDMMC->FIFO;
         if ((uint32_t)buf & 3) {
             printf("sdio_transfer_cmd53: buf=%p is not aligned for DMA\n", buf);
             return -MP_EINVAL;
         }
-        DMA2_Stream3->M0AR = (uint32_t)buf;
-        DMA2_Stream3->NDTR = ((len + block_size - 1) & ~(block_size - 1)) / 4;
-        DMA2_Stream3->CR = 4 << 25 // channel 4
-            | 1 << 23 // MBURST INCR4
-            | 1 << 21 // PBURST INCR4
-            | 3 << 16 // PL very high
-            | 2 << 13 // MSIZE word
-            | 2 << 11 // PSIZE word
-            | 1 << 10 // MINC enabled
-            | 0 << 9 // PINC disabled
-            | write << 6 // DIR mem-to-periph
-            | 1 << 5 // PFCTRL periph is flow controller
-            | 1 << 0 // EN
+        uint32_t dma_config =
+            2 << DMA_SxCR_MSIZE_Pos // MSIZE word
+                | 2 << DMA_SxCR_PSIZE_Pos // PSIZE word
+                | write << DMA_SxCR_DIR_Pos // DIR mem-to-periph
+                | 1 << DMA_SxCR_PFCTRL_Pos // PFCTRL periph is flow controller
         ;
+        uint32_t dma_src = (uint32_t)buf;
+        uint32_t dma_dest = (uint32_t)&SDMMC->FIFO;
+        uint32_t dma_len = ((len + block_size - 1) & ~(block_size - 1)) / 4;
+        dma_nohal_init(&dma_SDIO_0, dma_config);
+        dma_nohal_start(&dma_SDIO_0, dma_src, dma_dest, dma_len);
         #else
         SDMMC->IDMABASE0 = (uint32_t)buf;
         SDMMC->IDMACTRL = SDMMC_IDMA_IDMAEN;
@@ -456,6 +451,9 @@ int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t le
             #else
             printf("sdio_transfer_cmd53: timeout wr=%d len=%u dma=%u buf_idx=%u STA=%08x SDMMC=%08x:%08x IDMA=%08x\n", write, (uint)len, (uint)dma, sdmmc_buf_cur - buf, (uint)SDMMC->STA, (uint)SDMMC->DCOUNT, (uint)SDMMC->DCTRL, (uint)SDMMC->IDMACTRL);
             #endif
+            if (sdmmc_dma) {
+                dma_nohal_deinit(&dma_SDIO_0);
+            }
             return -MP_ETIMEDOUT;
         }
     }
@@ -468,6 +466,9 @@ int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t le
         #else
         printf("sdio_transfer_cmd53: error=%08lx wr=%d len=%u dma=%u buf_idx=%u STA=%08x SDMMC=%08x:%08x IDMA=%08x\n", sdmmc_error, write, (uint)len, (uint)dma, sdmmc_buf_cur - buf, (uint)SDMMC->STA, (uint)SDMMC->DCOUNT, (uint)SDMMC->DCTRL, (uint)SDMMC->IDMACTRL);
         #endif
+        if (sdmmc_dma) {
+            dma_nohal_deinit(&dma_SDIO_0);
+        }
         return -(0x1000000 | sdmmc_error);
     }
 
@@ -476,6 +477,8 @@ int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t le
             printf("sdio_transfer_cmd53: didn't transfer correct length: cur=%p top=%p\n", sdmmc_buf_cur, sdmmc_buf_top);
             return -MP_EIO;
         }
+    } else {
+        dma_nohal_deinit(&dma_SDIO_0);
     }
 
     return 0;

From 748339b28126e69fd2dc2778b2a182901d0a4693 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 18 May 2021 22:17:45 +1000
Subject: [PATCH 136/349] stm32/uart: Configure pull-up only on RX and CTS, not
 TX and RTS.

RX and CTS are the input pins and pull-ups are enabled so they don't cause
a problem if left unconnected.  But the output pins don't need a pull up
(they were originally all configured with pull up in commit
8f7491a109a555ca897ae49efe98f4cc2b080311).

If needed, the pull-ups can be disabled in Python using machine.Pin after
the UART is constructed.

See issue #4369.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/uart.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index a2b69967b6..9f74416170 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -474,10 +474,11 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
     }
 
     uint32_t mode = MP_HAL_PIN_MODE_ALT;
-    uint32_t pull = MP_HAL_PIN_PULL_UP;
 
     for (uint i = 0; i < 4; i++) {
         if (pins[i] != NULL) {
+            // Configure pull-up on RX and CTS (the input pins).
+            uint32_t pull = (i & 1) ? MP_HAL_PIN_PULL_UP : MP_HAL_PIN_PULL_NONE;
             bool ret = mp_hal_pin_config_alt(pins[i], mode, pull, uart_fn, uart_unit);
             if (!ret) {
                 return false;

From ea81bcf1c0ddeb8be34192cbededecfa425c039b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 17 May 2021 23:57:45 +1000
Subject: [PATCH 137/349] stm32/mboot: Leave bootloader from thread mode, not
 from IRQ.

Leaving the bootloader from an IRQ (eg USB or I2C IRQ) will not work if
MBOOT_LEAVE_BOOTLOADER_VIA_RESET is disabled, ie if mboot jumps directly to
the application.  This is because the CPU will still be in IRQ state when
the application starts and IRQs of lower priority will be blocked.

Fix this by setting a flag when the bootloader should finish, and exit the
bootloader always from the main (top level) thread.

This also improves the USB behaviour of mboot: it no longer abruptly
disconnects when the manifest command is sent.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/dfu.h  |  2 ++
 ports/stm32/mboot/main.c | 33 ++++++++++++++++-----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/ports/stm32/mboot/dfu.h b/ports/stm32/mboot/dfu.h
index 73db3545d8..e867a3e22d 100644
--- a/ports/stm32/mboot/dfu.h
+++ b/ports/stm32/mboot/dfu.h
@@ -26,6 +26,7 @@
 #ifndef MICROPY_INCLUDED_STM32_MBOOT_DFU_H
 #define MICROPY_INCLUDED_STM32_MBOOT_DFU_H
 
+#include <stdbool.h>
 #include <stdint.h>
 
 // DFU spec: https://www.usb.org/sites/default/files/DFU_1.1.pdf
@@ -106,6 +107,7 @@ typedef struct _dfu_state_t {
     dfu_cmd_t cmd;
     dfu_status_t status;
     uint8_t error;
+    bool leave_dfu;
     uint16_t wBlockNum;
     uint16_t wLength;
     uint32_t addr;
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 3a0242a8d6..c1e1d59d23 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -106,8 +106,6 @@ static volatile uint32_t systick_ms;
 // Global dfu state
 dfu_context_t dfu_context SECTION_NOZERO_BSS;
 
-static void do_reset(void);
-
 uint32_t get_le32(const uint8_t *b) {
     return b[0] | b[1] << 8 | b[2] << 16 | b[3] << 24;
 }
@@ -771,7 +769,7 @@ void i2c_slave_process_rx_end(i2c_slave_t *i2c) {
         memcpy(buf + 12 + sizeof(MICROPY_HW_MCU_NAME), MICROPY_HW_BOARD_NAME, sizeof(MICROPY_HW_BOARD_NAME) - 1);
         len = 12 + sizeof(MICROPY_HW_MCU_NAME) + sizeof(MICROPY_HW_BOARD_NAME) - 1;
     } else if (buf[0] == I2C_CMD_RESET && len == 0) {
-        do_reset();
+        dfu_context.leave_dfu = true;
     } else if (buf[0] == I2C_CMD_GETLAYOUT && len == 0) {
         len = strlen(FLASH_LAYOUT_STR);
         memcpy(buf, FLASH_LAYOUT_STR, len);
@@ -864,6 +862,7 @@ static void dfu_init(void) {
     dfu_context.cmd = DFU_CMD_NONE;
     dfu_context.status = DFU_STATUS_OK;
     dfu_context.error = 0;
+    dfu_context.leave_dfu = false;
     dfu_context.addr = 0x08000000;
 }
 
@@ -931,7 +930,8 @@ static void dfu_handle_rx(int cmd, int arg, int len, const void *buf) {
 
 static void dfu_process(void) {
     if (dfu_context.state == DFU_STATE_MANIFEST) {
-        do_reset();
+        // Set a flag to leave DFU mode from the main thread (here we are in an IRQ handler).
+        dfu_context.leave_dfu = true;
     }
 
     if (dfu_context.state == DFU_STATE_BUSY) {
@@ -1412,17 +1412,6 @@ static void leave_bootloader(void) {
     NVIC_SystemReset();
 }
 
-static void do_reset(void) {
-    led_state_all(0);
-    mp_hal_delay_ms(50);
-    pyb_usbdd_shutdown();
-    #if defined(MBOOT_I2C_SCL)
-    i2c_slave_shutdown(MBOOT_I2Cx, I2Cx_EV_IRQn);
-    #endif
-    mp_hal_delay_ms(50);
-    leave_bootloader();
-}
-
 extern PCD_HandleTypeDef pcd_fs_handle;
 extern PCD_HandleTypeDef pcd_hs_handle;
 
@@ -1561,7 +1550,7 @@ enter_bootloader:
     #if MBOOT_USB_RESET_ON_DISCONNECT
     bool has_connected = false;
     #endif
-    for (;;) {
+    while (!dfu_context.leave_dfu) {
         #if USE_USB_POLLING
         #if MBOOT_USB_AUTODETECT_PORT || MICROPY_HW_USB_MAIN_DEV == USB_PHY_FS_ID
         if (USB_OTG_FS->GINTSTS & USB_OTG_FS->GINTMSK) {
@@ -1585,10 +1574,20 @@ enter_bootloader:
             has_connected = true;
         }
         if (has_connected && pyb_usbdd.hUSBDDevice.dev_state == USBD_STATE_SUSPENDED) {
-            do_reset();
+            break;
         }
         #endif
     }
+
+    // Shutdown and leave the bootloader.
+    led_state_all(0);
+    mp_hal_delay_ms(50);
+    pyb_usbdd_shutdown();
+    #if defined(MBOOT_I2C_SCL)
+    i2c_slave_shutdown(MBOOT_I2Cx, I2Cx_EV_IRQn);
+    #endif
+    mp_hal_delay_ms(50);
+    leave_bootloader();
 }
 
 void NMI_Handler(void) {

From 247d7e2e8e7ec262a141b0fc4190a94cce8103ef Mon Sep 17 00:00:00 2001
From: Tobias Thyrrestrup <tt@LEGO.com>
Date: Tue, 18 May 2021 15:38:49 +0200
Subject: [PATCH 138/349] tools/pydfu.py: Remove default VID/PID values.

As the new default behaviour, this allows PyDFU to be used with all
devices, not just the ones matching a specific set of VID/PID values.  But
it's still possible to specify VID/PID if needed to narrow down the
selection of the USB device.

Signed-off-by: Tobias Thyrrestrup <tt@LEGO.com>
---
 tools/pydfu.py | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/tools/pydfu.py b/tools/pydfu.py
index 42b4fa2da6..ea658d300b 100755
--- a/tools/pydfu.py
+++ b/tools/pydfu.py
@@ -23,10 +23,6 @@ import usb.core
 import usb.util
 import zlib
 
-# VID/PID
-__VID = 0x0483
-__PID = 0xDF11
-
 # USB request __TIMEOUT
 __TIMEOUT = 4000
 
@@ -112,10 +108,10 @@ def find_dfu_cfg_descr(descr):
     return None
 
 
-def init():
+def init(**kwargs):
     """Initializes the found DFU device so that we can program it."""
     global __dev, __cfg_descr
-    devices = get_dfu_devices(idVendor=__VID, idProduct=__PID)
+    devices = get_dfu_devices(**kwargs)
     if not devices:
         raise ValueError("No DFU device found")
     if len(devices) > 1:
@@ -565,15 +561,13 @@ def cli_progress(addr, offset, size):
 def main():
     """Test program for verifying this files functionality."""
     global __verbose
-    global __VID
-    global __PID
     # Parse CMD args
     parser = argparse.ArgumentParser(description="DFU Python Util")
     parser.add_argument(
         "-l", "--list", help="list available DFU devices", action="store_true", default=False
     )
-    parser.add_argument("--vid", help="USB Vendor ID", type=lambda x: int(x, 0), default=__VID)
-    parser.add_argument("--pid", help="USB Product ID", type=lambda x: int(x, 0), default=__PID)
+    parser.add_argument("--vid", help="USB Vendor ID", type=lambda x: int(x, 0), default=None)
+    parser.add_argument("--pid", help="USB Product ID", type=lambda x: int(x, 0), default=None)
     parser.add_argument(
         "-m", "--mass-erase", help="mass erase device", action="store_true", default=False
     )
@@ -588,14 +582,18 @@ def main():
 
     __verbose = args.verbose
 
-    __VID = args.vid
-    __PID = args.pid
+    kwargs = {}
+    if args.vid:
+        kwargs["idVendor"] = args.vid
+
+    if args.pid:
+        kwargs["idProduct"] = args.pid
 
     if args.list:
-        list_dfu_devices(idVendor=__VID, idProduct=__PID)
+        list_dfu_devices(**kwargs)
         return
 
-    init()
+    init(**kwargs)
 
     command_run = False
     if args.mass_erase:

From a7a9f2fe897d2c4e3c18618c996460224df08114 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Thu, 20 May 2021 22:12:35 -0500
Subject: [PATCH 139/349] tools/ci.sh: Update zephyr docker image to v0.17.3.

Updates the zephyr docker image and SDK to the latest versions.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
---
 tools/ci.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 33cf364ddd..57421ae242 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -479,14 +479,14 @@ function ci_windows_build {
 # ports/zephyr
 
 function ci_zephyr_setup {
-    docker pull zephyrprojectrtos/ci:v0.11.13
+    docker pull zephyrprojectrtos/ci:v0.17.3
     docker run --name zephyr-ci -d -it \
       -v "$(pwd)":/micropython \
-      -e ZEPHYR_SDK_INSTALL_DIR=/opt/sdk/zephyr-sdk-0.12.2 \
+      -e ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-0.12.4 \
       -e ZEPHYR_TOOLCHAIN_VARIANT=zephyr \
       -e ZEPHYR_BASE=/zephyrproject/zephyr \
       -w /micropython/ports/zephyr \
-      zephyrprojectrtos/ci:v0.11.13
+      zephyrprojectrtos/ci:v0.17.3
     docker ps -a
 }
 

From e61ac453dcabaeca2406f1fb6ef113522f341aa2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 22 May 2021 22:09:25 +1000
Subject: [PATCH 140/349] py/mkrules.cmake: Add MPY_LIB_DIR and BOARD_DIR to
 makemanifest call.

So that the FROZEN_MANIFEST option in cmake works the same as make.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mkrules.cmake | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index f20240c62b..7589255b20 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -125,9 +125,13 @@ if(MICROPY_FROZEN_MANIFEST)
         MICROPY_MODULE_FROZEN_MPY=\(1\)
     )
 
+    if(NOT MICROPY_LIB_DIR)
+        set(MICROPY_LIB_DIR ${MICROPY_DIR}/../micropython-lib)
+    endif()
+
     add_custom_command(
         OUTPUT ${MICROPY_FROZEN_CONTENT}
-        COMMAND ${Python3_EXECUTABLE} ${MICROPY_DIR}/tools/makemanifest.py -o ${MICROPY_FROZEN_CONTENT} -v "MPY_DIR=${MICROPY_DIR}" -v "PORT_DIR=${MICROPY_PORT_DIR}" -b "${CMAKE_BINARY_DIR}" -f${MICROPY_CROSS_FLAGS} ${MICROPY_FROZEN_MANIFEST}
+        COMMAND ${Python3_EXECUTABLE} ${MICROPY_DIR}/tools/makemanifest.py -o ${MICROPY_FROZEN_CONTENT} -v "MPY_DIR=${MICROPY_DIR}" -v "MPY_LIB_DIR=${MICROPY_LIB_DIR}" -v "PORT_DIR=${MICROPY_PORT_DIR}" -v "BOARD_DIR=${MICROPY_BOARD_DIR}" -b "${CMAKE_BINARY_DIR}" -f${MICROPY_CROSS_FLAGS} ${MICROPY_FROZEN_MANIFEST}
         DEPENDS MICROPY_FORCE_BUILD
             ${MICROPY_QSTRDEFS_GENERATED}
         VERBATIM

From 3b950ed2959c603ff30dd6052c157e7981c4d2d6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 22 May 2021 22:10:09 +1000
Subject: [PATCH 141/349] tools/ci.sh: Use FROZEN_MANIFEST in an esp32 build to
 test feature.

This tests that FROZEN_MANIFEST works with cmake (on esp32 at least).

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 57421ae242..7b38ce0df0 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -109,7 +109,7 @@ function ci_esp32_build {
     make ${MAKEOPTS} -C ports/esp32 submodules
     make ${MAKEOPTS} -C ports/esp32
     make ${MAKEOPTS} -C ports/esp32 clean
-    make ${MAKEOPTS} -C ports/esp32 USER_C_MODULES=../../../examples/usercmodule/micropython.cmake
+    make ${MAKEOPTS} -C ports/esp32 USER_C_MODULES=../../../examples/usercmodule/micropython.cmake FROZEN_MANIFEST=$(pwd)/ports/esp32/boards/manifest.py
     if [ -d $IDF_PATH/components/esp32s2 ]; then
         make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_S2
     fi

From 0aa01b0205adc7544315fed602029e792a235b2e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 25 May 2021 00:04:01 +1000
Subject: [PATCH 142/349] lib/mbedtls: Switch to currently latest commit of LTS
 branch v2.16.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/mbedtls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mbedtls b/lib/mbedtls
index 1b6a24f759..1bc2c9cb8b 160000
--- a/lib/mbedtls
+++ b/lib/mbedtls
@@ -1 +1 @@
-Subproject commit 1b6a24f759cefbb4a69ae9476885d7f42a847e3d
+Subproject commit 1bc2c9cb8b8fe4659bd94b8ebba5a4c02029b7fa

From ff5d39529c3bf331dd8171aaa24937b2650f40fd Mon Sep 17 00:00:00 2001
From: Philipp Ebensberger <philipp.ebensberger@3bricks-software.de>
Date: Fri, 21 Aug 2020 16:03:21 +0200
Subject: [PATCH 143/349] mimxrt: Implement machine.Pin class.

- modified pin type from pin_obj_t to machine_pin_obj_t
- created machine_pin.c
- implemented basic version of make-pins.py to genertate pins.c/.h files
  automatically; the only alternate function currently supported is GPIO
- added af.csv files for all supported MCUs
- replaced pins.c/pins.h files with pin.csv for all boards
- implemented on/off/high/low/value/init methods
- Implemented IN/OUT/OPEN_DRAIN modes
- modified LDFLAGS for DEBUG build to get usefull .elf file for debugging

Signed-off-by: Philipp Ebensberger
---
 ports/mimxrt/Makefile                         |  41 ++-
 ports/mimxrt/README.md                        |   5 +-
 ports/mimxrt/board_init.c                     |   2 -
 .../boards/MIMXRT1010_EVK/mpconfigboard.h     |   2 +-
 .../boards/MIMXRT1010_EVK/mpconfigboard.mk    |  19 ++
 ports/mimxrt/boards/MIMXRT1010_EVK/pins.c     |  33 ---
 ports/mimxrt/boards/MIMXRT1010_EVK/pins.csv   |  57 ++++
 ports/mimxrt/boards/MIMXRT1010_EVK/pins.h     |  30 --
 ports/mimxrt/boards/MIMXRT1011.ld             |   2 +-
 ports/mimxrt/boards/MIMXRT1011_af.csv         |  44 +++
 .../boards/MIMXRT1020_EVK/mpconfigboard.h     |   3 +-
 .../boards/MIMXRT1020_EVK/mpconfigboard.mk    |  18 ++
 ports/mimxrt/boards/MIMXRT1020_EVK/pins.c     |  33 ---
 ports/mimxrt/boards/MIMXRT1020_EVK/pins.csv   |  33 +++
 ports/mimxrt/boards/MIMXRT1020_EVK/pins.h     |  30 --
 ports/mimxrt/boards/MIMXRT1021_af.csv         |  94 ++++++
 .../boards/MIMXRT1050_EVK/mpconfigboard.h     |   2 +-
 ports/mimxrt/boards/MIMXRT1050_EVK/pins.c     |  33 ---
 ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv   |  51 ++++
 ports/mimxrt/boards/MIMXRT1050_EVK/pins.h     |  30 --
 ports/mimxrt/boards/MIMXRT1052_af.csv         | 125 ++++++++
 .../boards/MIMXRT1060_EVK/mpconfigboard.h     |   2 +-
 .../boards/MIMXRT1060_EVK/mpconfigboard.mk    |  19 ++
 ports/mimxrt/boards/MIMXRT1060_EVK/pins.c     |  33 ---
 ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv   |  51 ++++
 ports/mimxrt/boards/MIMXRT1060_EVK/pins.h     |  30 --
 ports/mimxrt/boards/MIMXRT1062_af.csv         | 125 ++++++++
 .../boards/MIMXRT1064_EVK/mpconfigboard.h     |   2 +-
 ports/mimxrt/boards/MIMXRT1064_EVK/pins.c     |  33 ---
 ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv   |  51 ++++
 ports/mimxrt/boards/MIMXRT1064_EVK/pins.h     |  30 --
 ports/mimxrt/boards/MIMXRT1064_af.csv         | 125 ++++++++
 ports/mimxrt/boards/TEENSY40/mpconfigboard.h  |   2 +-
 ports/mimxrt/boards/TEENSY40/pins.c           |  33 ---
 ports/mimxrt/boards/TEENSY40/pins.csv         |  55 ++++
 ports/mimxrt/boards/TEENSY40/pins.h           |  30 --
 ports/mimxrt/boards/make-pins.py              | 259 +++++++++++++++++
 ports/mimxrt/boards/mimxrt_prefix.c           |  26 ++
 ports/mimxrt/led.c                            |   6 +-
 ports/mimxrt/led.h                            |   2 +-
 ports/mimxrt/machine_pin.c                    | 273 ++++++++++++++++++
 ports/mimxrt/modmachine.c                     |   2 +
 ports/mimxrt/mphalport.h                      |   4 +
 ports/mimxrt/pin.c                            | 106 ++++++-
 ports/mimxrt/pin.h                            | 106 +++++--
 ports/mimxrt/tusb_port.c                      |   2 +-
 46 files changed, 1659 insertions(+), 435 deletions(-)
 delete mode 100644 ports/mimxrt/boards/MIMXRT1010_EVK/pins.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1010_EVK/pins.csv
 delete mode 100644 ports/mimxrt/boards/MIMXRT1010_EVK/pins.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1011_af.csv
 delete mode 100644 ports/mimxrt/boards/MIMXRT1020_EVK/pins.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1020_EVK/pins.csv
 delete mode 100644 ports/mimxrt/boards/MIMXRT1020_EVK/pins.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1021_af.csv
 delete mode 100644 ports/mimxrt/boards/MIMXRT1050_EVK/pins.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv
 delete mode 100644 ports/mimxrt/boards/MIMXRT1050_EVK/pins.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1052_af.csv
 delete mode 100644 ports/mimxrt/boards/MIMXRT1060_EVK/pins.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv
 delete mode 100644 ports/mimxrt/boards/MIMXRT1060_EVK/pins.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1062_af.csv
 delete mode 100644 ports/mimxrt/boards/MIMXRT1064_EVK/pins.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv
 delete mode 100644 ports/mimxrt/boards/MIMXRT1064_EVK/pins.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1064_af.csv
 delete mode 100644 ports/mimxrt/boards/TEENSY40/pins.c
 create mode 100644 ports/mimxrt/boards/TEENSY40/pins.csv
 delete mode 100644 ports/mimxrt/boards/TEENSY40/pins.h
 create mode 100644 ports/mimxrt/boards/make-pins.py
 create mode 100644 ports/mimxrt/boards/mimxrt_prefix.c
 create mode 100644 ports/mimxrt/machine_pin.c

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 3a001182a0..0c893f9634 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -23,6 +23,16 @@ GIT_SUBMODULES = lib/tinyusb lib/nxp_driver
 MCU_DIR = lib/nxp_driver/sdk/devices/$(MCU_SERIES)
 LD_FILES = boards/$(MCU_SERIES).ld $(TOP)/$(MCU_DIR)/gcc/$(MCU_SERIES)xxxxx_flexspi_nor.ld
 
+MAKE_PINS = boards/make-pins.py
+BOARD_PINS = $(BOARD_DIR)/pins.csv
+AF_FILE = boards/$(MCU_SERIES)_af.csv
+PREFIX_FILE = boards/mimxrt_prefix.c
+GEN_PINS_SRC = $(BUILD)/pins_gen.c
+GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
+GEN_PINS_QSTR = $(BUILD)/pins_qstr.h
+GEN_PINS_AF_CONST = $(HEADER_BUILD)/pins_af_const.h
+GEN_PINS_AF_PY = $(BUILD)/pins_af.py
+
 # mcu driver cause following warnings
 #CFLAGS += -Wno-error=float-equal -Wno-error=nested-externs
 CFLAGS += -Wno-error=unused-parameter
@@ -49,12 +59,14 @@ CFLAGS += -DXIP_EXTERNAL_FLASH=1 \
 	-D__START=main \
 	-DCPU_HEADER_H='<$(MCU_SERIES).h>'
 
-LDFLAGS = $(addprefix -T,$(LD_FILES)) -Map=$@.map --cref
+LDFLAGS = $(addprefix -T,$(LD_FILES)) -Map=$@.map --cref --print-memory-usage
 LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 
 # Tune for Debugging or Optimization
 ifeq ($(DEBUG),1)
 CFLAGS += -O0 -ggdb
+LDFLAGS += --gc-sections
+CFLAGS += -fdata-sections -ffunction-sections
 else
 CFLAGS += -Os -DNDEBUG
 LDFLAGS += --gc-sections
@@ -95,8 +107,8 @@ SRC_C = \
 	tusb_port.c \
 	board_init.c \
 	$(BOARD_DIR)/flash_config.c \
-	$(BOARD_DIR)/pins.c \
 	machine_led.c \
+	machine_pin.c \
 	modutime.c \
 	modmachine.c \
 	mphalport.c \
@@ -116,15 +128,17 @@ SRC_S = lib/utils/gchelper_m3.s \
 # List of sources for qstr extraction
 SRC_QSTR += \
 	machine_led.c \
+	machine_pin.c \
 	modutime.c \
 	modmachine.c \
 	pin.c \
-	$(BOARD_DIR)/pins.c \
+	$(GEN_PINS_SRC) \
 
 OBJ += $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_SS:.S=.o))
+OBJ += $(BUILD)/pins_gen.o
 
 # Workaround for bug in older gcc, warning on "static usbd_device_t _usbd_dev = { 0 };"
 $(BUILD)/lib/tinyusb/src/device/usbd.o: CFLAGS += -Wno-missing-braces
@@ -142,4 +156,25 @@ $(BUILD)/firmware.bin: $(BUILD)/firmware.elf
 $(BUILD)/firmware.hex: $(BUILD)/firmware.elf
 	$(Q)$(OBJCOPY) -O ihex -R .eeprom $< $@
 
+# Making OBJ use an order-only depenedency on the generated pins.h file
+# has the side effect of making the pins.h file before we actually compile
+# any of the objects. The normal dependency generation will deal with the
+# case when pins.h is modified. But when it doesn't exist, we don't know
+# which source files might need it.
+$(OBJ): | $(GEN_PINS_HDR)
+
+# With conditional pins, we may need to regenerate qstrdefs.h when config
+# options change.
+$(HEADER_BUILD)/qstrdefs.generated.h: $(BOARD_DIR)/mpconfigboard.h
+
+# Use a pattern rule here so that make will only call make-pins.py once to make
+# both pins_gen.c and pins.h
+$(BUILD)/%_gen.c $(HEADER_BUILD)/%.h: $(BOARD_PINS) $(MAKE_PINS) $(AF_FILE) $(PREFIX_FILE) | $(HEADER_BUILD)
+	$(ECHO) "Create $@"
+	$(Q)$(PYTHON) $(MAKE_PINS) --board $(BOARD_PINS) --af $(AF_FILE)\
+		--prefix $(PREFIX_FILE) --hdr $(GEN_PINS_HDR) > $(GEN_PINS_SRC)
+
+$(BUILD)/pins_gen.o: $(BUILD)/pins_gen.c
+	$(call compile_c)
+
 include $(TOP)/py/mkrules.mk
diff --git a/ports/mimxrt/README.md b/ports/mimxrt/README.md
index a2b5cf79a1..c24939f478 100644
--- a/ports/mimxrt/README.md
+++ b/ports/mimxrt/README.md
@@ -5,10 +5,13 @@ Currently supports Teensy 4.0 and the i.MX RT1010 EVK board.
 
 Features:
   - REPL over USB VCP
+  - machine.Pin
 
 Known issues:
   - pyboard.py doesn't work with files larger than 64 bytes
+  - machine.Pin class currently does not support GPIOMUX option of
+    i.MX RT101x variants
 
 TODO:
   - Enable TCM
-  - Peripherals (pins, LED, Timers, etc)
+  - Peripherals (LED, Timers, etc)
diff --git a/ports/mimxrt/board_init.c b/ports/mimxrt/board_init.c
index 9095c88048..0336cdf686 100644
--- a/ports/mimxrt/board_init.c
+++ b/ports/mimxrt/board_init.c
@@ -39,8 +39,6 @@
 
 #include "clock_config.h"
 
-#define LED_STATE_ON (0)
-
 volatile uint32_t systick_ms = 0;
 
 const uint8_t dcd_data[] = { 0x00 };
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
index eeddd0e021..5a89423b50 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
@@ -4,6 +4,6 @@
 #define BOARD_FLASH_SIZE (16 * 1024 * 1024)
 
 // i.MX RT1010 EVK has 1 board LED
-#define MICROPY_HW_LED1_PIN (GPIO_11)
+#define MICROPY_HW_LED1_PIN (pin_GPIO_11)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
index e178545845..c5b5055324 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
@@ -2,6 +2,25 @@ MCU_SERIES = MIMXRT1011
 MCU_VARIANT = MIMXRT1011DAE5A
 
 JLINK_PATH = /media/RT1010-EVK/
+JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
+
+
+ifdef JLINK_IP
+JLINK_CONNECTION_SETTINGS = -IP $(JLINK_IP)
+else
+JLINK_CONNECTION_SETTINGS = -USB
+endif
+
+
+deploy_jlink: $(BUILD)/firmware.hex
+	$(Q)$(TOUCH) $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "ExitOnError 1" > $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "speed auto" >> $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "r" >> $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "st" >> $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "loadfile \"$(realpath $(BUILD)/firmware.hex)\"" >> $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "qc" >> $(JLINK_COMMANDER_SCRIPT)
+	$(JLINK_PATH)JLinkExe -device $(MCU_VARIANT) -if SWD $(JLINK_CONNECTION_SETTINGS) -CommanderScript $(JLINK_COMMANDER_SCRIPT)
 
 deploy: $(BUILD)/firmware.bin
 	cp $< $(JLINK_PATH)
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/pins.c b/ports/mimxrt/boards/MIMXRT1010_EVK/pins.c
deleted file mode 100644
index e0397e09ed..0000000000
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/pins.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 Philipp Ebensberger
- *
- * 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 "pin.h"
-
-static pin_af_obj_t GPIO_11_af[] = {
-    PIN_AF(GPIOMUX_IO11, PIN_AF_MODE_ALT5, GPIO1, 0x10B0U),
-};
-
-pin_obj_t GPIO_11 = PIN(GPIO_11, GPIO1, 5, GPIO_11_af);
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1010_EVK/pins.csv
new file mode 100644
index 0000000000..f7fdf39643
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/pins.csv
@@ -0,0 +1,57 @@
+D0,GPIO_09
+D1,GPIO_10
+D2,GPIO_AD_05
+D3,GPIO_AD_06
+D4,GPIO_08
+D5,GPIO_01
+D6,GPIO_AD_01
+D7,GPIO_AD_02
+D8,GPIO_SD_02
+D9,GPIO_03
+D10,GPIO_AD_05
+D11,GPIO_AD_04
+D12,GPIO_AD_03
+D13,GPIO_AD_06
+D14,GPIO_01
+D15,GPIO_02
+CUR_A,GPIO_AD_01
+CUR_B,GPIO_AD_02
+CUR_C,GPIO_AD_07
+VOLT_DCB,GPIO_AD_09
+CUR_DCB,GPIO_AD_10
+A0,GPIO_AD_07
+A1,GPIO_AD_09
+A2,GPIO_AD_10
+A3,GPIO_AD_14
+A4,GPIO_AD_01
+A5,GPIO_AD_02
+PWM_AT,GPIO_02
+PWM_AB,GPIO_01
+PWM_BT,GPIO_04
+PWM_BB,GPIO_03
+PWM_CT,GPIO_06
+PWM_CB,GPIO_05
+ENC_A,GPIO_AD_05
+ENC_B,GPIO_AD_06
+LED_GREEN,GPIO_11
+GPIO_01,GPIO_01
+GPIO_02,GPIO_02
+GPIO_03,GPIO_03
+GPIO_04,GPIO_04
+GPIO_05,GPIO_05
+GPIO_06,GPIO_06
+GPIO_08,GPIO_08
+GPIO_09,GPIO_09
+GPIO_10,GPIO_10
+GPIO_11,GPIO_11
+GPIO_AD_01,GPIO_AD_01
+GPIO_AD_02,GPIO_AD_02
+GPIO_AD_03,GPIO_AD_03
+GPIO_AD_04,GPIO_AD_04
+GPIO_AD_05,GPIO_AD_05
+GPIO_AD_06,GPIO_AD_06
+GPIO_AD_07,GPIO_AD_07
+GPIO_AD_09,GPIO_AD_09
+GPIO_AD_10,GPIO_AD_10
+GPIO_AD_14,GPIO_AD_14
+GPIO_SD_02,GPIO_SD_02
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/pins.h b/ports/mimxrt/boards/MIMXRT1010_EVK/pins.h
deleted file mode 100644
index 99534932a1..0000000000
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/pins.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 Philipp Ebensberger
- *
- * 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.
- */
-
-// NOTE: pins.h shall only be included in in pin.h
-// hence no include guards are needed since they will be provided by pin.h
-
-extern pin_obj_t GPIO_11;
diff --git a/ports/mimxrt/boards/MIMXRT1011.ld b/ports/mimxrt/boards/MIMXRT1011.ld
index 0512c48a7f..9db30adee8 100644
--- a/ports/mimxrt/boards/MIMXRT1011.ld
+++ b/ports/mimxrt/boards/MIMXRT1011.ld
@@ -1,5 +1,5 @@
 /* 24kiB stack. */
-__stack_size__ = 0x6000;
+__stack_size__ = 0x4000;
 _estack = __StackTop;
 _sstack = __StackLimit;
 
diff --git a/ports/mimxrt/boards/MIMXRT1011_af.csv b/ports/mimxrt/boards/MIMXRT1011_af.csv
new file mode 100644
index 0000000000..11dd085463
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1011_af.csv
@@ -0,0 +1,44 @@
+Pad,ALT0, ALT1, ALT2, ALT3, ALT4, ALT5, ALT6, ALT7, ALT8, ALT9,ADC,ACMP,Default
+GPIO_00,FLEXSPI_B_DQS,SAI3_MCLK,LPSPI2_PCS3,LPSPI1_PCS3,PIT_TRIGGER0,GPIO1_IO00,,,,,,,ALT5
+GPIO_01,SAI1_RX_BCLK,WDOG1_ANY,FLEXPWM1_PWM0_B,LPI2C1_SDA,KPP_ROW3,GPIO1_IO01,,,,,,,ALT5
+GPIO_02,SAI1_RX_SYNC,WDOG2_B,FLEXPWM1_PWM0_A,LPI2C1_SCL,KPP_COL3,GPIO1_IO02,,,,,,,ALT5
+GPIO_03,SAI1_RX_DATA0,GPT1_COMPARE3,FLEXPWM1_PWM1_B,,SPDIF_SR_CLK,GPIO1_IO03,,,,,,,ALT5
+GPIO_04,SAI1_TX_DATA0,GPT1_CAPTURE2,FLEXPWM1_PWM1_A,,SPDIF_IN,GPIO1_IO04,,,,,,,ALT5
+GPIO_05,SAI1_TX_DATA1,GPT1_COMPARE2,FLEXPWM1_PWM2_B,LPUART4_RXD,SPDIF_OUT,GPIO1_IO05,,,,,,,ALT0
+GPIO_06,SAI1_TX_BCLK,GPT1_CAPTURE1,FLEXPWM1_PWM2_A,LPUART4_TXD,SPDIF_EXT_CLK,GPIO1_IO06,,,,,,,ALT5
+GPIO_07,SAI1_TX_SYNC,GPT1_COMPARE1,FLEXPWM1_PWM3_B,LPUART3_RXD,SPDIF_LOCK,GPIO1_IO07,LPUART1_RTS_B,,,,,,ALT5
+GPIO_08,SAI1_MCLK,GPT1_CLK,FLEXPWM1_PWM3_A,LPUART3_TXD,FLEXIO1_IO00,GPIO1_IO08,LPUART1_CTS_B,,,,,,ALT5
+GPIO_09,LPUART1_RXD,WDOG1_B,FLEXSPI_A_SS1_B,LPI2C2_SDA,FLEXIO1_IO01,GPIO1_IO09,SPDIF_SR_CLK,,,,,,ALT5
+GPIO_10,LPUART1_TXD,LPI2C1_HREQ,EWM_OUT_B,LPI2C2_SCL,FLEXIO1_IO02,GPIO1_IO10,SPDIF_IN,,,,,,ALT5
+GPIO_11,LPUART3_RXD,LPI2C1_SDA,KPP_ROW0,FLEXSPI_B_SS1_B,FLEXIO1_IO03,GPIO1_IO11,SPDIF_OUT,ARM_TRACE3,,,,,ALT5
+GPIO_12,LPUART3_TXD,LPI2C1_SCL,KPP_COL0,USB_OTG1_OC,FLEXIO1_IO04,GPIO1_IO12,SPDIF_EXT_CLK,ARM_TRACE2,,,,,ALT5
+GPIO_13,LPUART2_RXD,LPSPI2_PCS2,KPP_ROW3,USB_OTG1_ID,FLEXIO1_IO05,GPIO1_IO13,SPDIF_LOCK,ARM_TRACE1,,,,,ALT5
+GPIO_AD_00,LPUART2_TXD,LPSPI1_PCS2,KPP_COL3,USB_OTG1_PWR,FLEXIO1_IO20,GPIO1_IO14,ARM_NMI,ARM_TRACE0,,,ADC1_IN0,,ALT5
+GPIO_AD_01,LPUART4_RXD,LPSPI2_PCS1,WDOG1_ANY,LPI2C2_SDA,MQS_LEFT,GPIO1_IO15,USB_OTG1_OC,ARM_TRACE_SWO,,,ADC1_IN1,,ALT5
+GPIO_AD_02,LPUART4_TXD,LPSPI1_PCS1,WDOG2_B,LPI2C2_SCL,MQS_RIGHT,GPIO1_IO16,,ARM_TRACE_CLK,,,ADC1_IN2,,ALT5
+GPIO_AD_03,LPSPI1_SDI,PIT_TRIGGER3,FLEXPWM1_PWM2_B,KPP_ROW2,GPT2_CLK,GPIO1_IO17,SNVS_VIO_5_B,JTAG_DE_B,,,ADC1_IN3,,ALT5
+GPIO_AD_04,LPSPI1_SDO,PIT_TRIGGER2,FLEXPWM1_PWM2_A,KPP_COL2,GPT2_COMPARE1,GPIO1_IO18,SNVS_VIO_5_CTL,,,,ADC1_IN4,,ALT5
+GPIO_AD_05,LPSPI1_PCS0,PIT_TRIGGER1,FLEXPWM1_PWM3_B,KPP_ROW1,GPT2_CAPTURE1,GPIO1_IO19,,,,,ADC1_IN5,,ALT5
+GPIO_AD_06,LPSPI1_SCK,PIT_TRIGGER0,FLEXPWM1_PWM3_A,KPP_COL1,GPT2_COMPARE2,GPIO1_IO20,LPI2C1_HREQ,,,,ADC1_IN6,,ALT5
+GPIO_AD_07,LPI2C2_SDA,LPUART3_RXD,ARM_CM7_RXEV,LPUART2_RTS_B,GPT2_CAPTURE2,GPIO1_IO21,OCOTP_FUSE_LATCHED,XBAR1_INOUT03,,,ADC1_IN7,,ALT5
+GPIO_AD_08,LPI2C2_SCL,LPUART3_TXD,ARM_CM7_TXEV,LPUART2_CTS_B,GPT2_COMPARE3,GPIO1_IO22,EWM_OUT_B,JTAG_TRSTB,,,ADC1_IN8,,ALT7
+GPIO_AD_09,LPSPI2_SDI,FLEXPWM1_PWM3_X,KPP_ROW2,ARM_TRACE_SWO,FLEXIO1_IO21,GPIO1_IO23,REF_CLK_32K,JTAG_TDO,,,ADC1_IN9,,ALT7
+GPIO_AD_10,LPSPI2_SDO,FLEXPWM1_PWM2_X,KPP_COL2,PIT_TRIGGER3,FLEXIO1_IO22,GPIO1_IO24,USB_OTG1_ID,JTAG_TDI,,,ADC1_IN10,,ALT7
+GPIO_AD_11,LPSPI2_PCS0,FLEXPWM1_PWM1_X,KPP_ROW1,PIT_TRIGGER2,FLEXIO1_IO23,GPIO1_IO25,WDOG1_B,JTAG_MOD,,,ADC1_IN11,,ALT7
+GPIO_AD_12,LPSPI2_SCK,FLEXPWM1_PWM0_X,KPP_COL1,PIT_TRIGGER1,FLEXIO1_IO24,GPIO1_IO26,USB_OTG1_PWR,JTAG_TCK,,,ADC1_IN12,,ALT7
+GPIO_AD_13,LPI2C1_SDA,LPUART3_RTS_B,KPP_ROW0,LPUART4_RTS_B,FLEXIO1_IO25,GPIO1_IO27,ARM_NMI,JTAG_TMS,,,ADC1_IN13,,ALT7
+GPIO_AD_14,LPI2C1_SCL,LPUART3_CTS_B,KPP_COL0,LPUART4_CTS_B,FLEXIO1_IO26,GPIO1_IO28,REF_CLK_24M,XBAR1_INOUT02,,,ADC1_IN14,,ALT5
+GPIO_SD_00,FLEXSPI_B_SS0_B,SAI3_TX_SYNC,ARM_CM7_RXEV,CCM_STOP,FLEXIO1_IO06,GPIO2_IO00,SRC_BT_CFG2,,,,,,ALT5
+GPIO_SD_01,FLEXSPI_B_DATA1,SAI3_TX_BCLK,FLEXPWM1_PWM0_B,CCM_CLKO2,FLEXIO1_IO07,GPIO2_IO01,SRC_BT_CFG1,,,,,,ALT5
+GPIO_SD_02,FLEXSPI_B_DATA2,SAI3_TX_DATA,FLEXPWM1_PWM0_A,CCM_CLKO1,FLEXIO1_IO08,GPIO2_IO02,SRC_BT_CFG0,,,,,,ALT5
+GPIO_SD_03,FLEXSPI_B_DATA0,SAI3_RX_DATA,FLEXPWM1_PWM1_B,CCM_REF_EN_B,FLEXIO1_IO09,GPIO2_IO03,SRC_BOOT_MODE1,,,,,,ALT6
+GPIO_SD_04,FLEXSPI_B_DATA3,SAI3_RX_SYNC,FLEXPWM1_PWM1_A,CCM_WAIT,FLEXIO1_IO10,GPIO2_IO04,SRC_BOOT_MODE0,,,,,,ALT6
+GPIO_SD_05,FLEXSPI_A_SS1_B,LPI2C1_SDA,LPSPI1_SDI,,FLEXIO1_IO11,GPIO2_IO05,,,,,,,ALT5
+GPIO_SD_06,FLEXSPI_A_SS0_B,LPI2C1_SCL,LPSPI1_SDO,,FLEXIO1_IO12,GPIO2_IO06,,,,,,,ALT5
+GPIO_SD_07,FLEXSPI_A_DATA1,LPI2C2_SDA,LPSPI1_PCS0,,FLEXIO1_IO13,GPIO2_IO07,,,,,,,ALT5
+GPIO_SD_08,FLEXSPI_A_DATA2,LPI2C2_SCL,LPSPI1_SCK,,FLEXIO1_IO14,GPIO2_IO08,,,,,,,ALT5
+GPIO_SD_09,FLEXSPI_A_DATA0,LPSPI2_SDI,LPUART2_RXD,,FLEXIO1_IO15,GPIO2_IO09,,,,,,,ALT5
+GPIO_SD_10,FLEXSPI_A_SCLK,LPSPI2_SDO,LPUART2_TXD,,FLEXIO1_IO16,GPIO2_IO10,,,,,,,ALT5
+GPIO_SD_11,FLEXSPI_A_DATA3,LPSPI2_SCK,LPUART1_RXD,,FLEXIO1_IO17,GPIO2_IO11,WDOG1_RST_B_DEB,,,,,,ALT5
+GPIO_SD_12,FLEXSPI_A_DQS,LPSPI2_PCS0,LPUART1_TXD,,FLEXIO1_IO18,GPIO2_IO12,WDOG2_RST_B_DEB,,,,,,ALT5
+GPIO_SD_13,FLEXSPI_B_SCLK,SAI3_RX_BCLK,ARM_CM7_TXEV,CCM_PMIC_RDY,FLEXIO1_IO19,GPIO2_IO13,SRC_BT_CFG3,,,,,,ALT5
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
index 8598f76bf1..d8c0f00e27 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
@@ -4,6 +4,7 @@
 #define BOARD_FLASH_SIZE (8 * 1024 * 1024)
 
 // i.MX RT1020 EVK has 1 board LED
-#define MICROPY_HW_LED1_PIN (GPIO_AD_B0_05)
+// Todo: think about replacing the define with searching in the generated pins?
+#define MICROPY_HW_LED1_PIN (pin_GPIO_AD_B0_05)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
index f3b1689524..0f5bb967af 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
@@ -2,6 +2,24 @@ MCU_SERIES = MIMXRT1021
 MCU_VARIANT = MIMXRT1021DAG5A
 
 JLINK_PATH ?= /media/RT1020-EVK/
+JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
+
+
+ifdef JLINK_IP
+JLINK_CONNECTION_SETTINGS = -IP $(JLINK_IP)
+else
+JLINK_CONNECTION_SETTINGS =
+endif
+
+
+deploy_jlink: $(BUILD)/firmware.hex
+	$(ECHO) "ExitOnError 1" > $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "speed auto" >> $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "r" >> $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "st" >> $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "loadfile \"$(realpath $(BUILD)/firmware.hex)\"" >> $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "qc" >> $(JLINK_COMMANDER_SCRIPT)
+	$(JLINK_PATH)JLinkExe -device $(MCU_VARIANT) -if SWD $(JLINK_CONNECTION_SETTINGS) -CommanderScript $(JLINK_COMMANDER_SCRIPT)
 
 deploy: $(BUILD)/firmware.bin
 	cp $< $(JLINK_PATH)
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/pins.c b/ports/mimxrt/boards/MIMXRT1020_EVK/pins.c
deleted file mode 100644
index 946b6efca8..0000000000
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/pins.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 Philipp Ebensberger
- *
- * 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 "pin.h"
-
-static pin_af_obj_t GPIO_AD_B0_05_af[] = {
-    PIN_AF(GPIO1_IO05, PIN_AF_MODE_ALT5, GPIO1, 0x10B0U),
-};
-
-pin_obj_t GPIO_AD_B0_05 = PIN(GPIO_AD_B0_05, GPIO1, 5, GPIO_AD_B0_05_af);
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1020_EVK/pins.csv
new file mode 100644
index 0000000000..8420bbd821
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/pins.csv
@@ -0,0 +1,33 @@
+D0,GPIO_AD_B1_09
+D1,GPIO_AD_B1_08
+D2,GPIO_AD_B0_09
+D3,GPIO_AD_B0_07
+D4,GPIO_AD_B0_05
+D5,GPIO_AD_B0_06
+D6,GPIO_AD_B0_14
+D7,GPIO_AD_B1_06
+D8,GPIO_AD_B1_07
+D9,GPIO_AD_B0_15
+D10,GPIO_AD_B0_11
+D11,GPIO_AD_B0_12
+D12,GPIO_AD_B0_13
+D13,GPIO_AD_B0_10
+D14,GPIO_SD_B1_03
+D15,GPIO_SD_B1_02
+A0,GPIO_AD_B1_10
+A1,GPIO_AD_B1_11
+A2,GPIO_AD_B1_12
+A3,GPIO_AD_B1_13
+A4,GPIO_AD_B1_15
+A5,GPIO_AD_B1_14
+RX,GPIO_AD_B1_09
+TX,GPIO_AD_B1_08
+SDA,GPIO_AD_B1_15
+SCL,GPIO_AD_B1_14
+I2C_SCL,GPIO_SD_B1_02
+I2C_SDA,GPIO_SD_B1_03
+SCK,GPIO_AD_B0_10
+SDI,GPIO_AD_B0_13
+SDO,GPIO_AD_B0_12
+CS,GPIO_AD_B0_11
+LED_GREEN,GPIO_AD_B0_05
\ No newline at end of file
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/pins.h b/ports/mimxrt/boards/MIMXRT1020_EVK/pins.h
deleted file mode 100644
index 158929911c..0000000000
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/pins.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 Philipp Ebensberger
- *
- * 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.
- */
-
-// NOTE: pins.h shall only be included in in pin.h
-// hence no include guards are needed since they will be provided by pin.h
-
-extern pin_obj_t GPIO_AD_B0_05;
diff --git a/ports/mimxrt/boards/MIMXRT1021_af.csv b/ports/mimxrt/boards/MIMXRT1021_af.csv
new file mode 100644
index 0000000000..668b415f0b
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1021_af.csv
@@ -0,0 +1,94 @@
+Pad,ALT0, ALT1, ALT2, ALT3, ALT4, ALT5, ALT6, ALT7, ALT8, ALT9,ADC,ACMP,Default
+GPIO_AD_B0_00,JTAG_TMS,,,,,GPIO1_IO00,USBPHY1_TSTI_TX_EN,GPT1_COMPARE1,,,,,ALT0
+GPIO_AD_B0_01,JTAG_TCK,,,,,GPIO1_IO01,USBPHY1_TSTI_TX_HIZ,GPT1_CAPTURE2,,,,,ALT0
+GPIO_AD_B0_02,JTAG_MOD,,,,,GPIO1_IO02,USBPHY1_TSTI_TX_LS_MODE,GPT1_CAPTURE1,,,,,ALT0
+GPIO_AD_B0_03,JTAG_TDI,USDHC2_CD_B,WDOG1_B,SAI1_MCLK,USDHC1_WP,GPIO1_IO03,USB_OTG1_OC,CCM_PMIC_RDY,,,,,ALT0
+GPIO_AD_B0_04,JTAG_TDO,FLEXCAN1_TX,USDHC1_WP,TMR2_TIMER0,ENET_MDIO,GPIO1_IO04,USB_OTG1_PWR,EWM_OUT_B,,,,,ALT0
+GPIO_AD_B0_05,JTAG_TRSTB,FLEXCAN1_RX,USDHC1_CD_B,TMR2_TIMER1,ENET_MDC,GPIO1_IO05,USB_OTG1_ID,ARM_NMI,,,,,ALT0
+GPIO_AD_B0_06,PIT_TRIGGER0,MQS_RIGHT,LPUART1_TXD,TMR2_TIMER2,FLEXPWM2_PWMA3,GPIO1_IO06,REF_32K_OUT,,,,,,ALT5
+GPIO_AD_B0_07,PIT_TRIGGER1,MQS_LEFT,LPUART1_RXD,TMR2_TIMER3,FLEXPWM2_PWMB3,GPIO1_IO07,REF_24M_OUT,,,,,,ALT5
+GPIO_AD_B0_08,ENET_TX_CLK,LPI2C3_SCL,LPUART1_CTS_B,KPP_COL0,ENET_REF_CLK,GPIO1_IO08,ARM_CM7_TXEV,,,,,ACMP1_IN4,ALT5
+GPIO_AD_B0_09,ENET_RX_DATA1,LPI2C3_SDA,LPUART1_RTS_B,KPP_ROW0,,GPIO1_IO09,ARM_CM7_RXEV,,,,,ACMP2_IN4,ALT5
+GPIO_AD_B0_10,ENET_RX_DATA0,LPSPI1_SCK,LPUART5_TXD,KPP_COL1,FLEXPWM2_PWMA2,GPIO1_IO10,ARM_TRACE_CLK,,,,,ACMP3_IN4,ALT5
+GPIO_AD_B0_11,ENET_RX_EN,LPSPI1_PCS0,LPUART5_RXD,KPP_ROW1,FLEXPWM2_PWMB2,GPIO1_IO11,ARM_TRACE_SWO,,,,,ACMP4_IN4,ALT5
+GPIO_AD_B0_12,ENET_RX_ER,LPSPI1_SDO,LPUART3_CTS_B,KPP_COL2,FLEXPWM2_PWMA1,GPIO1_IO12,ARM_TRACE0,SNVS_VIO_5_CTL,,,ADC1_IN0,,ALT5
+GPIO_AD_B0_13,ENET_TX_EN,LPSPI1_SDI,LPUART3_RTS_B,KPP_ROW2,FLEXPWM2_PWMB1,GPIO1_IO13,,SNVS_VIO_5_B,,,ADC2_IN0,,ALT5
+GPIO_AD_B0_14,ENET_TX_DATA0,FLEXCAN2_TX,LPUART3_TXD,KPP_COL3,FLEXPWM2_PWMA0,GPIO1_IO14,,WDOG1_ANY,,,"ADC1_IN1,ADC2_IN1","ACMP1_IN0,ACMP2_IN0,ACMP3_IN0,ACMP4_IN0",ALT5
+GPIO_AD_B0_15,ENET_TX_DATA1,FLEXCAN2_RX,LPUART3_RXD,KPP_ROW3,FLEXPWM2_PWMB0,GPIO1_IO15,,,,,"ADC1_IN2,ADC2_IN2","ACMP1_IN1,ACMP2_IN1,ACMP3_IN1,ACMP4_IN1",ALT5
+GPIO_AD_B1_00,SEMC_RDY,FLEXSPI_A_DATA3,FLEXCAN2_TX,SAI1_MCLK,FLEXIO1_D15,GPIO1_IO16,ENET_1588_EVENT2_OUT,KPP_COL4,,,,ACMP1_IN2,ALT5
+GPIO_AD_B1_01,SEMC_CSX0,FLEXSPI_A_SCLK,FLEXCAN2_RX,SAI1_TX_BCLK,FLEXIO1_D14,GPIO1_IO17,ENET_1588_EVENT2_IN,KPP_ROW4,,,ADC1_IN3,ACMP2_IN2,ALT5
+GPIO_AD_B1_02,SEMC_CSX1,FLEXSPI_A_DATA0,LPSPI4_SCK,SAI1_TX_SYNC,FLEXIO1_D13,GPIO1_IO18,ENET_1588_EVENT3_OUT,KPP_COL5,,,ADC2_IN3,ACMP3_IN2,ALT5
+GPIO_AD_B1_03,SEMC_CSX2,FLEXSPI_A_DATA2,LPSPI4_PCS0,SAI1_TX_DATA0,FLEXIO1_D12,GPIO1_IO19,ENET_1588_EVENT3_IN,KPP_ROW5,,,ADC1_IN4,ACMP4_IN2,ALT5
+GPIO_AD_B1_04,SEMC_CSX3,FLEXSPI_A_DATA1,LPSPI4_SDO,SAI1_RX_SYNC,FLEXIO1_D11,GPIO1_IO20,LPSPI1_PCS1,KPP_COL6,,,ADC2_IN4,ACMP1_IN3,ALT5
+GPIO_AD_B1_05,USDHC1_WP,FLEXSPI_A_SS0_B,LPSPI4_SDI,SAI1_RX_DATA0,FLEXIO1_D10,GPIO1_IO21,LPSPI1_PCS2,KPP_ROW6,,,"ADC1_IN5,ADC2_IN5",ACMP2_IN3,ALT5
+GPIO_AD_B1_06,USDHC1_RESET_B,FLEXPWM1_PWMA0,LPUART2_CTS_B,SAI1_RX_BCLK,FLEXIO1_D09,GPIO1_IO22,LPSPI1_PCS3,KPP_COL7,,,"ADC1_IN6,ADC2_IN6",ACMP3_IN3,ALT5
+GPIO_AD_B1_07,USDHC1_VSELECT,FLEXPWM1_PWMB0,LPUART2_RTS_B,SAI1_TX_DATA1,FLEXIO1_D08,GPIO1_IO23,LPSPI3_PCS3,KPP_ROW7,,,"ADC1_IN7,ADC2_IN7",ACMP4_IN3,ALT5
+GPIO_AD_B1_08,LPI2C2_SCL,FLEXPWM1_PWMA1,LPUART2_TXD,SAI1_TX_DATA2,FLEXIO1_D07,GPIO1_IO24,LPSPI3_PCS2,XBAR_INOUT12,,,"ADC1_IN8,ADC2_IN8",ACMP1_IN5,ALT5
+GPIO_AD_B1_09,LPI2C2_SDA,FLEXPWM1_PWMB1,LPUART2_RXD,SAI1_TX_DATA3,FLEXIO1_D06,GPIO1_IO25,LPSPI3_PCS1,XBAR_INOUT13,,,"ADC1_IN9,ADC2_IN9",ACMP2_IN5,ALT5
+GPIO_AD_B1_10,USB_OTG1_PWR,FLEXPWM1_PWMA2,LPUART4_TXD,USDHC1_CD_B,FLEXIO1_D05,GPIO1_IO26,GPT2_CAPTURE1,,,,"ADC1_IN10,ADC2_IN10",ACMP3_IN5,ALT5
+GPIO_AD_B1_11,USB_OTG1_ID,FLEXPWM1_PWMB2,LPUART4_RXD,USDHC1_WP,FLEXIO1_D04,GPIO1_IO27,GPT2_COMPARE1,,,,"ADC1_IN11,ADC2_IN11",ACMP4_IN5,ALT5
+GPIO_AD_B1_12,USB_OTG1_OC,ACMP1_OUT,LPSPI3_SCK,USDHC2_CD_B,FLEXIO1_D03,GPIO1_IO28,FLEXPWM1_PWMA3,,,,"ADC1_IN12,ADC2_IN12","ACMP1_IN6,ACMP1_OUT",ALT5
+GPIO_AD_B1_13,LPI2C1_HREQ,ACMP2_OUT,LPSPI3_PCS0,USDHC2_WP,FLEXIO1_D02,GPIO1_IO29,FLEXPWM1_PWMB3,,,,"ADC1_IN13,ADC2_IN13","ACMP2_IN6,ACMP2_OUT",ALT5
+GPIO_AD_B1_14,LPI2C1_SCL,ACMP3_OUT,LPSPI3_SDO,ENET_1588_EVENT0_OUT,FLEXIO1_D01,GPIO1_IO30,,,,,"ADC1_IN14,ADC2_IN14","ACMP3_IN6,ACMP3_OUT",ALT5
+GPIO_AD_B1_15,LPI2C1_SDA,ACMP4_OUT,LPSPI3_SDI,ENET_1588_EVENT0_IN,FLEXIO1_D00,GPIO1_IO31,,,,,"ADC1_IN15,ADC2_IN15","ACMP4_IN6,ACMP4_OUT",ALT5
+GPIO_EMC_00,SEMC_DA00,TMR2_TIMER0,LPUART4_CTS_B,SPDIF_SR_CLK,LPSPI2_SCK,GPIO2_IO00,FLEXCAN1_TX,PIT_TRIGGER2,,,,,ALT5
+GPIO_EMC_01,SEMC_DA01,TMR2_TIMER1,LPUART4_RTS_B,SPDIF_OUT,LPSPI2_PCS0,GPIO2_IO01,FLEXCAN1_RX,PIT_TRIGGER3,,,,,ALT5
+GPIO_EMC_02,SEMC_DA02,TMR2_TIMER2,LPUART4_TXD,SPDIF_LOCK,LPSPI2_SDO,GPIO2_IO02,LPI2C1_SCL,,,,,,ALT5
+GPIO_EMC_03,SEMC_DA03,TMR2_TIMER3,LPUART4_RXD,SPDIF_EXT_CLK,LPSPI2_SDI,GPIO2_IO03,LPI2C1_SDA,,,,,,ALT5
+GPIO_EMC_04,SEMC_DA04,XBAR_INOUT04,SPDIF_OUT,SAI2_TX_BCLK,FLEXIO1_D16,GPIO2_IO04,USBPHY1_TSTO_PLL_CLK20DIV,,,,,,ALT5
+GPIO_EMC_05,SEMC_DA05,XBAR_INOUT05,SPDIF_IN,SAI2_TX_SYNC,FLEXIO1_D17,GPIO2_IO05,USBPHY1_TSTI_TX_HS_MODE,,,,,,ALT5
+GPIO_EMC_06,SEMC_DA06,XBAR_INOUT06,LPUART3_TXD,SAI2_TX_DATA,FLEXIO1_D18,GPIO2_IO06,USBPHY1_TSTI_TX_DN,,,,,,ALT5
+GPIO_EMC_07,SEMC_DA07,XBAR_INOUT07,LPUART3_RXD,SAI2_RX_SYNC,FLEXIO1_D19,GPIO2_IO07,USBPHY1_TSTO_RX_SQUELCH,,,,,,ALT5
+GPIO_EMC_08,SEMC_DM0,XBAR_INOUT08,FLEXCAN2_TX,SAI2_RX_DATA,FLEXIO1_D20,GPIO2_IO08,USBPHY1_TSTO_RX_DISCON_DET,,,,,,ALT5
+GPIO_EMC_09,SEMC_WE,XBAR_INOUT09,FLEXCAN2_RX,SAI2_RX_BCLK,FLEXIO1_D21,GPIO2_IO09,USBPHY1_TSTO_RX_HS_RXD,,,,,,ALT5
+GPIO_EMC_10,SEMC_CAS,XBAR_INOUT10,LPI2C4_SDA,SAI1_TX_SYNC,LPSPI2_SCK,GPIO2_IO10,FLEXPWM2_PWMX0,,,,,,ALT5
+GPIO_EMC_11,SEMC_RAS,XBAR_INOUT11,LPI2C4_SCL,SAI1_TX_BCLK,LPSPI2_PCS0,GPIO2_IO11,FLEXPWM2_PWMX1,,,,,,ALT5
+GPIO_EMC_12,SEMC_CS0,XBAR_INOUT12,LPUART6_TXD,SAI1_TX_DATA0,LPSPI2_SDO,GPIO2_IO12,FLEXPWM2_PWMX2,,,,,,ALT5
+GPIO_EMC_13,SEMC_BA0,XBAR_INOUT13,LPUART6_RXD,SAI1_RX_DATA0,LPSPI2_SDI,GPIO2_IO13,FLEXPWM2_PWMX3,CCM_PMIC_RDY,,,,,ALT5
+GPIO_EMC_14,SEMC_BA1,XBAR_INOUT14,LPUART6_CTS_B,SAI1_RX_BCLK,LPSPI2_PCS1,GPIO2_IO14,FLEXCAN1_TX,,,,,,ALT5
+GPIO_EMC_15,SEMC_ADDR10,XBAR_INOUT15,LPUART6_RTS_B,SAI1_RX_SYNC,WDOG1_B,GPIO2_IO15,FLEXCAN1_RX,,,,,,ALT5
+GPIO_EMC_16,SEMC_ADDR00,,MQS_RIGHT,SAI2_MCLK,,GPIO2_IO16,SRC_BOOT_MODE0,,,,,,ALT5
+GPIO_EMC_17,SEMC_ADDR01,,MQS_LEFT,SAI3_MCLK,,GPIO2_IO17,SRC_BOOT_MODE1,,,,,,ALT5
+GPIO_EMC_18,SEMC_ADDR02,XBAR_INOUT16,LPI2C2_SDA,SAI1_RX_SYNC,FLEXIO1_D22,GPIO2_IO18,SRC_BT_CFG0,,,,,,ALT5
+GPIO_EMC_19,SEMC_ADDR03,XBAR_INOUT17,LPI2C2_SCL,SAI1_RX_BCLK,FLEXIO1_D23,GPIO2_IO19,SRC_BT_CFG1,,,,,,ALT5
+GPIO_EMC_20,SEMC_ADDR04,FLEXPWM1_PWMA3,LPUART2_CTS_B,SAI1_MCLK,FLEXIO1_D24,GPIO2_IO20,SRC_BT_CFG2,,,,,,ALT5
+GPIO_EMC_21,SEMC_ADDR05,FLEXPWM1_PWMB3,LPUART2_RTS_B,SAI1_RX_DATA0,FLEXIO1_D25,GPIO2_IO21,SRC_BT_CFG3,,,,,,ALT5
+GPIO_EMC_22,SEMC_ADDR06,FLEXPWM1_PWMA2,LPUART2_TXD,SAI1_TX_DATA3,FLEXIO1_D26,GPIO2_IO22,SRC_BT_CFG4,,,,,,ALT5
+GPIO_EMC_23,SEMC_ADDR07,FLEXPWM1_PWMB2,LPUART2_RXD,SAI1_TX_DATA2,FLEXIO1_D27,GPIO2_IO23,SRC_BT_CFG5,,,,,,ALT5
+GPIO_EMC_24,SEMC_ADDR08,FLEXPWM1_PWMA1,LPUART8_CTS_B,SAI1_TX_DATA1,FLEXIO1_D28,GPIO2_IO24,SRC_BT_CFG6,,,,,,ALT5
+GPIO_EMC_25,SEMC_ADDR09,FLEXPWM1_PWMB1,LPUART8_RTS_B,SAI1_TX_DATA0,FLEXIO1_D29,GPIO2_IO25,SRC_BT_CFG7,,,,,,ALT5
+GPIO_EMC_26,SEMC_ADDR11,FLEXPWM1_PWMA0,LPUART8_TXD,SAI1_TX_BCLK,FLEXIO1_D30,GPIO2_IO26,SRC_BT_CFG8,,,,,,ALT5
+GPIO_EMC_27,SEMC_ADDR12,FLEXPWM1_PWMB0,LPUART8_RXD,SAI1_TX_SYNC,FLEXIO1_D31,GPIO2_IO27,SRC_BT_CFG9,,,,,,ALT5
+GPIO_EMC_28,SEMC_DQS,FLEXPWM2_PWMA3,XBAR_INOUT18,SAI3_MCLK,EWM_OUT_B,GPIO2_IO28,GPT2_CAPTURE2,FLEXPWM1_PWMX0,,,,,ALT5
+GPIO_EMC_29,SEMC_CKE,FLEXPWM2_PWMB3,XBAR_INOUT19,SAI3_RX_BCLK,WDOG2_RST_B_DEB,GPIO2_IO29,GPT2_COMPARE2,FLEXPWM1_PWMX1,,,,,ALT5
+GPIO_EMC_30,SEMC_CLK,FLEXPWM2_PWMA2,LPUART4_CTS_B,SAI3_RX_SYNC,WDOG1_RST_B_DEB,GPIO2_IO30,GPT2_COMPARE3,FLEXPWM1_PWMX2,,,,,ALT5
+GPIO_EMC_31,SEMC_DM1,FLEXPWM2_PWMB2,LPUART4_RTS_B,SAI3_RX_DATA,WDOG2_B,GPIO2_IO31,GPT2_CLK,FLEXPWM1_PWMX3,,,,,ALT5
+GPIO_EMC_32,SEMC_DA08,TMR1_TIMER0,LPUART4_TXD,SAI3_TX_DATA,LPSPI4_SCK,GPIO3_IO00,USBPHY1_TSTO_RX_FS_RXD,REF_24M_OUT,,,,,ALT5
+GPIO_EMC_33,SEMC_DA09,TMR1_TIMER1,LPUART4_RXD,SAI3_TX_BCLK,LPSPI4_PCS0,GPIO3_IO01,USBPHY1_TSTI_TX_DP,SRC_TESTER_ACK,,,,,ALT5
+GPIO_EMC_34,SEMC_DA10,TMR1_TIMER2,LPUART7_TXD,SAI3_TX_SYNC,LPSPI4_SDO,GPIO3_IO02,ENET_CRS,,,,,,ALT5
+GPIO_EMC_35,SEMC_DA11,TMR1_TIMER3,LPUART7_RXD,USDHC2_WP,LPSPI4_SDI,GPIO3_IO03,ENET_COL,,,,,,ALT5
+GPIO_EMC_36,SEMC_DA12,FLEXPWM2_PWMA1,LPUART5_CTS_B,CCM_PMIC_RDY,LPSPI4_PCS1,GPIO3_IO04,ENET_RX_CLK,USDHC1_WP,,,,,ALT5
+GPIO_EMC_37,SEMC_DA13,FLEXPWM2_PWMB1,LPUART5_RTS_B,MQS_RIGHT,LPSPI4_PCS2,GPIO3_IO05,ENET_RX_DATA3,USDHC1_VSELECT,,,,,ALT5
+GPIO_EMC_38,SEMC_DA14,FLEXPWM2_PWMA0,LPUART5_TXD,MQS_LEFT,LPSPI4_PCS3,GPIO3_IO06,ENET_RX_DATA2,USDHC1_CD_B,,,,,ALT5
+GPIO_EMC_39,SEMC_DA15,FLEXPWM2_PWMB0,LPUART5_RXD,USB_OTG1_OC,WDOG1_B,GPIO3_IO07,ENET_TX_ER,GPT1_CLK,,,,,ALT5
+GPIO_EMC_40,SEMC_CSX0,XBAR_INOUT18,SPDIF_OUT,USB_OTG1_ID,ENET_MDIO,GPIO3_IO08,ENET_TX_DATA3,GPT1_COMPARE3,,,,,ALT5
+GPIO_EMC_41,SEMC_RDY,XBAR_INOUT19,SPDIF_IN,USB_OTG1_PWR,ENET_MDC,GPIO3_IO09,ENET_TX_DATA2,GPT1_COMPARE2,,,,,ALT5
+GPIO_SD_B0_00,USDHC1_DATA2,TMR1_TIMER0,SAI1_MCLK,SAI2_MCLK,LPI2C3_SCL,GPIO3_IO13,FLEXSPI_A_SS1_B,XBAR_INOUT14,,,,,ALT5
+GPIO_SD_B0_01,USDHC1_DATA3,TMR1_TIMER1,REF_24M_OUT,SAI2_RX_SYNC,LPI2C3_SDA,GPIO3_IO14,FLEXSPI_B_SS1_B,XBAR_INOUT15,,,,,ALT5
+GPIO_SD_B0_02,USDHC1_CMD,TMR1_TIMER2,LPUART7_CTS_B,SAI2_RX_BCLK,LPSPI1_SCK,GPIO3_IO15,ENET_MDIO,XBAR_INOUT16,,,,,ALT5
+GPIO_SD_B0_03,USDHC1_CLK,TMR1_TIMER3,LPUART7_RTS_B,SAI2_RX_DATA,LPSPI1_PCS0,GPIO3_IO16,ENET_MDC,,,,,,ALT5
+GPIO_SD_B0_04,USDHC1_DATA0,FLEXCAN2_TX,LPUART7_TXD,SAI2_TX_DATA,LPSPI1_SDO,GPIO3_IO17,FLEXSPI_B_SS0_B,,,,,,ALT5
+GPIO_SD_B0_05,USDHC1_DATA1,FLEXCAN2_RX,LPUART7_RXD,SAI2_TX_BCLK,LPSPI1_SDI,GPIO3_IO18,FLEXSPI_B_DQS,,,,,,ALT5
+GPIO_SD_B0_06,USDHC1_CD_B,USDHC1_RESET_B,REF_32K_OUT,SAI2_TX_SYNC,WDOG1_B,GPIO3_IO19,XBAR_INOUT17,,,,,,ALT5
+GPIO_SD_B1_00,USDHC2_DATA2,FLEXSPI_B_DATA3,LPUART6_TXD,XBAR_INOUT10,FLEXCAN1_TX,GPIO3_IO20,,,,,,,ALT5
+GPIO_SD_B1_01,USDHC2_DATA3,FLEXSPI_B_SCLK,LPUART6_RXD,FLEXSPI_A_SS1_B,FLEXCAN1_RX,GPIO3_IO21,,,,,,,ALT5
+GPIO_SD_B1_02,USDHC2_CMD,FLEXSPI_B_DATA0,LPUART8_TXD,LPI2C4_SCL,ENET_1588_EVENT1_OUT,GPIO3_IO22,CCM_CLKO1,,,,,,ALT5
+GPIO_SD_B1_03,USDHC2_CLK,FLEXSPI_B_DATA2,LPUART8_RXD,LPI2C4_SDA,ENET_1588_EVENT1_IN,GPIO3_IO23,CCM_CLKO2,,,,,,ALT5
+GPIO_SD_B1_04,USDHC2_DATA0,FLEXSPI_B_DATA1,ENET_TX_CLK,ENET_REF_CLK,EWM_OUT_B,GPIO3_IO24,CCM_WAIT,,,,,,ALT5
+GPIO_SD_B1_05,USDHC2_DATA1,FLEXSPI_A_DQS,ENET_RX_DATA1,SAI3_MCLK,FLEXSPI_B_SS0_B,GPIO3_IO25,CCM_PMIC_RDY,,,,,,ALT5
+GPIO_SD_B1_06,USDHC2_CD_B,FLEXSPI_A_DATA3,ENET_RX_DATA0,SAI3_TX_BCLK,LPSPI2_PCS0,GPIO3_IO26,CCM_STOP,,,,,,ALT5
+GPIO_SD_B1_07,USDHC2_RESET_B,FLEXSPI_A_SCLK,ENET_RX_EN,SAI3_TX_SYNC,LPSPI2_SCK,GPIO3_IO27,,,,,,,ALT5
+GPIO_SD_B1_08,USDHC2_DATA4,FLEXSPI_A_DATA0,ENET_RX_ER,SAI3_TX_DATA,LPSPI2_SDO,GPIO3_IO28,,,,,,,ALT5
+GPIO_SD_B1_09,USDHC2_DATA5,FLEXSPI_A_DATA2,ENET_TX_EN,SAI3_RX_BCLK,LPSPI2_SDI,GPIO3_IO29,CCM_REF_EN_B,,,,,,ALT5
+GPIO_SD_B1_10,USDHC2_DATA6,FLEXSPI_A_DATA1,ENET_TX_DATA0,SAI3_RX_SYNC,LPSPI2_PCS2,GPIO3_IO30,SRC_SYSTEM_RESET,,,,,,ALT5
+GPIO_SD_B1_11,USDHC2_DATA7,FLEXSPI_A_SS0_B,ENET_TX_DATA1,SAI3_RX_DATA,LPSPI2_PCS3,GPIO3_IO31,SRC_EARLY_RESET,,,,,,ALT5
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
index 5a733bbd97..2337496d2a 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
@@ -4,6 +4,6 @@
 #define BOARD_FLASH_SIZE (64 * 1024 * 1024)
 
 // MIMXRT1050_EVK has 1 user LED
-#define MICROPY_HW_LED1_PIN (GPIO_AD_B0_09)
+#define MICROPY_HW_LED1_PIN (pin_GPIO_AD_B0_09)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/pins.c b/ports/mimxrt/boards/MIMXRT1050_EVK/pins.c
deleted file mode 100644
index d5da9c6f99..0000000000
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/pins.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 NXP
- *
- * 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 "pin.h"
-
-static pin_af_obj_t GPIO_AD_B0_09_af[] = {
-    PIN_AF(GPIO1_IO09, PIN_AF_MODE_ALT5, GPIO1, 0x10B0U),
-};
-
-pin_obj_t GPIO_AD_B0_09 = PIN(GPIO_AD_B0_09, GPIO1, 9, GPIO_AD_B0_09_af);
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv
new file mode 100644
index 0000000000..afd63d4f97
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv
@@ -0,0 +1,51 @@
+D0,GPIO_AD_B1_07
+D1,GPIO_AD_B1_06
+D2,GPIO_AD_B0_11
+D3,GPIO_AD_B1_08
+D4,GPIO_AD_B0_09
+D5,GPIO_AD_B0_10
+D6,GPIO_AD_B1_02
+D7,GPIO_AD_B1_03
+D8,GPIO_AD_B0_03
+D9,GPIO_AD_B0_02
+D10,GPIO_SD_B0_01
+D11,GPIO_SD_B0_02
+D12,GPIO_SD_B0_03
+D13,GPIO_SD_B0_00
+D14,GPIO_AD_B1_01
+D15,GPIO_AD_B1_00
+A0,GPIO_AD_B1_10
+A1,GPIO_AD_B1_11
+A2,GPIO_AD_B1_04
+A3,GPIO_AD_B1_05
+A4,GPIO_AD_B1_01
+A5,GPIO_AD_B1_00
+RX,GPIO_AD_B1_07
+TX,GPIO_AD_B1_06
+SCL,GPIO_AD_B1_00
+SDA,GPIO_AD_B1_01
+SCK,GPIO_SD_B0_00
+SDI,GPIO_SD_B0_03
+SDO,GPIO_SD_B0_02
+CS,GPIO_SD_B0_01
+LED_GREEN,GPIO_AD_B0_09
+GPIO_AD_B1_07,GPIO_AD_B1_07
+GPIO_AD_B1_06,GPIO_AD_B1_06
+GPIO_AD_B0_11,GPIO_AD_B0_11
+GPIO_AD_B1_08,GPIO_AD_B1_08
+GPIO_AD_B0_09,GPIO_AD_B0_09
+GPIO_AD_B0_10,GPIO_AD_B0_10
+GPIO_AD_B1_02,GPIO_AD_B1_02
+GPIO_AD_B1_03,GPIO_AD_B1_03
+GPIO_AD_B0_03,GPIO_AD_B0_03
+GPIO_AD_B0_02,GPIO_AD_B0_02
+GPIO_SD_B0_01,GPIO_SD_B0_01
+GPIO_SD_B0_02,GPIO_SD_B0_02
+GPIO_SD_B0_03,GPIO_SD_B0_03
+GPIO_SD_B0_00,GPIO_SD_B0_00
+GPIO_AD_B1_01,GPIO_AD_B1_01
+GPIO_AD_B1_00,GPIO_AD_B1_00
+GPIO_AD_B1_10,GPIO_AD_B1_10
+GPIO_AD_B1_11,GPIO_AD_B1_11
+GPIO_AD_B1_04,GPIO_AD_B1_04
+GPIO_AD_B1_05,GPIO_AD_B1_05
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/pins.h b/ports/mimxrt/boards/MIMXRT1050_EVK/pins.h
deleted file mode 100644
index baef51c6c8..0000000000
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/pins.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 NXP
- *
- * 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.
- */
-
-// NOTE: pins.h shall only be included in in pin.h
-// hence no include guards are needed since they will be provided by pin.h
-
-extern pin_obj_t GPIO_AD_B0_09;
diff --git a/ports/mimxrt/boards/MIMXRT1052_af.csv b/ports/mimxrt/boards/MIMXRT1052_af.csv
new file mode 100644
index 0000000000..754bf4ab7b
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1052_af.csv
@@ -0,0 +1,125 @@
+Pad,ALT0, ALT1, ALT2, ALT3, ALT4, ALT5, ALT6, ALT7, ALT8, ALT9,ADC,ACMP,Default
+GPIO_AD_B0_00,FLEXPWM2_PWM3_A,XBAR_INOUT14,REF_CLK_32K,USB_OTG2_ID,LPI2C1_SCLS,GPIO1_IO00,USDHC1_RESET_B,LPSPI3_SCK,,,,ACMP1_IN4,ALT5
+GPIO_AD_B0_01,FLEXPWM2_PWM3_B,XBAR_INOUT15,REF_CLK_24M,USB_OTG1_ID,LPI2C1_SDAS,GPIO1_IO01,EWM_OUT_B,LPSPI3_SOUT,,,,ACMP2_IN4,ALT5
+GPIO_AD_B0_02,FLEXCAN2_TX,XBAR_INOUT16,LPUART6_TXD,USB_OTG1_PWR,FLEXPWM1_PWM0_X,GPIO1_IO02,LPI2C1_HREQ,LPSPI3_SIN,,,,ACMP3_IN4,ALT5
+GPIO_AD_B0_03,FLEXCAN2_RX,XBAR_INOUT17,LPUART6_RXD,USB_OTG1_OC,FLEXPWM1_PWM1_X,GPIO1_IO03,REF_CLK_24M,LPSPI3_PCS0,,,,ACMP4_IN4,ALT5
+GPIO_AD_B0_04,SRC_BOOT_MODE0,MQS_RIGHT,ENET_TX_DATA3,SAI2_TX_SYNC,CSI_DATA09,GPIO1_IO04,PIT_TRIGGER0,LPSPI3_PCS1,,,,,ALT0
+GPIO_AD_B0_05,SRC_BOOT_MODE1,MQS_LEFT,ENET_TX_DATA2,SAI2_TX_BCLK,CSI_DATA08,GPIO1_IO05,XBAR_INOUT17,LPSPI3_PCS2,,,,,ALT0
+GPIO_AD_B0_06,"JTAG_TMS,SWD_DIO",GPT2_COMPARE1,ENET_RX_CLK,SAI2_RX_BCLK,CSI_DATA07,GPIO1_IO06,XBAR_INOUT18,LPSPI3_PCS3,,,,,ALT0
+GPIO_AD_B0_07,"JTAG_TCK,SWD_CLK",GPT2_COMPARE2,ENET_TX_ER,SAI2_RX_SYNC,CSI_DATA06,GPIO1_IO07,XBAR_INOUT19,ENET_1588_EVENT3_OUT,,,,,ALT0
+GPIO_AD_B0_08,JTAG_MOD,GPT2_COMPARE3,ENET_RX_DATA3,SAI2_RX_DATA,CSI_DATA05,GPIO1_IO08,XBAR_INOUT20,ENET_1588_EVENT3_IN,,,,,ALT0
+GPIO_AD_B0_09,JTAG_TDI,FLEXPWM2_PWM3_A,ENET_RX_DATA2,SAI2_TX_DATA,CSI_DATA04,GPIO1_IO09,XBAR_INOUT21,GPT2_CLK,,,,,ALT0
+GPIO_AD_B0_10,JTAG_TDO,FLEXPWM1_PWM3_A,ENET_CRS,SAI2_MCLK,CSI_DATA03,GPIO1_IO10,XBAR_INOUT22,ENET_1588_EVENT0_OUT,,,,,ALT0
+GPIO_AD_B0_11,JTAG_TRSTB,FLEXPWM1_PWM3_B,ENET_COL,WDOG1_B,CSI_DATA02,GPIO1_IO11,XBAR_INOUT23,ENET_1588_EVENT0_IN,,,,,ALT0
+GPIO_AD_B0_12,LPI2C4_SCL,CCM_PMIC_READY,LPUART1_TXD,WDOG2_B,FLEXPWM1_PWM2_X,GPIO1_IO12,ENET_1588_EVENT1_OUT,,,,ADC1_IN1,,ALT5
+GPIO_AD_B0_13,LPI2C4_SDA,GPT1_CLK,LPUART1_RXD,EWM_OUT_B,FLEXPWM1_PWM3_X,GPIO1_IO13,ENET_1588_EVENT1_IN,REF_CLK_24M,,,ADC1_IN2,ACMP1_IN2,ALT5
+GPIO_AD_B0_14,USB_OTG2_OC,XBAR_INOUT24,LPUART1_CTS_B,ENET_1588_EVENT0_OUT,CSI_VSYNC,GPIO1_IO14,FLEXCAN2_TX,WDOG1_ANY,,,ADC1_IN3,ACMP2_IN2,ALT5
+GPIO_AD_B0_15,USB_OTG2_PWR,XBAR_INOUT25,LPUART1_RTS_B,ENET_1588_EVENT0_IN,CSI_HSYNC,GPIO1_IO15,FLEXCAN2_RX,WDOG1_RST_B_DEB,,,ADC1_IN4,ACMP3_IN2,ALT5
+GPIO_AD_B1_00,USB_OTG2_ID,TMR3_TIMER0,LPUART2_CTS_B,LPI2C1_SCL,WDOG1_B,GPIO1_IO16,USDHC1_WP,KPP_ROW7,,,"ADC1_IN5,ADC2_IN5",ACMP4_IN2,ALT5
+GPIO_AD_B1_01,USB_OTG1_PWR,TMR3_TIMER1,LPUART2_RTS_B,LPI2C1_SDA,CCM_PMIC_READY,GPIO1_IO17,USDHC1_VSELECT,KPP_COL7,,,"ADC1_IN6,ADC2_IN6","ACMP1_IN0,ACMP2_IN0,ACMP3_IN0,ACMP4_IN0",ALT5
+GPIO_AD_B1_02,USB_OTG1_ID,TMR3_TIMER2,LPUART2_TXD,SPDIF_OUT,ENET_1588_EVENT2_OUT,GPIO1_IO18,USDHC1_CD_B,KPP_ROW6,,,"ADC1_IN7,ADC2_IN7",ACMP1_IN3,ALT5
+GPIO_AD_B1_03,USB_OTG1_OC,TMR3_TIMER3,LPUART2_RXD,SPDIF_IN,ENET_1588_EVENT2_IN,GPIO1_IO19,USDHC2_CD_B,KPP_COL6,,,"ADC1_IN8,ADC2_IN8",ACMP2_IN3,ALT5
+GPIO_AD_B1_04,FLEXSPI_B_DATA3,ENET_MDC,LPUART3_CTS_B,SPDIF_SR_CLK,CSI_PIXCLK,GPIO1_IO20,USDHC2_DATA0,KPP_ROW5,,,"ADC1_IN9,ADC2_IN9",ACMP3_IN3,ALT5
+GPIO_AD_B1_05,FLEXSPI_B_DATA2,ENET_MDIO,LPUART3_RTS_B,SPDIF_OUT,CSI_MCLK,GPIO1_IO21,USDHC2_DATA1,KPP_COL5,,,"ADC1_IN10,ADC2_IN10",ACMP4_IN3,ALT5
+GPIO_AD_B1_06,FLEXSPI_B_DATA1,LPI2C3_SDA,LPUART3_TXD,SPDIF_LOCK,CSI_VSYNC,GPIO1_IO22,USDHC2_DATA2,KPP_ROW4,,,"ADC1_IN11,ADC2_IN11","ACMP1_IN1,ACMP2_IN1,ACMP3_IN1,ACMP4_IN1",ALT5
+GPIO_AD_B1_07,FLEXSPI_B_DATA0,LPI2C3_SCL,LPUART3_RXD,SPDIF_EXT_CLK,CSI_HSYNC,GPIO1_IO23,USDHC2_DATA3,KPP_COL4,,,"ADC1_IN12,ADC2_IN12",ACMP1_IN5,ALT5
+GPIO_AD_B1_08,FLEXSPI_A_SS1_B,FLEXPWM4_PWM0_A,FLEXCAN1_TX,CCM_PMIC_READY,CSI_DATA09,GPIO1_IO24,USDHC2_CMD,KPP_ROW3,,,"ADC1_IN13,ADC2_IN13",ACMP2_IN5,ALT5
+GPIO_AD_B1_09,FLEXSPI_A_DQS,FLEXPWM4_PWM1_A,FLEXCAN1_RX,SAI1_MCLK,CSI_DATA08,GPIO1_IO25,USDHC2_CLK,KPP_COL3,,,"ADC1_IN14,ADC2_IN14",ACMP3_IN5,ALT5
+GPIO_AD_B1_10,FLEXSPI_A_DATA3,WDOG1_B,LPUART8_TXD,SAI1_RX_SYNC,CSI_DATA07,GPIO1_IO26,USDHC2_WP,KPP_ROW2,,,"ADC1_IN15,ADC2_IN15",ACMP4_IN5,ALT5
+GPIO_AD_B1_11,FLEXSPI_A_DATA2,EWM_OUT_B,LPUART8_RXD,SAI1_RX_BCLK,CSI_DATA06,GPIO1_IO27,USDHC2_RESET_B,KPP_COL2,,,"ADC1_IN0,ADC2_IN0",ACMP1_IN6,ALT5
+GPIO_AD_B1_12,FLEXSPI_A_DATA1,ACMP1_OUT,LPSPI3_PCS0,SAI1_RX_DATA0,CSI_DATA05,GPIO1_IO28,USDHC2_DATA4,KPP_ROW1,,,ADC2_IN1,"ACMP1_OUT,ACMP2_IN6",ALT5
+GPIO_AD_B1_13,FLEXSPI_A_DATA0,ACMP2_OUT,LPSPI3_SIN,SAI1_TX_DATA0,CSI_DATA04,GPIO1_IO29,USDHC2_DATA5,KPP_COL1,,,ADC2_IN2,"ACMP2_OUT,ACMP3_IN6",ALT5
+GPIO_AD_B1_14,FLEXSPI_A_SCLK,ACMP3_OUT,LPSPI3_SOUT,SAI1_TX_BCLK,CSI_DATA03,GPIO1_IO30,USDHC2_DATA6,KPP_ROW0,,,ADC2_IN3,"ACMP3_OUT,ACMP4_IN6",ALT5
+GPIO_AD_B1_15,FLEXSPI_A_SS0_B,ACMP4_OUT,LPSPI3_SCK,SAI1_TX_SYNC,CSI_DATA02,GPIO1_IO31,USDHC2_DATA7,KPP_COL0,,,ADC2_IN4,ACMP4_OUT,ALT5
+GPIO_B0_00,LCD_CLK,TMR1_TIMER0,MQS_RIGHT,LPSPI4_PCS0,FLEXIO2_D00,GPIO2_IO00,SEMC_CSX1,,,,,,ALT5
+GPIO_B0_01,LCD_ENABLE,TMR1_TIMER1,MQS_LEFT,LPSPI4_SIN,FLEXIO2_D01,GPIO2_IO01,SEMC_CSX2,,,,,,ALT5
+GPIO_B0_02,LCD_HSYNC,TMR1_TIMER2,FLEXCAN1_TX,LPSPI4_SOUT,FLEXIO2_D02,GPIO2_IO02,SEMC_CSX3,,,,,,ALT5
+GPIO_B0_03,LCD_VSYNC,TMR2_TIMER0,FLEXCAN1_RX,LPSPI4_SCK,FLEXIO2_D03,GPIO2_IO03,WDOG2_RST_B_DEB,,,,,,ALT5
+GPIO_B0_04,LCD_DATA00,TMR2_TIMER1,LPI2C2_SCL,ARM_TRACE0,FLEXIO2_D04,GPIO2_IO04,SRC_BT_CFG00,,,,,,ALT5
+GPIO_B0_05,LCD_DATA01,TMR2_TIMER2,LPI2C2_SDA,ARM_TRACE1,FLEXIO2_D05,GPIO2_IO05,SRC_BT_CFG01,,,,,,ALT5
+GPIO_B0_06,LCD_DATA02,TMR3_TIMER0,FLEXPWM2_PWM0_A,ARM_TRACE2,FLEXIO2_D06,GPIO2_IO06,SRC_BT_CFG02,,,,,,ALT5
+GPIO_B0_07,LCD_DATA03,TMR3_TIMER1,FLEXPWM2_PWM0_B,ARM_TRACE3,FLEXIO2_D07,GPIO2_IO07,SRC_BT_CFG03,,,,,,ALT5
+GPIO_B0_08,LCD_DATA04,TMR3_TIMER2,FLEXPWM2_PWM1_A,LPUART3_TXD,FLEXIO2_D08,GPIO2_IO08,SRC_BT_CFG04,,,,,,ALT5
+GPIO_B0_09,LCD_DATA05,TMR4_TIMER0,FLEXPWM2_PWM1_B,LPUART3_RXD,FLEXIO2_D09,GPIO2_IO09,SRC_BT_CFG05,,,,,,ALT5
+GPIO_B0_10,LCD_DATA06,TMR4_TIMER1,FLEXPWM2_PWM2_A,"SAI1_TX_DATA3,SAI1_RX_DATA1",FLEXIO2_D10,GPIO2_IO10,SRC_BT_CFG06,,,,,,ALT5
+GPIO_B0_11,LCD_DATA07,TMR4_TIMER2,FLEXPWM2_PWM2_B,"SAI1_TX_DATA2,SAI1_RX_DATA2",FLEXIO2_D11,GPIO2_IO11,SRC_BT_CFG07,,,,,,ALT5
+GPIO_B0_12,LCD_DATA08,XBAR_INOUT10,ARM_TRACE_CLK,"SAI1_TX_DATA1,SAI1_RX_DATA3",FLEXIO2_D12,GPIO2_IO12,SRC_BT_CFG08,,,,,,ALT5
+GPIO_B0_13,LCD_DATA09,XBAR_INOUT11,ARM_TRACE_SWO,SAI1_MCLK,FLEXIO2_D13,GPIO2_IO13,SRC_BT_CFG09,,,,,,ALT5
+GPIO_B0_14,LCD_DATA10,XBAR_INOUT12,ARM_CM7_EVENT0,SAI1_RX_SYNC,FLEXIO2_D14,GPIO2_IO14,SRC_BT_CFG10,,,,,,ALT5
+GPIO_B0_15,LCD_DATA11,XBAR_INOUT13,ARM_CM7_EVENT1,SAI1_RX_BCLK,FLEXIO2_D15,GPIO2_IO15,SRC_BT_CFG11,,,,,,ALT5
+GPIO_B1_00,LCD_DATA12,XBAR_INOUT14,LPUART4_TXD,SAI1_RX_DATA0,FLEXIO2_D16,GPIO2_IO16,FLEXPWM1_PWM3_A,,,,,,ALT5
+GPIO_B1_01,LCD_DATA13,XBAR_INOUT15,LPUART4_RXD,SAI1_TX_DATA0,FLEXIO2_D17,GPIO2_IO17,FLEXPWM1_PWM3_B,,,,,,ALT5
+GPIO_B1_02,LCD_DATA14,XBAR_INOUT16,LPSPI4_PCS2,SAI1_TX_BCLK,FLEXIO2_D18,GPIO2_IO18,FLEXPWM2_PWM3_A,,,,,,ALT5
+GPIO_B1_03,LCD_DATA15,XBAR_INOUT17,LPSPI4_PCS1,SAI1_TX_SYNC,FLEXIO2_D19,GPIO2_IO19,FLEXPWM2_PWM3_B,,,,,,ALT5
+GPIO_B1_04,LCD_DATA16,LPSPI4_PCS0,CSI_DATA15,ENET_RX_DATA0,FLEXIO2_D20,GPIO2_IO20,,,,,,,ALT5
+GPIO_B1_05,LCD_DATA17,LPSPI4_SIN,CSI_DATA14,ENET_RX_DATA1,FLEXIO2_D21,GPIO2_IO21,,,,,,,ALT5
+GPIO_B1_06,LCD_DATA18,LPSPI4_SOUT,CSI_DATA13,ENET_RX_EN,FLEXIO2_D22,GPIO2_IO22,,,,,,,ALT5
+GPIO_B1_07,LCD_DATA19,LPSPI4_SCK,CSI_DATA12,ENET_TX_DATA0,FLEXIO2_D23,GPIO2_IO23,,,,,,,ALT5
+GPIO_B1_08,LCD_DATA20,TMR1_TIMER3,CSI_DATA11,ENET_TX_DATA1,FLEXIO2_D24,GPIO2_IO24,FLEXCAN2_TX,,,,,,ALT5
+GPIO_B1_09,LCD_DATA21,TMR2_TIMER3,CSI_DATA10,ENET_TX_EN,FLEXIO2_D25,GPIO2_IO25,FLEXCAN2_RX,,,,,,ALT5
+GPIO_B1_10,LCD_DATA22,TMR3_TIMER3,CSI_DATA00,ENET_TX_CLK,FLEXIO2_D26,GPIO2_IO26,ENET_REF_CLK,,,,,,ALT5
+GPIO_B1_11,LCD_DATA23,TMR4_TIMER3,CSI_DATA01,ENET_RX_ER,FLEXIO2_D27,GPIO2_IO27,LPSPI4_PCS3,,,,,,ALT5
+GPIO_B1_12,,LPUART5_TXD,CSI_PIXCLK,ENET_1588_EVENT0_IN,FLEXIO2_D28,GPIO2_IO28,USDHC1_CD_B,,,,,,ALT5
+GPIO_B1_13,WDOG1_B,LPUART5_RXD,CSI_VSYNC,ENET_1588_EVENT0_OUT,FLEXIO2_D29,GPIO2_IO29,USDHC1_WP,,,,,,ALT5
+GPIO_B1_14,ENET_MDC,FLEXPWM4_PWM2_A,CSI_HSYNC,XBAR_INOUT02,FLEXIO2_D30,GPIO2_IO30,USDHC1_VSELECT,,,,,,ALT5
+GPIO_B1_15,ENET_MDIO,FLEXPWM4_PWM3_A,CSI_MCLK,XBAR_INOUT03,FLEXIO2_D31,GPIO2_IO31,USDHC1_RESET_B,,,,,,ALT5
+GPIO_EMC_00,SEMC_DATA00,FLEXPWM4_PWM0_A,LPSPI2_SCK,XBAR_INOUT02,FLEXIO1_D00,GPIO4_IO0,USB_PHY1_TSTI_TX_LS_MODE,,,,,,ALT5
+GPIO_EMC_01,SEMC_DATA01,FLEXPWM4_PWM0_B,LPSPI2_PCS0,XBAR_INOUT03,FLEXIO1_D01,GPIO4_IO1,USB_PHY1_TSTI_TX_HS_MODE,,,,,,ALT5
+GPIO_EMC_02,SEMC_DATA02,FLEXPWM4_PWM1_A,LPSPI2_SOUT,XBAR_INOUT04,FLEXIO1_D02,GPIO4_IO2,USB_PHY1_TSTI_TX_DN,,,,,,ALT5
+GPIO_EMC_03,SEMC_DATA03,FLEXPWM4_PWM1_B,LPSPI2_SIN,XBAR_INOUT05,FLEXIO1_D03,GPIO4_IO3,USB_PHY1_TSTO_RX_SQUELCH,,,,,,ALT5
+GPIO_EMC_04,SEMC_DATA04,FLEXPWM4_PWM2_A,SAI2_TX_DATA,XBAR_INOUT06,FLEXIO1_D04,GPIO4_IO4,USB_PHY1_TSTO_RX_DISCON_DET,,,,,,ALT5
+GPIO_EMC_05,SEMC_DATA05,FLEXPWM4_PWM2_B,SAI2_TX_SYNC,XBAR_INOUT07,FLEXIO1_D05,GPIO4_IO5,USB_PHY1_TSTO_RX_HS_RXD,,,,,,ALT5
+GPIO_EMC_06,SEMC_DATA06,FLEXPWM2_PWM0_A,SAI2_TX_BCLK,XBAR_INOUT08,FLEXIO1_D06,GPIO4_IO6,USB_PHY2_TSTO_RX_FS_RXD,,,,,,ALT5
+GPIO_EMC_07,SEMC_DATA07,FLEXPWM2_PWM0_B,SAI2_MCLK,XBAR_INOUT09,FLEXIO1_D07,GPIO4_IO7,USB_PHY1_TSTO_RX_FS_RXD,,,,,,ALT5
+GPIO_EMC_08,SEMC_DM0,FLEXPWM2_PWM1_A,SAI2_RX_DATA,XBAR_INOUT17,FLEXIO1_D08,GPIO4_IO8,USB_PHY1_TSTI_TX_DP,,,,,,ALT5
+GPIO_EMC_09,SEMC_ADDR00,FLEXPWM2_PWM1_B,SAI2_RX_SYNC,FLEXCAN2_TX,FLEXIO1_D09,GPIO4_IO9,USB_PHY1_TSTI_TX_EN,,,,,,ALT5
+GPIO_EMC_10,SEMC_ADDR01,FLEXPWM2_PWM2_A,SAI2_RX_BCLK,FLEXCAN2_RX,FLEXIO1_D10,GPIO4_IO10,USB_PHY1_TSTI_TX_HIZ,,,,,,ALT5
+GPIO_EMC_11,SEMC_ADDR02,FLEXPWM2_PWM2_B,LPI2C4_SDA,USDHC2_RESET_B,FLEXIO1_D11,GPIO4_IO11,USB_PHY2_TSTO_RX_HS_RXD,,,,,,ALT5
+GPIO_EMC_12,SEMC_ADDR03,XBAR_INOUT24,LPI2C4_SCL,USDHC1_WP,FLEXPWM1_PWM3_A,GPIO4_IO12,USB_PHY1_TSTO_PLL_CLK20DIV,,,,,,ALT5
+GPIO_EMC_13,SEMC_ADDR04,XBAR_INOUT25,LPUART3_TXD,MQS_RIGHT,FLEXPWM1_PWM3_B,GPIO4_IO13,USB_PHY2_TSTO_PLL_CLK20DIV,,,,,,ALT5
+GPIO_EMC_14,SEMC_ADDR05,XBAR_INOUT19,LPUART3_RXD,MQS_LEFT,LPSPI2_PCS1,GPIO4_IO14,USB_PHY2_TSTO_RX_SQUELCH,,,,,,ALT5
+GPIO_EMC_15,SEMC_ADDR06,XBAR_INOUT20,LPUART3_CTS_B,SPDIF_OUT,TMR3_TIMER0,GPIO4_IO15,USB_PHY2_TSTO_RX_DISCON_DET,,,,,,ALT5
+GPIO_EMC_16,SEMC_ADDR07,XBAR_INOUT21,LPUART3_RTS_B,SPDIF_IN,TMR3_TIMER1,GPIO4_IO16,,,,,,,ALT5
+GPIO_EMC_17,SEMC_ADDR08,FLEXPWM4_PWM3_A,LPUART4_CTS_B,FLEXCAN1_TX,TMR3_TIMER2,GPIO4_IO17,,,,,,,ALT5
+GPIO_EMC_18,SEMC_ADDR09,FLEXPWM4_PWM3_B,LPUART4_RTS_B,FLEXCAN1_RX,TMR3_TIMER3,GPIO4_IO18,SNVS_VIO_5_CTL,,,,,,ALT5
+GPIO_EMC_19,SEMC_ADDR11,FLEXPWM2_PWM3_A,LPUART4_TXD,ENET_RX_DATA1,TMR2_TIMER0,GPIO4_IO19,SNVS_VIO_5_B,,,,,,ALT5
+GPIO_EMC_20,SEMC_ADDR12,FLEXPWM2_PWM3_B,LPUART4_RXD,ENET_RX_DATA0,TMR2_TIMER1,GPIO4_IO20,,,,,,,ALT5
+GPIO_EMC_21,SEMC_BA0,FLEXPWM3_PWM3_A,LPI2C3_SDA,ENET_TX_DATA1,TMR2_TIMER2,GPIO4_IO21,,,,,,,ALT5
+GPIO_EMC_22,SEMC_BA1,FLEXPWM3_PWM3_B,LPI2C3_SCL,ENET_TX_DATA0,TMR2_TIMER3,GPIO4_IO22,,,,,,,ALT5
+GPIO_EMC_23,SEMC_ADDR10,FLEXPWM1_PWM0_A,LPUART5_TXD,ENET_RX_EN,GPT1_CAPTURE2,GPIO4_IO23,,,,,,,ALT5
+GPIO_EMC_24,SEMC_CAS,FLEXPWM1_PWM0_B,LPUART5_RXD,ENET_TX_EN,GPT1_CAPTURE1,GPIO4_IO24,,,,,,,ALT5
+GPIO_EMC_25,SEMC_RAS,FLEXPWM1_PWM1_A,LPUART6_TXD,ENET_TX_CLK,ENET_REF_CLK,GPIO4_IO25,,,,,,,ALT5
+GPIO_EMC_26,SEMC_CLK,FLEXPWM1_PWM1_B,LPUART6_RXD,ENET_RX_ER,FLEXIO1_D12,GPIO4_IO26,,,,,,,ALT5
+GPIO_EMC_27,SEMC_CKE,FLEXPWM1_PWM2_A,LPUART5_RTS_B,LPSPI1_SCK,FLEXIO1_D13,GPIO4_IO27,,,,,,,ALT5
+GPIO_EMC_28,SEMC_WE,FLEXPWM1_PWM2_B,LPUART5_CTS_B,LPSPI1_SOUT,FLEXIO1_D14,GPIO4_IO28,,,,,,,ALT5
+GPIO_EMC_29,SEMC_CS0,FLEXPWM3_PWM0_A,LPUART6_RTS_B,LPSPI1_SIN,FLEXIO1_D15,GPIO4_IO29,,,,,,,ALT5
+GPIO_EMC_30,SEMC_DATA08,FLEXPWM3_PWM0_B,LPUART6_CTS_B,LPSPI1_PCS0,CSI_DATA23,GPIO4_IO30,,,,,,,ALT5
+GPIO_EMC_31,SEMC_DATA09,FLEXPWM3_PWM1_A,LPUART7_TXD,LPSPI1_PCS1,CSI_DATA22,GPIO4_IO31,,,,,,,ALT5
+GPIO_EMC_32,SEMC_DATA10,FLEXPWM3_PWM1_B,LPUART7_RXD,CCM_PMIC_READY,CSI_DATA21,GPIO3_IO18,,,,,,,ALT5
+GPIO_EMC_33,SEMC_DATA11,FLEXPWM3_PWM2_A,USDHC1_RESET_B,SAI3_RX_DATA,CSI_DATA20,GPIO3_IO19,,,,,,,ALT5
+GPIO_EMC_34,SEMC_DATA12,FLEXPWM3_PWM2_B,USDHC1_VSELECT,SAI3_RX_SYNC,CSI_DATA19,GPIO3_IO20,,,,,,,ALT5
+GPIO_EMC_35,SEMC_DATA13,XBAR_INOUT18,GPT1_COMPARE1,SAI3_RX_BCLK,CSI_DATA18,GPIO3_IO21,USDHC1_CD_B,,,,,,ALT5
+GPIO_EMC_36,SEMC_DATA14,XBAR_INOUT22,GPT1_COMPARE2,SAI3_TX_DATA,CSI_DATA17,GPIO3_IO22,USDHC1_WP,,,,,,ALT5
+GPIO_EMC_37,SEMC_DATA15,XBAR_INOUT23,GPT1_COMPARE3,SAI3_MCLK,CSI_DATA16,GPIO3_IO23,USDHC2_WP,,,,,,ALT5
+GPIO_EMC_38,SEMC_DM1,FLEXPWM1_PWM3_A,LPUART8_TXD,SAI3_TX_BCLK,CSI_FIELD,GPIO3_IO24,USDHC2_VSELECT,,,,,,ALT5
+GPIO_EMC_39,SEMC_DQS,FLEXPWM1_PWM3_B,LPUART8_RXD,SAI3_TX_SYNC,WDOG1_B,GPIO3_IO25,USDHC2_CD_B,,,,,,ALT5
+GPIO_EMC_40,SEMC_RDY,GPT2_CAPTURE2,LPSPI1_PCS2,USB_OTG2_OC,ENET_MDC,GPIO3_IO26,USDHC2_RESET_B,,,,,,ALT5
+GPIO_EMC_41,SEMC_CSX0,GPT2_CAPTURE1,LPSPI1_PCS3,USB_OTG2_PWR,ENET_MDIO,GPIO3_IO27,USDHC1_VSELECT,,,,,,ALT5
+GPIO_SD_B0_00,USDHC1_CMD,FLEXPWM1_PWM0_A,LPI2C3_SCL,XBAR_INOUT04,LPSPI1_SCK,GPIO3_IO12,FLEXSPI_A_SS1_B,,,,,,ALT5
+GPIO_SD_B0_01,USDHC1_CLK,FLEXPWM1_PWM0_B,LPI2C3_SDA,XBAR_INOUT05,LPSPI1_PCS0,GPIO3_IO13,FLEXSPI_B_SS1_B,,,,,,ALT5
+GPIO_SD_B0_02,USDHC1_DATA0,FLEXPWM1_PWM1_A,LPUART8_CTS_B,XBAR_INOUT06,LPSPI1_SOUT,GPIO3_IO14,,,,,,,ALT5
+GPIO_SD_B0_03,USDHC1_DATA1,FLEXPWM1_PWM1_B,LPUART8_RTS_B,XBAR_INOUT07,LPSPI1_SIN,GPIO3_IO15,,,,,,,ALT5
+GPIO_SD_B0_04,USDHC1_DATA2,FLEXPWM1_PWM2_A,LPUART8_TXD,XBAR_INOUT08,FLEXSPI_B_SS0_B,GPIO3_IO16,CCM_CLKO1,,,,,,ALT5
+GPIO_SD_B0_05,USDHC1_DATA3,FLEXPWM1_PWM2_B,LPUART8_RXD,XBAR_INOUT09,FLEXSPI_B_DQS,GPIO3_IO17,CCM_CLKO2,,,,,,ALT5
+GPIO_SD_B1_00,USDHC2_DATA3,FLEXSPI_B_DATA3,FLEXPWM1_PWM3_A,"SAI1_TX_DATA3,SAI1_RX_DATA1",LPUART4_TXD,GPIO3_IO00,,,,,,,ALT5
+GPIO_SD_B1_01,USDHC2_DATA2,FLEXSPI_B_DATA2,FLEXPWM1_PWM3_B,"SAI1_TX_DATA2,SAI1_RX_DATA2",LPUART4_RXD,GPIO3_IO01,,,,,,,ALT5
+GPIO_SD_B1_02,USDHC2_DATA1,FLEXSPI_B_DATA1,FLEXPWM2_PWM3_A,"SAI1_TX_DATA1,SAI1_RX_DATA3",FLEXCAN1_TX,GPIO3_IO02,CCM_WAIT,,,,,,ALT5
+GPIO_SD_B1_03,USDHC2_DATA0,FLEXSPI_B_DATA0,FLEXPWM2_PWM3_B,SAI1_MCLK,FLEXCAN1_RX,GPIO3_IO03,CCM_PMIC_READY,,,,,,ALT5
+GPIO_SD_B1_04,USDHC2_CLK,FLEXSPI_B_SCLK,LPI2C1_SCL,SAI1_RX_SYNC,FLEXSPI_A_SS1_B,GPIO3_IO04,CCM_STOP,,,,,,ALT5
+GPIO_SD_B1_05,USDHC2_CMD,FLEXSPI_A_DQS,LPI2C1_SDA,SAI1_RX_BCLK,FLEXSPI_B_SS0_B,GPIO3_IO05,,,,,,,ALT5
+GPIO_SD_B1_06,USDHC2_RESET_B,FLEXSPI_A_SS0_B,LPUART7_CTS_B,SAI1_RX_DATA0,LPSPI2_PCS0,GPIO3_IO06,,,,,,,ALT5
+GPIO_SD_B1_07,SEMC_CSX1,FLEXSPI_A_SCLK,LPUART7_RTS_B,SAI1_TX_DATA0,LPSPI2_SCK,GPIO3_IO07,CCM_REF_EN_B,,,,,,ALT5
+GPIO_SD_B1_08,USDHC2_DATA4,FLEXSPI_A_DATA0,LPUART7_TXD,SAI1_TX_BCLK,LPSPI2_SOUT,GPIO3_IO08,SEMC_CSX2,,,,,,ALT5
+GPIO_SD_B1_09,USDHC2_DATA5,FLEXSPI_A_DATA1,LPUART7_RXD,SAI1_TX_SYNC,LPSPI2_SIN,GPIO3_IO09,,,,,,,ALT5
+GPIO_SD_B1_10,USDHC2_DATA6,FLEXSPI_A_DATA2,LPUART2_RXD,LPI2C2_SDA,LPSPI2_PCS2,GPIO3_IO10,,,,,,,ALT5
+GPIO_SD_B1_11,USDHC2_DATA7,FLEXSPI_A_DATA3,LPUART2_TXD,LPI2C2_SCL,LPSPI2_PCS3,GPIO3_IO11,,,,,,,ALT5
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
index 8bd2a57917..c9e6d8bf2c 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
@@ -4,6 +4,6 @@
 #define BOARD_FLASH_SIZE (8 * 1024 * 1024)
 
 // MIMXRT1060_EVK has 1 user LED
-#define MICROPY_HW_LED1_PIN (GPIO_AD_B0_09)
+#define MICROPY_HW_LED1_PIN (pin_GPIO_AD_B0_09)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
index b34169801b..32f87046b8 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
@@ -2,6 +2,25 @@ MCU_SERIES = MIMXRT1062
 MCU_VARIANT = MIMXRT1062DVJ6A
 
 JLINK_PATH ?= /media/RT1060-EVK/
+JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
+
+
+ifdef JLINK_IP
+JLINK_CONNECTION_SETTINGS = -IP $(JLINK_IP)
+else
+JLINK_CONNECTION_SETTINGS = -USB
+endif
+
+
+deploy_jlink: $(BUILD)/firmware.hex
+	$(Q)$(TOUCH) $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "ExitOnError 1" > $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "speed auto" >> $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "r" >> $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "st" >> $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "loadfile \"$(realpath $(BUILD)/firmware.hex)\"" >> $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "qc" >> $(JLINK_COMMANDER_SCRIPT)
+	$(JLINK_PATH)JLinkExe -device $(MCU_VARIANT) -if SWD $(JLINK_CONNECTION_SETTINGS) -CommanderScript $(JLINK_COMMANDER_SCRIPT)
 
 deploy: $(BUILD)/firmware.bin
 	cp $< $(JLINK_PATH)
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/pins.c b/ports/mimxrt/boards/MIMXRT1060_EVK/pins.c
deleted file mode 100644
index d5da9c6f99..0000000000
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/pins.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 NXP
- *
- * 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 "pin.h"
-
-static pin_af_obj_t GPIO_AD_B0_09_af[] = {
-    PIN_AF(GPIO1_IO09, PIN_AF_MODE_ALT5, GPIO1, 0x10B0U),
-};
-
-pin_obj_t GPIO_AD_B0_09 = PIN(GPIO_AD_B0_09, GPIO1, 9, GPIO_AD_B0_09_af);
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv
new file mode 100644
index 0000000000..afd63d4f97
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv
@@ -0,0 +1,51 @@
+D0,GPIO_AD_B1_07
+D1,GPIO_AD_B1_06
+D2,GPIO_AD_B0_11
+D3,GPIO_AD_B1_08
+D4,GPIO_AD_B0_09
+D5,GPIO_AD_B0_10
+D6,GPIO_AD_B1_02
+D7,GPIO_AD_B1_03
+D8,GPIO_AD_B0_03
+D9,GPIO_AD_B0_02
+D10,GPIO_SD_B0_01
+D11,GPIO_SD_B0_02
+D12,GPIO_SD_B0_03
+D13,GPIO_SD_B0_00
+D14,GPIO_AD_B1_01
+D15,GPIO_AD_B1_00
+A0,GPIO_AD_B1_10
+A1,GPIO_AD_B1_11
+A2,GPIO_AD_B1_04
+A3,GPIO_AD_B1_05
+A4,GPIO_AD_B1_01
+A5,GPIO_AD_B1_00
+RX,GPIO_AD_B1_07
+TX,GPIO_AD_B1_06
+SCL,GPIO_AD_B1_00
+SDA,GPIO_AD_B1_01
+SCK,GPIO_SD_B0_00
+SDI,GPIO_SD_B0_03
+SDO,GPIO_SD_B0_02
+CS,GPIO_SD_B0_01
+LED_GREEN,GPIO_AD_B0_09
+GPIO_AD_B1_07,GPIO_AD_B1_07
+GPIO_AD_B1_06,GPIO_AD_B1_06
+GPIO_AD_B0_11,GPIO_AD_B0_11
+GPIO_AD_B1_08,GPIO_AD_B1_08
+GPIO_AD_B0_09,GPIO_AD_B0_09
+GPIO_AD_B0_10,GPIO_AD_B0_10
+GPIO_AD_B1_02,GPIO_AD_B1_02
+GPIO_AD_B1_03,GPIO_AD_B1_03
+GPIO_AD_B0_03,GPIO_AD_B0_03
+GPIO_AD_B0_02,GPIO_AD_B0_02
+GPIO_SD_B0_01,GPIO_SD_B0_01
+GPIO_SD_B0_02,GPIO_SD_B0_02
+GPIO_SD_B0_03,GPIO_SD_B0_03
+GPIO_SD_B0_00,GPIO_SD_B0_00
+GPIO_AD_B1_01,GPIO_AD_B1_01
+GPIO_AD_B1_00,GPIO_AD_B1_00
+GPIO_AD_B1_10,GPIO_AD_B1_10
+GPIO_AD_B1_11,GPIO_AD_B1_11
+GPIO_AD_B1_04,GPIO_AD_B1_04
+GPIO_AD_B1_05,GPIO_AD_B1_05
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/pins.h b/ports/mimxrt/boards/MIMXRT1060_EVK/pins.h
deleted file mode 100644
index baef51c6c8..0000000000
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/pins.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 NXP
- *
- * 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.
- */
-
-// NOTE: pins.h shall only be included in in pin.h
-// hence no include guards are needed since they will be provided by pin.h
-
-extern pin_obj_t GPIO_AD_B0_09;
diff --git a/ports/mimxrt/boards/MIMXRT1062_af.csv b/ports/mimxrt/boards/MIMXRT1062_af.csv
new file mode 100644
index 0000000000..9b83efeddc
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1062_af.csv
@@ -0,0 +1,125 @@
+Pad,ALT0, ALT1, ALT2, ALT3, ALT4, ALT5, ALT6, ALT7, ALT8, ALT9,ADC,ACMP,Default
+GPIO_AD_B0_00,FLEXPWM2_PWM3_A,XBAR_INOUT14,REF_CLK_32K,USB_OTG2_ID,LPI2C1_SCLS,GPIO1_IO00,USDHC1_RESET_B,LPSPI3_SCK,,,,ACMP1_IN4,ALT5
+GPIO_AD_B0_01,FLEXPWM2_PWM3_B,XBAR_INOUT15,REF_CLK_24M,USB_OTG1_ID,LPI2C1_SDAS,GPIO1_IO01,EWM_OUT_B,LPSPI3_SOUT,,,,ACMP2_IN4,ALT5
+GPIO_AD_B0_02,FLEXCAN2_TX,XBAR_INOUT16,LPUART6_TXD,USB_OTG1_PWR,FLEXPWM1_PWM0_X,GPIO1_IO02,LPI2C1_HREQ,LPSPI3_SIN,,,,ACMP3_IN4,ALT5
+GPIO_AD_B0_03,FLEXCAN2_RX,XBAR_INOUT17,LPUART6_RXD,USB_OTG1_OC,FLEXPWM1_PWM1_X,GPIO1_IO03,REF_CLK_24M,LPSPI3_PCS0,,,,ACMP4_IN4,ALT5
+GPIO_AD_B0_04,SRC_BOOT_MODE0,MQS_RIGHT,ENET_TX_DATA3,SAI2_TX_SYNC,CSI_DATA09,GPIO1_IO04,PIT_TRIGGER0,LPSPI3_PCS1,,,,,ALT0
+GPIO_AD_B0_05,SRC_BOOT_MODE1,MQS_LEFT,ENET_TX_DATA2,SAI2_TX_BCLK,CSI_DATA08,GPIO1_IO05,XBAR_INOUT17,LPSPI3_PCS2,,,,,ALT0
+GPIO_AD_B0_06,"JTAG_TMS,SWD_DIO",GPT2_COMPARE1,ENET_RX_CLK,SAI2_RX_BCLK,CSI_DATA07,GPIO1_IO06,XBAR_INOUT18,LPSPI3_PCS3,,,,,ALT0
+GPIO_AD_B0_07,"JTAG_TCK,SWD_CLK",GPT2_COMPARE2,ENET_TX_ER,SAI2_RX_SYNC,CSI_DATA06,GPIO1_IO07,XBAR_INOUT19,ENET_1588_EVENT3_OUT,,,,,ALT0
+GPIO_AD_B0_08,JTAG_MOD,GPT2_COMPARE3,ENET_RX_DATA3,SAI2_RX_DATA,CSI_DATA05,GPIO1_IO08,XBAR_INOUT20,ENET_1588_EVENT3_IN,,,,,ALT0
+GPIO_AD_B0_09,JTAG_TDI,FLEXPWM2_PWM3_A,ENET_RX_DATA2,SAI2_TX_DATA,CSI_DATA04,GPIO1_IO09,XBAR_INOUT21,GPT2_CLK,,,,,ALT0
+GPIO_AD_B0_10,JTAG_TDO,FLEXPWM1_PWM3_A,ENET_CRS,SAI2_MCLK,CSI_DATA03,GPIO1_IO10,XBAR_INOUT22,ENET_1588_EVENT0_OUT,FLEXCAN3_TX,,,,ALT0
+GPIO_AD_B0_11,JTAG_TRSTB,FLEXPWM1_PWM3_B,ENET_COL,WDOG1_B,CSI_DATA02,GPIO1_IO11,XBAR_INOUT23,ENET_1588_EVENT0_IN,FLEXCAN3_RX,,,,ALT0
+GPIO_AD_B0_12,LPI2C4_SCL,CCM_PMIC_READY,LPUART1_TXD,WDOG2_B,FLEXPWM1_PWM2_X,GPIO1_IO12,ENET_1588_EVENT1_OUT,,,,ADC1_IN1,,ALT5
+GPIO_AD_B0_13,LPI2C4_SDA,GPT1_CLK,LPUART1_RXD,EWM_OUT_B,FLEXPWM1_PWM3_X,GPIO1_IO13,ENET_1588_EVENT1_IN,REF_CLK_24M,,,ADC1_IN2,ACMP1_IN2,ALT5
+GPIO_AD_B0_14,USB_OTG2_OC,XBAR_INOUT24,LPUART1_CTS_B,ENET_1588_EVENT0_OUT,CSI_VSYNC,GPIO1_IO14,FLEXCAN2_TX,WDOG1_ANY,FLEXCAN3_TX,,ADC1_IN3,ACMP2_IN2,ALT5
+GPIO_AD_B0_15,USB_OTG2_PWR,XBAR_INOUT25,LPUART1_RTS_B,ENET_1588_EVENT0_IN,CSI_HSYNC,GPIO1_IO15,FLEXCAN2_RX,WDOG1_RESET_B_DEB,FLEXCAN3_RX,,ADC1_IN4,ACMP3_IN2,ALT5
+GPIO_AD_B1_00,USB_OTG2_ID,TMR3_TIMER0,LPUART2_CTS_B,LPI2C1_SCL,WDOG1_B,GPIO1_IO16,USDHC1_WP,KPP_ROW7,ENET2_1588_EVENT0_OUT,FLEXIO3_D00,"ADC1_IN5,ADC2_IN5",ACMP4_IN2,ALT5
+GPIO_AD_B1_01,USB_OTG1_PWR,TMR3_TIMER1,LPUART2_RTS_B,LPI2C1_SDA,CCM_PMIC_READY,GPIO1_IO17,USDHC1_VSELECT,KPP_COL7,ENET2_1588_EVENT0_IN,FLEXIO3_D01,"ADC1_IN6,ADC2_IN6","ACMP1_IN0,ACMP2_IN0,ACMP3_IN0,ACMP4_IN0",ALT5
+GPIO_AD_B1_02,USB_OTG1_ID,TMR3_TIMER2,LPUART2_TXD,SPDIF_OUT,ENET_1588_EVENT2_OUT,GPIO1_IO18,USDHC1_CD_B,KPP_ROW6,GPT2_CLK,FLEXIO3_D02,"ADC1_IN7,ADC2_IN7",ACMP1_IN3,ALT5
+GPIO_AD_B1_03,USB_OTG1_OC,TMR3_TIMER3,LPUART2_RXD,SPDIF_IN,ENET_1588_EVENT2_IN,GPIO1_IO19,USDHC2_CD_B,KPP_COL6,GPT2_CAPTURE1,FLEXIO3_D03,"ADC1_IN8,ADC2_IN8",ACMP2_IN3,ALT5
+GPIO_AD_B1_04,FLEXSPI_B_DATA3,ENET_MDC,LPUART3_CTS_B,SPDIF_SR_CLK,CSI_PIXCLK,GPIO1_IO20,USDHC2_DATA0,KPP_ROW5,GPT2_CAPTURE2,FLEXIO3_D04,"ADC1_IN9,ADC2_IN9",ACMP3_IN3,ALT5
+GPIO_AD_B1_05,FLEXSPI_B_DATA2,ENET_MDIO,LPUART3_RTS_B,SPDIF_OUT,CSI_MCLK,GPIO1_IO21,USDHC2_DATA1,KPP_COL5,GPT2_COMPARE1,FLEXIO3_D05,"ADC1_IN10,ADC2_IN10",ACMP4_IN3,ALT5
+GPIO_AD_B1_06,FLEXSPI_B_DATA1,LPI2C3_SDA,LPUART3_TXD,SPDIF_LOCK,CSI_VSYNC,GPIO1_IO22,USDHC2_DATA2,KPP_ROW4,GPT2_COMPARE2,FLEXIO3_D06,"ADC1_IN11,ADC2_IN11","ACMP1_IN1,ACMP2_IN1,ACMP3_IN1,ACMP4_IN1",ALT5
+GPIO_AD_B1_07,FLEXSPI_B_DATA0,LPI2C3_SCL,LPUART3_RXD,SPDIF_EXT_CLK,CSI_HSYNC,GPIO1_IO23,USDHC2_DATA3,KPP_COL4,GPT2_COMPARE3,FLEXIO3_D07,"ADC1_IN12,ADC2_IN12",ACMP1_IN5,ALT5
+GPIO_AD_B1_08,FLEXSPI_A_SS1_B,FLEXPWM4_PWM0_A,FLEXCAN1_TX,CCM_PMIC_READY,CSI_DATA09,GPIO1_IO24,USDHC2_CMD,KPP_ROW3,,FLEXIO3_D08,"ADC1_IN13,ADC2_IN13",ACMP2_IN5,ALT5
+GPIO_AD_B1_09,FLEXSPI_A_DQS,FLEXPWM4_PWM1_A,FLEXCAN1_RX,SAI1_MCLK,CSI_DATA08,GPIO1_IO25,USDHC2_CLK,KPP_COL3,,FLEXIO3_D09,"ADC1_IN14,ADC2_IN14",ACMP3_IN5,ALT5
+GPIO_AD_B1_10,FLEXSPI_A_DATA3,WDOG1_B,LPUART8_TXD,SAI1_RX_SYNC,CSI_DATA07,GPIO1_IO26,USDHC2_WP,KPP_ROW2,ENET2_1588_EVENT1_OUT,FLEXIO3_D10,"ADC1_IN15,ADC2_IN15",ACMP4_IN5,ALT5
+GPIO_AD_B1_11,FLEXSPI_A_DATA2,EWM_OUT_B,LPUART8_RXD,SAI1_RX_BCLK,CSI_DATA06,GPIO1_IO27,USDHC2_RESET_B,KPP_COL2,ENET2_1588_EVENT1_IN,FLEXIO3_D11,ADC2_IN0,ACMP1_IN6,ALT5
+GPIO_AD_B1_12,FLEXSPI_A_DATA1,ACMP_OUT00,LPSPI3_PCS0,SAI1_RX_DATA0,CSI_DATA05,GPIO1_IO28,USDHC2_DATA4,KPP_ROW1,ENET2_1588_EVENT2_OUT,FLEXIO3_D12,ADC2_IN1,"ACMP1_OUT,ACMP2_IN6",ALT5
+GPIO_AD_B1_13,FLEXSPI_A_DATA0,ACMP_OUT01,LPSPI3_SIN,SAI1_TX_DATA0,CSI_DATA04,GPIO1_IO29,USDHC2_DATA5,KPP_COL1,ENET2_1588_EVENT2_IN,FLEXIO3_D13,ADC2_IN2,"ACMP2_OUT,ACMP3_IN6",ALT5
+GPIO_AD_B1_14,FLEXSPI_A_SCLK,ACMP_OUT02,LPSPI3_SOUT,SAI1_TX_BCLK,CSI_DATA03,GPIO1_IO30,USDHC2_DATA6,KPP_ROW0,ENET2_1588_EVENT3_OUT,FLEXIO3_D14,ADC2_IN3,"ACMP3_OUT,ACMP4_IN6",ALT5
+GPIO_AD_B1_15,FLEXSPI_A_SS0_B,ACMP_OUT03,LPSPI3_SCK,SAI1_TX_SYNC,CSI_DATA02,GPIO1_IO31,USDHC2_DATA7,KPP_COL0,ENET2_1588_EVENT3_IN,FLEXIO3_D15,ADC2_IN4,ACMP4_OUT,ALT5
+GPIO_B0_00,LCD_CLK,TMR1_TIMER0,MQS_RIGHT,LPSPI4_PCS0,FLEXIO2_D00,GPIO2_IO00,SEMC_CSX1,,ENET2_MDC,,,,ALT5
+GPIO_B0_01,LCD_ENABLE,TMR1_TIMER1,MQS_LEFT,LPSPI4_SIN,FLEXIO2_D01,GPIO2_IO01,SEMC_CSX2,,ENET2_MDIO,,,,ALT5
+GPIO_B0_02,LCD_HSYNC,TMR1_TIMER2,FLEXCAN1_TX,LPSPI4_SOUT,FLEXIO2_D02,GPIO2_IO02,SEMC_CSX3,,ENET2_1588_EVENT0_OUT,,,,ALT5
+GPIO_B0_03,LCD_VSYNC,TMR2_TIMER0,FLEXCAN1_RX,LPSPI4_SCK,FLEXIO2_D03,GPIO2_IO03,WDOG2_RESET_B_DEB,,ENET2_1588_EVENT0_IN,,,,ALT5
+GPIO_B0_04,LCD_DATA00,TMR2_TIMER1,LPI2C2_SCL,ARM_TRACE0,FLEXIO2_D04,GPIO2_IO04,SRC_BT_CFG00,,ENET2_TDATA3,,,,ALT5
+GPIO_B0_05,LCD_DATA01,TMR2_TIMER2,LPI2C2_SDA,ARM_TRACE1,FLEXIO2_D05,GPIO2_IO05,SRC_BT_CFG01,,ENET2_TDATA2,,,,ALT5
+GPIO_B0_06,LCD_DATA02,TMR3_TIMER0,FLEXPWM2_PWM0_A,ARM_TRACE2,FLEXIO2_D06,GPIO2_IO06,SRC_BT_CFG02,,ENET2_RX_CLK,,,,ALT5
+GPIO_B0_07,LCD_DATA03,TMR3_TIMER1,FLEXPWM2_PWM0_B,ARM_TRACE3,FLEXIO2_D07,GPIO2_IO07,SRC_BT_CFG03,,ENET2_TX_ER,,,,ALT5
+GPIO_B0_08,LCD_DATA04,TMR3_TIMER2,FLEXPWM2_PWM1_A,LPUART3_TXD,FLEXIO2_D08,GPIO2_IO08,SRC_BT_CFG04,,ENET2_RDATA3,,,,ALT5
+GPIO_B0_09,LCD_DATA05,TMR4_TIMER0,FLEXPWM2_PWM1_B,LPUART3_RXD,FLEXIO2_D09,GPIO2_IO09,SRC_BT_CFG05,,ENET2_RDATA2,,,,ALT5
+GPIO_B0_10,LCD_DATA06,TMR4_TIMER1,FLEXPWM2_PWM2_A,"SAI1_TX_DATA3,SAI1_RX_DATA1",FLEXIO2_D10,GPIO2_IO10,SRC_BT_CFG06,,ENET2_CRS,,,,ALT5
+GPIO_B0_11,LCD_DATA07,TMR4_TIMER2,FLEXPWM2_PWM2_B,"SAI1_TX_DATA2,SAI1_RX_DATA2",FLEXIO2_D11,GPIO2_IO11,SRC_BT_CFG07,,ENET2_COL,,,,ALT5
+GPIO_B0_12,LCD_DATA08,XBAR_INOUT10,ARM_TRACE_CLK,"SAI1_TX_DATA1,SAI1_RX_DATA3",FLEXIO2_D12,GPIO2_IO12,SRC_BT_CFG08,,ENET2_TDATA0,,,,ALT5
+GPIO_B0_13,LCD_DATA09,XBAR_INOUT11,ARM_TRACE_SWO,SAI1_MCLK,FLEXIO2_D13,GPIO2_IO13,SRC_BT_CFG09,,ENET2_TDATA1,,,,ALT5
+GPIO_B0_14,LCD_DATA10,XBAR_INOUT12,ARM_TXEV,SAI1_RX_SYNC,FLEXIO2_D14,GPIO2_IO14,SRC_BT_CFG10,,ENET2_TX_EN,,,,ALT5
+GPIO_B0_15,LCD_DATA11,XBAR_INOUT13,ARM_EVENT1,SAI1_RX_DATA0,FLEXIO2_D15,GPIO2_IO15,SRC_BT_CFG11,,ENET2_TX_CLK,ENET2_REF_CLK2,,,ALT5
+GPIO_B1_00,LCD_DATA12,XBAR_INOUT14,LPUART4_TXD,SAI1_RX_DATA0,FLEXIO2_D16,GPIO2_IO16,FLEXPWM1_PWM3_A,,ENET2_RX_ER,FLEXIO3_D16,,,ALT5
+GPIO_B1_01,LCD_DATA13,XBAR_INOUT15,LPUART4_RXD,SAI1_TX_DATA0,FLEXIO2_D17,GPIO2_IO17,FLEXPWM1_PWM3_B,,ENET2_RDATA0,FLEXIO3_D17,,,ALT5
+GPIO_B1_02,LCD_DATA14,XBAR_INOUT16,LPSPI4_PCS2,SAI1_TX_BCLK,FLEXIO2_D18,GPIO2_IO18,FLEXPWM2_PWM3_A,,ENET2_RDATA1,FLEXIO3_D18,,,ALT5
+GPIO_B1_03,LCD_DATA15,XBAR_INOUT17,LPSPI4_PCS1,SAI1_TX_SYNC,FLEXIO2_D19,GPIO2_IO19,FLEXPWM2_PWM3_B,,ENET2_RX_EN,FLEXIO3_D19,,,ALT5
+GPIO_B1_04,LCD_DATA16,LPSPI4_PCS0,CSI_DATA15,ENET_RX_DATA0,FLEXIO2_D20,GPIO2_IO20,,,GPT1_CLK,FLEXIO3_D20,,,ALT5
+GPIO_B1_05,LCD_DATA17,LPSPI4_SIN,CSI_DATA14,ENET_RX_DATA1,FLEXIO2_D21,GPIO2_IO21,,,GPT1_CAPTURE1,FLEXIO3_D21,,,ALT5
+GPIO_B1_06,LCD_DATA18,LPSPI4_SOUT,CSI_DATA13,ENET_RX_EN,FLEXIO2_D22,GPIO2_IO22,,,GPT1_CAPTURE2,FLEXIO3_D22,,,ALT5
+GPIO_B1_07,LCD_DATA19,LPSPI4_SCK,CSI_DATA12,ENET_TX_DATA0,FLEXIO2_D23,GPIO2_IO23,,,GPT1_COMPARE1,FLEXIO3_D23,,,ALT5
+GPIO_B1_08,LCD_DATA20,TMR1_TIMER3,CSI_DATA11,ENET_TX_DATA1,FLEXIO2_D24,GPIO2_IO24,FLEXCAN2_TX,,GPT1_COMPARE2,FLEXIO3_D24,,,ALT5
+GPIO_B1_09,LCD_DATA21,TMR2_TIMER3,CSI_DATA10,ENET_TX_EN,FLEXIO2_D25,GPIO2_IO25,FLEXCAN2_RX,,GPT1_COMPARE3,FLEXIO3_D25,,,ALT5
+GPIO_B1_10,LCD_DATA22,TMR3_TIMER3,CSI_DATA00,ENET_TX_CLK,FLEXIO2_D26,GPIO2_IO26,ENET_REF_CLK,,,FLEXIO3_D26,,,ALT5
+GPIO_B1_11,LCD_DATA23,TMR4_TIMER3,CSI_DATA01,ENET_RX_ER,FLEXIO2_D27,GPIO2_IO27,LPSPI4_PCS3,,,FLEXIO3_D27,,,ALT5
+GPIO_B1_12,,LPUART5_TXD,CSI_PIXCLK,ENET_1588_EVENT0_IN,FLEXIO2_D28,GPIO2_IO28,USDHC1_CD_B,,,FLEXIO3_D28,,,ALT5
+GPIO_B1_13,WDOG1_B,LPUART5_RXD,CSI_VSYNC,ENET_1588_EVENT0_OUT,FLEXIO2_D29,GPIO2_IO29,USDHC1_WP,,SEMC_DQS4,FLEXIO3_D29,,,ALT5
+GPIO_B1_14,ENET_MDC,FLEXPWM4_PWM2_A,CSI_HSYNC,XBAR_INOUT02,FLEXIO2_D30,GPIO2_IO30,USDHC1_VSELECT,,ENET2_TDATA0,FLEXIO3_D30,,,ALT5
+GPIO_B1_15,ENET_MDIO,FLEXPWM4_PWM3_A,CSI_MCLK,XBAR_INOUT03,FLEXIO2_D31,GPIO2_IO31,USDHC1_RESET_B,,ENET2_TDATA1,FLEXIO3_D31,,,ALT5
+GPIO_EMC_00,SEMC_DATA00,FLEXPWM4_PWM0_A,LPSPI2_SCK,XBAR_INOUT02,FLEXIO1_D00,GPIO4_IO0,USB_PHY1_TSTI_TX_LS_MODE,,,,,,ALT5
+GPIO_EMC_01,SEMC_DATA01,FLEXPWM4_PWM0_B,LPSPI2_PCS0,XBAR_INOUT03,FLEXIO1_D01,GPIO4_IO1,USB_PHY1_TSTI_TX_HS_MODE,JTAG_DE_B,,,,,ALT5
+GPIO_EMC_02,SEMC_DATA02,FLEXPWM4_PWM1_A,LPSPI2_SOUT,XBAR_INOUT04,FLEXIO1_D02,GPIO4_IO2,USB_PHY1_TSTI_TX_DN,,,,,,ALT5
+GPIO_EMC_03,SEMC_DATA03,FLEXPWM4_PWM1_B,LPSPI2_SIN,XBAR_INOUT05,FLEXIO1_D03,GPIO4_IO3,USB_PHY1_TSTO_RX_SQUELCH,,,,,,ALT5
+GPIO_EMC_04,SEMC_DATA04,FLEXPWM4_PWM2_A,SAI2_TX_DATA,XBAR_INOUT06,FLEXIO1_D04,GPIO4_IO4,USB_PHY1_TSTO_RX_DISCON_DET,,,,,,ALT5
+GPIO_EMC_05,SEMC_DATA05,FLEXPWM4_PWM2_B,SAI2_TX_SYNC,XBAR_INOUT07,FLEXIO1_D05,GPIO4_IO5,USB_PHY1_TSTO_RX_HS_RXD,,,,,,ALT5
+GPIO_EMC_06,SEMC_DATA06,FLEXPWM2_PWM0_A,SAI2_TX_BCLK,XBAR_INOUT08,FLEXIO1_D06,GPIO4_IO6,USB_PHY2_TSTO_RX_FS_RXD,,,,,,ALT5
+GPIO_EMC_07,SEMC_DATA07,FLEXPWM2_PWM0_B,SAI2_MCLK,XBAR_INOUT09,FLEXIO1_D07,GPIO4_IO7,USB_PHY1_TSTO_RX_HS_RXD,,,,,,ALT5
+GPIO_EMC_08,SEMC_DM0,FLEXPWM2_PWM1_A,SAI2_RX_DATA,XBAR_INOUT17,FLEXIO1_D08,GPIO4_IO8,USB_PHY1_TSTI_TX_DP,,,,,,ALT5
+GPIO_EMC_09,SEMC_ADDR00,FLEXPWM2_PWM1_B,SAI2_RX_SYNC,FLEXCAN2_TX,FLEXIO1_D09,GPIO4_IO9,USB_PHY1_TSTI_TX_EN,,FLEXSPI2_B_SS1_B,,,,ALT5
+GPIO_EMC_10,SEMC_ADDR01,FLEXPWM2_PWM2_A,SAI2_RX_BCLK,FLEXCAN2_RX,FLEXIO1_D10,GPIO4_IO10,USB_PHY1_TSTI_TX_HIZ,,FLEXSPI2_B_SS0_B,,,,ALT5
+GPIO_EMC_11,SEMC_ADDR02,FLEXPWM2_PWM2_B,LPI2C4_SDA,USDHC2_RESET_B,FLEXIO1_D11,GPIO4_IO11,USB_PHY2_TSTO_RX_FS_RXD,,FLEXSPI2_B_DQS,,,,ALT5
+GPIO_EMC_12,SEMC_ADDR03,XBAR_INOUT24,LPI2C4_SCL,USDHC1_WP,FLEXPWM1_PWM3_A,GPIO4_IO12,USB_PHY1_TSTO_PLL_CLK20DIV,,FLEXSPI2_B_SCLK,,,,ALT5
+GPIO_EMC_13,SEMC_ADDR04,XBAR_INOUT25,LPUART3_TXD,MQS_RIGHT,FLEXPWM1_PWM3_B,GPIO4_IO13,USB_PHY2_TSTO_RX_FS_20DIV,,FLEXSPI2_B_DATA0,,,,ALT5
+GPIO_EMC_14,SEMC_ADDR05,XBAR_INOUT19,LPUART3_RXD,MQS_LEFT,LPSPI2_PCS1,GPIO4_IO14,USB_PHY2_TSTO_RX_FS_ELCH,,FLEXSPI2_B_DATA1,,,,ALT5
+GPIO_EMC_15,SEMC_ADDR06,XBAR_INOUT20,LPUART3_CTS_B,SPDIF_OUT,TMR3_TIMER0,GPIO4_IO15,USB_PHY2_TSTO_RX_FS_ON_DET,,FLEXSPI2_B_DATA2,,,,ALT5
+GPIO_EMC_16,SEMC_ADDR07,XBAR_INOUT21,LPUART3_RTS_B,SPDIF_IN,TMR3_TIMER1,GPIO4_IO16,,,FLEXSPI2_B_DATA3,,,,ALT5
+GPIO_EMC_17,SEMC_ADDR08,FLEXPWM4_PWM3_A,LPUART4_CTS_B,FLEXCAN1_TX,TMR3_TIMER2,GPIO4_IO17,,,,,,,ALT5
+GPIO_EMC_18,SEMC_ADDR09,FLEXPWM4_PWM3_B,LPUART4_RTS_B,FLEXCAN1_RX,TMR3_TIMER3,GPIO4_IO18,SNVS_VIO_5_CTL,,,,,,ALT5
+GPIO_EMC_19,SEMC_ADDR11,FLEXPWM2_PWM3_A,LPUART4_TXD,ENET_RX_DATA1,TMR2_TIMER0,GPIO4_IO19,SNVS_VIO_5_B,,,,,,ALT5
+GPIO_EMC_20,SEMC_ADDR12,FLEXPWM2_PWM3_B,LPUART4_RXD,ENET_RX_DATA0,TMR2_TIMER1,GPIO4_IO20,,,,,,,ALT5
+GPIO_EMC_21,SEMC_BA0,FLEXPWM3_PWM3_A,LPI2C3_SDA,ENET_TX_DATA1,TMR2_TIMER2,GPIO4_IO21,,,,,,,ALT5
+GPIO_EMC_22,SEMC_BA1,FLEXPWM3_PWM3_B,LPI2C3_SCL,ENET_TX_DATA0,TMR2_TIMER3,GPIO4_IO22,,,FLEXSPI2_A_SS1_B,,,,ALT5
+GPIO_EMC_23,SEMC_ADDR10,FLEXPWM1_PWM0_A,LPUART5_TXD,ENET_RX_EN,GPT1_CAPTURE2,GPIO4_IO23,,,FLEXSPI2_A_DQS,,,,ALT5
+GPIO_EMC_24,SEMC_CAS,FLEXPWM1_PWM0_B,LPUART5_RXD,ENET_TX_EN,GPT1_CAPTURE1,GPIO4_IO24,,,FLEXSPI2_A_SS0_B,,,,ALT5
+GPIO_EMC_25,SEMC_RAS,FLEXPWM1_PWM1_A,LPUART6_TXD,ENET_TX_CLK,ENET_REF_CLK,GPIO4_IO25,,,FLEXSPI2_A_SCLK,,,,ALT5
+GPIO_EMC_26,SEMC_CLK,FLEXPWM1_PWM1_B,LPUART6_RXD,ENET_RX_ER,FLEXIO1_D12,GPIO4_IO26,,,FLEXSPI2_A_DATA0,,,,ALT5
+GPIO_EMC_27,SEMC_CKE,FLEXPWM1_PWM2_A,LPUART5_RTS_B,LPSPI1_SCK,FLEXIO1_D13,GPIO4_IO27,,,FLEXSPI2_A_DATA1,,,,ALT5
+GPIO_EMC_28,SEMC_WE,FLEXPWM1_PWM2_B,LPUART5_CTS_B,LPSPI1_SOUT,FLEXIO1_D14,GPIO4_IO28,,,FLEXSPI2_A_DATA2,,,,ALT5
+GPIO_EMC_29,SEMC_CS0,FLEXPWM3_PWM0_A,LPUART6_RTS_B,LPSPI1_SIN,FLEXIO1_D15,GPIO4_IO29,,,FLEXSPI2_A_DATA3,,,,ALT5
+GPIO_EMC_30,SEMC_DATA08,FLEXPWM3_PWM0_B,LPUART6_CTS_B,LPSPI1_PCS0,CSI_DATA23,GPIO4_IO30,,,ENET2_TDATA0,,,,ALT5
+GPIO_EMC_31,SEMC_DATA09,FLEXPWM3_PWM1_A,LPUART7_TXD,LPSPI1_PCS1,CSI_DATA22,GPIO4_IO31,,,ENET2_TDATA1,,,,ALT5
+GPIO_EMC_32,SEMC_DATA10,FLEXPWM3_PWM1_B,LPUART7_RXD,CCM_PMIC_READY,CSI_DATA21,GPIO3_IO18,,,ENET2_TX_EN,,,,ALT5
+GPIO_EMC_33,SEMC_DATA11,FLEXPWM3_PWM2_A,USDHC1_RESET_B,SAI3_RX_DATA,CSI_DATA20,GPIO3_IO19,,,ENET2_TX_CLK,ENET2_REF_CLK2,,,ALT5
+GPIO_EMC_34,SEMC_DATA12,FLEXPWM3_PWM2_B,USDHC1_VSELECT,SAI3_RX_SYNC,CSI_DATA19,GPIO3_IO20,,,ENET2_RX_ER,,,,ALT5
+GPIO_EMC_35,SEMC_DATA13,XBAR_INOUT18,GPT1_COMPARE1,SAI3_RX_BCLK,CSI_DATA18,GPIO3_IO21,USDHC1_CD_B,,ENET2_RDATA0,,,,ALT5
+GPIO_EMC_36,SEMC_DATA14,XBAR_INOUT22,GPT1_COMPARE2,SAI3_TX_DATA,CSI_DATA17,GPIO3_IO22,USDHC1_WP,,ENET2_RDATA1,FLEXCAN3_TX,,,ALT5
+GPIO_EMC_37,SEMC_DATA15,XBAR_INOUT23,GPT1_COMPARE3,SAI3_MCLK,CSI_DATA16,GPIO3_IO23,USDHC2_WP,,ENET2_RX_EN,FLEXCAN3_RX,,,ALT5
+GPIO_EMC_38,SEMC_DM1,FLEXPWM1_PWM3_A,LPUART8_TXD,SAI3_TX_BCLK,CSI_FIELD,GPIO3_IO24,USDHC2_VSELECT,,ENET2_MDC,,,,ALT5
+GPIO_EMC_39,SEMC_DQS,FLEXPWM1_PWM3_B,LPUART8_RXD,SAI3_TX_SYNC,WDOG1_B,GPIO3_IO25,USDHC2_CD_B,,ENET2_MDIO,,,,ALT5
+GPIO_EMC_40,SEMC_RDY,GPT2_CAPTURE2,LPSPI1_PCS2,USB_OTG2_OC,ENET_MDC,GPIO3_IO26,USDHC2_RESET_B,,,,,,ALT5
+GPIO_EMC_41,SEMC_CSX0,GPT2_CAPTURE1,LPSPI1_PCS3,USB_OTG2_PWR,ENET_MDIO,GPIO3_IO27,USDHC1_VSELECT,,,,,,ALT5
+GPIO_SD_B0_00,USDHC1_CMD,FLEXPWM1_PWM0_A,LPI2C3_SCL,XBAR_INOUT04,LPSPI1_SCK,GPIO3_IO12,FLEXSPI_A_SS1_B,,ENET2_TX_EN,,,,ALT5
+GPIO_SD_B0_01,USDHC1_CLK,FLEXPWM1_PWM0_B,LPI2C3_SDA,XBAR_INOUT05,LPSPI1_PCS0,GPIO3_IO13,FLEXSPI_B_SS1_B,,ENET2_TX_CLK,ENET2_REF_CLK2,,,ALT5
+GPIO_SD_B0_02,USDHC1_DATA0,FLEXPWM1_PWM1_A,LPUART8_CTS_B,XBAR_INOUT06,LPSPI1_SOUT,GPIO3_IO14,,,ENET2_RX_ER,,,,ALT5
+GPIO_SD_B0_03,USDHC1_DATA1,FLEXPWM1_PWM1_B,LPUART8_RTS_B,XBAR_INOUT07,LPSPI1_SIN,GPIO3_IO15,,,ENET2_RDATA0,,,,ALT5
+GPIO_SD_B0_04,USDHC1_DATA2,FLEXPWM1_PWM2_A,LPUART8_TXD,XBAR_INOUT08,FLEXSPI_B_SS0_B,GPIO3_IO16,CCM_CLKO1,,ENET2_RDATA1,,,,ALT5
+GPIO_SD_B0_05,USDHC1_DATA3,FLEXPWM1_PWM2_B,LPUART8_RXD,XBAR_INOUT09,FLEXSPI_B_DQS,GPIO3_IO17,CCM_CLKO2,,ENET2_RX_EN,,,,ALT5
+GPIO_SD_B1_00,USDHC2_DATA3,FLEXSPI_B_DATA3,FLEXPWM1_PWM3_A,"SAI1_TX_DATA3,SAI1_RX_DATA1",LPUART4_TXD,GPIO3_IO00,,,SAI3_RX_DATA,,,,ALT5
+GPIO_SD_B1_01,USDHC2_DATA2,FLEXSPI_B_DATA2,FLEXPWM1_PWM3_B,"SAI1_TX_DATA2,SAI1_RX_DATA2",LPUART4_RXD,GPIO3_IO01,,,SAI3_TX_DATA,,,,ALT5
+GPIO_SD_B1_02,USDHC2_DATA1,FLEXSPI_B_DATA1,FLEXPWM2_PWM3_A,"SAI1_TX_DATA1,SAI1_RX_DATA3",FLEXCAN1_TX,GPIO3_IO02,CCM_WAIT,,SAI3_TX_SYNC,,,,ALT5
+GPIO_SD_B1_03,USDHC2_DATA0,FLEXSPI_B_DATA0,FLEXPWM2_PWM3_B,SAI1_MCLK,FLEXCAN1_RX,GPIO3_IO03,CCM_PMIC_READY,,SAI3_TX_BCLK,,,,ALT5
+GPIO_SD_B1_04,USDHC2_CLK,FLEXSPI_B_SCLK,LPI2C1_SCL,SAI1_RX_SYNC,FLEXSPI_A_SS1_B,GPIO3_IO04,CCM_STOP,,SAI3_MCLK,,,,ALT5
+GPIO_SD_B1_05,USDHC2_CMD,FLEXSPI_A_DQS,LPI2C1_SDA,SAI1_RX_BCLK,FLEXSPI_B_SS0_B,GPIO3_IO05,,,SAI3_RX_SYNC,,,,ALT5
+GPIO_SD_B1_06,USDHC2_RESET_B,FLEXSPI_A_SS0_B,LPUART7_CTS_B,SAI1_RX_DATA0,LPSPI2_PCS0,GPIO3_IO06,,,SAI3_RX_BCLK,,,,ALT5
+GPIO_SD_B1_07,SEMC_CSX1,FLEXSPI_A_SCLK,LPUART7_RTS_B,SAI1_TX_DATA0,LPSPI2_SCK,GPIO3_IO07,,,,,,,ALT5
+GPIO_SD_B1_08,USDHC2_DATA4,FLEXSPI_A_DATA0,LPUART7_TXD,SAI1_TX_BCLK,LPSPI2_SOUT,GPIO3_IO08,SEMC_CSX2,,,,,,ALT5
+GPIO_SD_B1_09,USDHC2_DATA5,FLEXSPI_A_DATA1,LPUART7_RXD,SAI1_TX_SYNC,LPSPI2_SIN,GPIO3_IO09,,,,,,,ALT5
+GPIO_SD_B1_10,USDHC2_DATA6,FLEXSPI_A_DATA2,LPUART2_RXD,LPI2C2_SDA,LPSPI2_PCS2,GPIO3_IO10,,,,,,,ALT5
+GPIO_SD_B1_11,USDHC2_DATA7,FLEXSPI_A_DATA3,LPUART2_TXD,LPI2C2_SCL,LPSPI2_PCS3,GPIO3_IO11,,,,,,,ALT5
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
index e05c8824d2..3eddb41021 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
@@ -3,6 +3,6 @@
 
 
 // MIMXRT1064_EVK has 1 user LED
-#define MICROPY_HW_LED1_PIN (GPIO_AD_B0_09)
+#define MICROPY_HW_LED1_PIN (pin_GPIO_AD_B0_09)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/pins.c b/ports/mimxrt/boards/MIMXRT1064_EVK/pins.c
deleted file mode 100644
index d5da9c6f99..0000000000
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/pins.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 NXP
- *
- * 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 "pin.h"
-
-static pin_af_obj_t GPIO_AD_B0_09_af[] = {
-    PIN_AF(GPIO1_IO09, PIN_AF_MODE_ALT5, GPIO1, 0x10B0U),
-};
-
-pin_obj_t GPIO_AD_B0_09 = PIN(GPIO_AD_B0_09, GPIO1, 9, GPIO_AD_B0_09_af);
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv
new file mode 100644
index 0000000000..afd63d4f97
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv
@@ -0,0 +1,51 @@
+D0,GPIO_AD_B1_07
+D1,GPIO_AD_B1_06
+D2,GPIO_AD_B0_11
+D3,GPIO_AD_B1_08
+D4,GPIO_AD_B0_09
+D5,GPIO_AD_B0_10
+D6,GPIO_AD_B1_02
+D7,GPIO_AD_B1_03
+D8,GPIO_AD_B0_03
+D9,GPIO_AD_B0_02
+D10,GPIO_SD_B0_01
+D11,GPIO_SD_B0_02
+D12,GPIO_SD_B0_03
+D13,GPIO_SD_B0_00
+D14,GPIO_AD_B1_01
+D15,GPIO_AD_B1_00
+A0,GPIO_AD_B1_10
+A1,GPIO_AD_B1_11
+A2,GPIO_AD_B1_04
+A3,GPIO_AD_B1_05
+A4,GPIO_AD_B1_01
+A5,GPIO_AD_B1_00
+RX,GPIO_AD_B1_07
+TX,GPIO_AD_B1_06
+SCL,GPIO_AD_B1_00
+SDA,GPIO_AD_B1_01
+SCK,GPIO_SD_B0_00
+SDI,GPIO_SD_B0_03
+SDO,GPIO_SD_B0_02
+CS,GPIO_SD_B0_01
+LED_GREEN,GPIO_AD_B0_09
+GPIO_AD_B1_07,GPIO_AD_B1_07
+GPIO_AD_B1_06,GPIO_AD_B1_06
+GPIO_AD_B0_11,GPIO_AD_B0_11
+GPIO_AD_B1_08,GPIO_AD_B1_08
+GPIO_AD_B0_09,GPIO_AD_B0_09
+GPIO_AD_B0_10,GPIO_AD_B0_10
+GPIO_AD_B1_02,GPIO_AD_B1_02
+GPIO_AD_B1_03,GPIO_AD_B1_03
+GPIO_AD_B0_03,GPIO_AD_B0_03
+GPIO_AD_B0_02,GPIO_AD_B0_02
+GPIO_SD_B0_01,GPIO_SD_B0_01
+GPIO_SD_B0_02,GPIO_SD_B0_02
+GPIO_SD_B0_03,GPIO_SD_B0_03
+GPIO_SD_B0_00,GPIO_SD_B0_00
+GPIO_AD_B1_01,GPIO_AD_B1_01
+GPIO_AD_B1_00,GPIO_AD_B1_00
+GPIO_AD_B1_10,GPIO_AD_B1_10
+GPIO_AD_B1_11,GPIO_AD_B1_11
+GPIO_AD_B1_04,GPIO_AD_B1_04
+GPIO_AD_B1_05,GPIO_AD_B1_05
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/pins.h b/ports/mimxrt/boards/MIMXRT1064_EVK/pins.h
deleted file mode 100644
index baef51c6c8..0000000000
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/pins.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 NXP
- *
- * 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.
- */
-
-// NOTE: pins.h shall only be included in in pin.h
-// hence no include guards are needed since they will be provided by pin.h
-
-extern pin_obj_t GPIO_AD_B0_09;
diff --git a/ports/mimxrt/boards/MIMXRT1064_af.csv b/ports/mimxrt/boards/MIMXRT1064_af.csv
new file mode 100644
index 0000000000..074a3f69ab
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1064_af.csv
@@ -0,0 +1,125 @@
+Pad,ALT0, ALT1, ALT2, ALT3, ALT4, ALT5, ALT6, ALT7, ALT8, ALT9,ADC,ACMP,Default
+GPIO_AD_B0_00,FLEXPWM2_PWM3_A,XBAR_INOUT14,REF_CLK_32K,USB_OTG2_ID,LPI2C1_SCLS,GPIO1_IO00,USDHC1_RESET_B,LPSPI3_SCK,,,,ACMP1_IN4,ALT5
+GPIO_AD_B0_01,FLEXPWM2_PWM3_B,XBAR_INOUT15,REF_CLK_24M,USB_OTG1_ID,LPI2C1_SDAS,GPIO1_IO01,EWM_OUT_B,LPSPI3_SOUT,,,,ACMP2_IN4,ALT5
+GPIO_AD_B0_02,FLEXCAN2_TX,XBAR_INOUT16,LPUART6_TXD,USB_OTG1_PWR,FLEXPWM1_PWM0_X,GPIO1_IO02,LPI2C1_HREQ,LPSPI3_SIN,,,,ACMP3_IN4,ALT5
+GPIO_AD_B0_03,FLEXCAN2_RX,XBAR_INOUT17,LPUART6_RXD,USB_OTG1_OC,FLEXPWM1_PWM1_X,GPIO1_IO03,REF_CLK_24M,LPSPI3_PCS0,,,,ACMP4_IN4,ALT5
+GPIO_AD_B0_04,SRC_BOOT_MODE0,MQS_RIGHT,ENET_TX_DATA3,SAI2_TX_SYNC,CSI_DATA09,GPIO1_IO04,PIT_TRIGGER0,LPSPI3_PCS1,,,,,ALT0
+GPIO_AD_B0_05,SRC_BOOT_MODE1,MQS_LEFT,ENET_TX_DATA2,SAI2_TX_BCLK,CSI_DATA08,GPIO1_IO05,XBAR_INOUT17,LPSPI3_PCS2,,,,,ALT0
+GPIO_AD_B0_06,"JTAG_TMS,SWD_DIO",GPT2_COMPARE1,ENET_RX_CLK,SAI2_RX_BCLK,CSI_DATA07,GPIO1_IO06,XBAR_INOUT18,LPSPI3_PCS3,,,,,ALT0
+GPIO_AD_B0_07,"JTAG_TCK,SWD_CLK",GPT2_COMPARE2,ENET_TX_ER,SAI2_RX_SYNC,CSI_DATA06,GPIO1_IO07,XBAR_INOUT19,ENET_1588_EVENT3_OUT,,,,,ALT0
+GPIO_AD_B0_08,JTAG_MOD,GPT2_COMPARE3,ENET_RX_DATA3,SAI2_RX_DATA,CSI_DATA05,GPIO1_IO08,XBAR_INOUT20,ENET_1588_EVENT3_IN,,,,,ALT0
+GPIO_AD_B0_09,JTAG_TDI,FLEXPWM2_PWM3_A,ENET_RX_DATA2,SAI2_TX_DATA,CSI_DATA04,GPIO1_IO09,XBAR_INOUT21,GPT2_CLK,,SEMC_DQS4,,,ALT0
+GPIO_AD_B0_10,JTAG_TDO,FLEXPWM1_PWM3_A,ENET_CRS,SAI2_MCLK,CSI_DATA03,GPIO1_IO10,XBAR_INOUT22,ENET_1588_EVENT0_OUT,FLEXCAN3_TX,ARM_TRACE_SWO,,,ALT0
+GPIO_AD_B0_11,JTAG_TRSTB,FLEXPWM1_PWM3_B,ENET_COL,WDOG1_B,CSI_DATA02,GPIO1_IO11,XBAR_INOUT23,ENET_1588_EVENT0_IN,FLEXCAN3_RX,SEMC_CLK6,,,ALT0
+GPIO_AD_B0_12,LPI2C4_SCL,CCM_PMIC_READY,LPUART1_TXD,WDOG2_B,FLEXPWM1_PWM2_X,GPIO1_IO12,ENET_1588_EVENT1_OUT,NMI_GLUE_NMI,,,ADC1_IN1,,ALT5
+GPIO_AD_B0_13,LPI2C4_SDA,GPT1_CLK,LPUART1_RXD,EWM_OUT_B,FLEXPWM1_PWM3_X,GPIO1_IO13,ENET_1588_EVENT1_IN,REF_CLK_24M,,,ADC1_IN2,ACMP1_IN2,ALT5
+GPIO_AD_B0_14,USB_OTG2_OC,XBAR_INOUT24,LPUART1_CTS_B,ENET_1588_EVENT0_OUT,CSI_VSYNC,GPIO1_IO14,FLEXCAN2_TX,WDOG1_ANY,FLEXCAN3_TX,,ADC1_IN3,ACMP2_IN2,ALT5
+GPIO_AD_B0_15,USB_OTG2_PWR,XBAR_INOUT25,LPUART1_RTS_B,ENET_1588_EVENT0_IN,CSI_HSYNC,GPIO1_IO15,FLEXCAN2_RX,WDOG1_RESET_B_DEB,FLEXCAN3_RX,,ADC1_IN4,ACMP3_IN2,ALT5
+GPIO_AD_B1_00,USB_OTG2_ID,TMR3_TIMER0,LPUART2_CTS_B,LPI2C1_SCL,WDOG1_B,GPIO1_IO16,USDHC1_WP,KPP_ROW7,ENET2_1588_EVENT0_OUT,FLEXIO3_D00,"ADC1_IN5,ADC2_IN5",ACMP4_IN2,ALT5
+GPIO_AD_B1_01,USB_OTG1_PWR,TMR3_TIMER1,LPUART2_RTS_B,LPI2C1_SDA,CCM_PMIC_READY,GPIO1_IO17,USDHC1_VSELECT,KPP_COL7,ENET2_1588_EVENT0_IN,FLEXIO3_D01,"ADC1_IN6,ADC2_IN6","ACMP1_IN0,ACMP2_IN0,ACMP3_IN0,ACMP4_IN0",ALT5
+GPIO_AD_B1_02,USB_OTG1_ID,TMR3_TIMER2,LPUART2_TXD,SPDIF_OUT,ENET_1588_EVENT2_OUT,GPIO1_IO18,USDHC1_CD_B,KPP_ROW6,GPT2_CLK,FLEXIO3_D02,"ADC1_IN7,ADC2_IN7",ACMP1_IN3,ALT5
+GPIO_AD_B1_03,USB_OTG1_OC,TMR3_TIMER3,LPUART2_RXD,SPDIF_IN,ENET_1588_EVENT2_IN,GPIO1_IO19,USDHC2_CD_B,KPP_COL6,GPT2_CAPTURE1,FLEXIO3_D03,"ADC1_IN8,ADC2_IN8",ACMP2_IN3,ALT5
+GPIO_AD_B1_04,FLEXSPI_B_DATA3,ENET_MDC,LPUART3_CTS_B,SPDIF_SR_CLK,CSI_PIXCLK,GPIO1_IO20,USDHC2_DATA0,KPP_ROW5,GPT2_CAPTURE2,FLEXIO3_D04,"ADC1_IN9,ADC2_IN9",ACMP3_IN3,ALT5
+GPIO_AD_B1_05,FLEXSPI_B_DATA2,ENET_MDIO,LPUART3_RTS_B,SPDIF_OUT,CSI_MCLK,GPIO1_IO21,USDHC2_DATA1,KPP_COL5,GPT2_COMPARE1,FLEXIO3_D05,"ADC1_IN10,ADC2_IN10",ACMP4_IN3,ALT5
+GPIO_AD_B1_06,FLEXSPI_B_DATA1,LPI2C3_SDA,LPUART3_TXD,SPDIF_LOCK,CSI_VSYNC,GPIO1_IO22,USDHC2_DATA2,KPP_ROW4,GPT2_COMPARE2,FLEXIO3_D06,"ADC1_IN11,ADC2_IN11","ACMP1_IN1,ACMP2_IN1,ACMP3_IN1,ACMP4_IN1",ALT5
+GPIO_AD_B1_07,FLEXSPI_B_DATA0,LPI2C3_SCL,LPUART3_RXD,SPDIF_EXT_CLK,CSI_HSYNC,GPIO1_IO23,USDHC2_DATA3,KPP_COL4,GPT2_COMPARE3,FLEXIO3_D07,"ADC1_IN12,ADC2_IN12",ACMP1_IN5,ALT5
+GPIO_AD_B1_08,FLEXSPI_A_SS1_B,FLEXPWM4_PWM0_A,FLEXCAN1_TX,CCM_PMIC_READY,CSI_DATA09,GPIO1_IO24,USDHC2_CMD,KPP_ROW3,,FLEXIO3_D08,"ADC1_IN13,ADC2_IN13",ACMP2_IN5,ALT5
+GPIO_AD_B1_09,FLEXSPI_A_DQS,FLEXPWM4_PWM1_A,FLEXCAN1_RX,SAI1_MCLK,CSI_DATA08,GPIO1_IO25,USDHC2_CLK,KPP_COL3,,FLEXIO3_D09,"ADC1_IN14,ADC2_IN14",ACMP3_IN5,ALT5
+GPIO_AD_B1_10,FLEXSPI_A_DATA3,WDOG1_B,LPUART8_TXD,SAI1_RX_SYNC,CSI_DATA07,GPIO1_IO26,USDHC2_WP,KPP_ROW2,ENET2_1588_EVENT1_OUT,FLEXIO3_D10,"ADC1_IN15,ADC2_IN15",ACMP4_IN5,ALT5
+GPIO_AD_B1_11,FLEXSPI_A_DATA2,EWM_OUT_B,LPUART8_RXD,SAI1_RX_BCLK,CSI_DATA06,GPIO1_IO27,USDHC2_RESET_B,KPP_COL2,ENET2_1588_EVENT1_IN,FLEXIO3_D11,"ADC1_IN0,ADC2_IN0",ACMP1_IN6,ALT5
+GPIO_AD_B1_12,FLEXSPI_A_DATA1,ACMP_OUT00,LPSPI3_PCS0,SAI1_RX_DATA0,CSI_DATA05,GPIO1_IO28,USDHC2_DATA4,KPP_ROW1,ENET2_1588_EVENT2_OUT,FLEXIO3_D12,ADC2_IN1,"ACMP1_OUT,ACMP2_IN6",ALT5
+GPIO_AD_B1_13,FLEXSPI_A_DATA0,ACMP_OUT01,LPSPI3_SIN,SAI1_TX_DATA0,CSI_DATA04,GPIO1_IO29,USDHC2_DATA5,KPP_COL1,ENET2_1588_EVENT2_IN,FLEXIO3_D13,ADC2_IN2,"ACMP2_OUT,ACMP3_IN6",ALT5
+GPIO_AD_B1_14,FLEXSPI_A_SCLK,ACMP_OUT02,LPSPI3_SOUT,SAI1_TX_BCLK,CSI_DATA03,GPIO1_IO30,USDHC2_DATA6,KPP_ROW0,ENET2_1588_EVENT3_OUT,FLEXIO3_D14,ADC2_IN3,"ACMP3_OUT,ACMP4_IN6",ALT5
+GPIO_AD_B1_15,FLEXSPI_A_SS0_B,AMCP_OUT03,LPSPI3_SCK,SAI1_TX_SYNC,CSI_DATA02,GPIO1_IO31,USDHC2_DATA7,KPP_COL0,ENET2_1588_EVENT3_IN,FLEXIO3_D15,ADC2_IN4,ACMP4_OUT,ALT5
+GPIO_B0_00,LCD_CLK,TMR1_TIMER0,MQS_RIGHT,LPSPI4_PCS0,FLEXIO2_D00,GPIO2_IO00,SEMC_CSX1,,ENET2_MDC,,,,ALT5
+GPIO_B0_01,LCD_ENABLE,TMR1_TIMER1,MQS_LEFT,LPSPI4_SIN,FLEXIO2_D01,GPIO2_IO01,SEMC_CSX2,,ENET2_MDIO,,,,ALT5
+GPIO_B0_02,LCD_HSYNC,TMR1_TIMER2,FLEXCAN1_TX,LPSPI4_SOUT,FLEXIO2_D02,GPIO2_IO02,SEMC_CSX3,,ENET2_1588_EVENT0_OUT,,,,ALT5
+GPIO_B0_03,LCD_VSYNC,TMR2_TIMER0,FLEXCAN1_RX,LPSPI4_SCK,FLEXIO2_D03,GPIO2_IO03,WDOG2_RESET_B_DEB,,ENET2_1588_EVENT0_IN,,,,ALT5
+GPIO_B0_04,LCD_DATA00,TMR2_TIMER1,LPI2C2_SCL,ARM_TRACE0,FLEXIO2_D04,GPIO2_IO04,SRC_BT_CFG00,,ENET2_TDATA3,,,,ALT5
+GPIO_B0_05,LCD_DATA01,TMR2_TIMER2,LPI2C2_SDA,ARM_TRACE1,FLEXIO2_D05,GPIO2_IO05,SRC_BT_CFG01,,ENET2_TDATA2,,,,ALT5
+GPIO_B0_06,LCD_DATA02,TMR3_TIMER0,FLEXPWM2_PWM0_A,ARM_TRACE2,FLEXIO2_D06,GPIO2_IO06,SRC_BT_CFG02,,ENET2_RX_CLK,,,,ALT5
+GPIO_B0_07,LCD_DATA03,TMR3_TIMER1,FLEXPWM2_PWM0_B,ARM_TRACE3,FLEXIO2_D07,GPIO2_IO07,SRC_BT_CFG03,,ENET2_TX_ER,,,,ALT5
+GPIO_B0_08,LCD_DATA04,TMR3_TIMER2,FLEXPWM2_PWM1_A,LPUART3_TXD,FLEXIO2_D08,GPIO2_IO08,SRC_BT_CFG04,,ENET2_RDATA3,,,,ALT5
+GPIO_B0_09,LCD_DATA05,TMR4_TIMER0,FLEXPWM2_PWM1_B,LPUART3_RXD,FLEXIO2_D09,GPIO2_IO09,SRC_BT_CFG05,,ENET2_RDATA2,,,,ALT5
+GPIO_B0_10,LCD_DATA06,TMR4_TIMER1,FLEXPWM2_PWM2_A,"SAI1_TX_DATA3,SAI1_RX_DATA1",FLEXIO2_D10,GPIO2_IO10,SRC_BT_CFG06,,ENET2_CRS,,,,ALT5
+GPIO_B0_11,LCD_DATA07,TMR4_TIMER2,FLEXPWM2_PWM2_B,"SAI1_TX_DATA2,SAI1_RX_DATA2",FLEXIO2_D11,GPIO2_IO11,SRC_BT_CFG07,,ENET2_COL,,,,ALT5
+GPIO_B0_12,LCD_DATA08,XBAR_INOUT10,ARM_TRACE_CLK,"SAI1_TX_DATA1,SAI1_RX_DATA3",FLEXIO2_D12,GPIO2_IO12,SRC_BT_CFG08,,ENET2_TDATA0,,,,ALT5
+GPIO_B0_13,LCD_DATA09,XBAR_INOUT11,ARM_TRACE_SWO,SAI1_MCLK,FLEXIO2_D13,GPIO2_IO13,SRC_BT_CFG09,,ENET2_TDATA1,,,,ALT5
+GPIO_B0_14,LCD_DATA10,XBAR_INOUT12,ARM_EVENT0,SAI1_RX_SYNC,FLEXIO2_D14,GPIO2_IO14,SRC_BT_CFG10,,ENET2_TX_EN,ENET2_REF_CLK2,,,ALT5
+GPIO_B0_15,LCD_DATA11,XBAR_INOUT13,ARM_EVENT1,SAI1_RX_BCLK,FLEXIO2_D15,GPIO2_IO15,SRC_BT_CFG11,,ENET2_TX_CLK,ENET2_REF_CLK2,,,ALT5
+GPIO_B1_00,LCD_DATA12,XBAR_INOUT14,LPUART4_TXD,SAI1_RX_DATA0,FLEXIO2_D16,GPIO2_IO16,FLEXPWM1_PWM3_A,,ENET2_RX_ER,FLEXIO3_D16,,,ALT5
+GPIO_B1_01,LCD_DATA13,XBAR_INOUT15,LPUART4_RXD,SAI1_TX_DATA0,FLEXIO2_D17,GPIO2_IO17,FLEXPWM1_PWM3_B,,ENET2_RDATA0,FLEXIO3_D17,,,ALT5
+GPIO_B1_02,LCD_DATA14,XBAR_INOUT16,LPSPI4_PCS2,SAI1_TX_BCLK,FLEXIO2_D18,GPIO2_IO18,FLEXPWM2_PWM3_A,,ENET2_RDATA1,FLEXIO3_D18,,,ALT5
+GPIO_B1_03,LCD_DATA15,XBAR_INOUT17,LPSPI4_PCS1,SAI1_TX_SYNC,FLEXIO2_D19,GPIO2_IO19,FLEXPWM2_PWM3_B,,ENET2_RX_EN,FLEXIO3_D19,,,ALT5
+GPIO_B1_04,LCD_DATA16,LPSPI4_PCS0,CSI_DATA15,ENET_RX_DATA0,FLEXIO2_D20,GPIO2_IO20,,,GPT1_CLK,FLEXIO3_D20,,,ALT5
+GPIO_B1_05,LCD_DATA17,LPSPI4_SIN,CSI_DATA14,ENET_RX_DATA1,FLEXIO2_D21,GPIO2_IO21,,,GPT1_CAPTURE1,FLEXIO3_D21,,,ALT5
+GPIO_B1_06,LCD_DATA18,LPSPI4_SOUT,CSI_DATA13,ENET_RX_EN,FLEXIO2_D22,GPIO2_IO22,,,GPT1_CAPTURE2,FLEXIO3_D22,,,ALT5
+GPIO_B1_07,LCD_DATA19,LPSPI4_SCK,CSI_DATA12,ENET_TX_DATA0,FLEXIO2_D23,GPIO2_IO23,,,GPT1_COMPARE1,FLEXIO3_D23,,,ALT5
+GPIO_B1_08,LCD_DATA20,TMR1_TIMER3,CSI_DATA11,ENET_TX_DATA1,FLEXIO2_D24,GPIO2_IO24,FLEXCAN2_TX,,GPT1_COMPARE2,FLEXIO3_D24,,,ALT5
+GPIO_B1_09,LCD_DATA21,TMR2_TIMER3,CSI_DATA10,ENET_TX_EN,FLEXIO2_D25,GPIO2_IO25,FLEXCAN2_RX,,GPT1_COMPARE3,FLEXIO3_D25,,,ALT5
+GPIO_B1_10,LCD_DATA22,TMR3_TIMER3,CSI_DATA00,ENET_TX_CLK,FLEXIO2_D26,GPIO2_IO26,ENET_REF_CLK,,,FLEXIO3_D26,,,ALT5
+GPIO_B1_11,LCD_DATA23,TMR4_TIMER3,CSI_DATA01,ENET_RX_ER,FLEXIO2_D27,GPIO2_IO27,LPSPI4_PCS3,,,FLEXIO3_D27,,,ALT5
+GPIO_B1_12,,LPUART5_TXD,CSI_PIXCLK,ENET_1588_EVENT0_IN,FLEXIO2_D28,GPIO2_IO28,USDHC1_CD_B,,,FLEXIO3_D28,,,ALT5
+GPIO_B1_13,WDOG1_B,LPUART5_RXD,CSI_VSYNC,ENET_1588_EVENT0_OUT,FLEXIO2_D29,GPIO2_IO29,USDHC1_WP,,,FLEXIO3_D29,,,ALT5
+GPIO_B1_14,ENET_MDC,FLEXPWM4_PWM2_A,CSI_HSYNC,XBAR_INOUT02,FLEXIO2_D30,GPIO2_IO30,USDHC1_VSELECT,,ENET2_TDATA0,FLEXIO3_D30,,,ALT5
+GPIO_B1_15,ENET_MDIO,FLEXPWM4_PWM3_A,CSI_MCLK,XBAR_INOUT03,FLEXIO2_D31,GPIO2_IO31,USDHC1_RESET_B,,ENET2_TDATA1,FLEXIO3_D31,,,ALT5
+GPIO_EMC_00,SEMC_DATA00,FLEXPWM4_PWM0_A,LPSPI2_SCK,XBAR_INOUT02,FLEXIO1_D00,GPIO4_IO0,USB_PHY1_TSTI_TX_LS_MODE,,,,,,ALT5
+GPIO_EMC_01,SEMC_DATA01,FLEXPWM4_PWM0_B,LPSPI2_PCS0,XBAR_INOUT03,FLEXIO1_D01,GPIO4_IO1,USB_PHY1_TSTI_TX_HS_MODE,JTAG_DE_B,,,,,ALT5
+GPIO_EMC_02,SEMC_DATA02,FLEXPWM4_PWM1_A,LPSPI2_SOUT,XBAR_INOUT04,FLEXIO1_D02,GPIO4_IO2,USB_PHY1_TSTI_TX_DN,,,,,,ALT5
+GPIO_EMC_03,SEMC_DATA03,FLEXPWM4_PWM1_B,LPSPI2_SIN,XBAR_INOUT05,FLEXIO1_D03,GPIO4_IO3,USB_PHY1_TSTO_RX_SQUELCH,,,,,,ALT5
+GPIO_EMC_04,SEMC_DATA04,FLEXPWM4_PWM2_A,SAI2_TX_DATA,XBAR_INOUT06,FLEXIO1_D04,GPIO4_IO4,USB_PHY1_TSTO_RX_DISCON_DET,,,,,,ALT5
+GPIO_EMC_05,SEMC_DATA05,FLEXPWM4_PWM2_B,SAI2_TX_SYNC,XBAR_INOUT07,FLEXIO1_D05,GPIO4_IO5,USB_PHY1_TSTO_RX_HS_RXD,,,,,,ALT5
+GPIO_EMC_06,SEMC_DATA06,FLEXPWM2_PWM0_A,SAI2_TX_BCLK,XBAR_INOUT08,FLEXIO1_D06,GPIO4_IO6,USB_PHY2_TSTO_RX_FS_RXD,,,,,,ALT5
+GPIO_EMC_07,SEMC_DATA07,FLEXPWM2_PWM0_B,SAI2_MCLK,XBAR_INOUT09,FLEXIO1_D07,GPIO4_IO7,USB_PHY1_TSTO_RX_HS_RXD,,,,,,ALT5
+GPIO_EMC_08,SEMC_DM0,FLEXPWM2_PWM1_A,SAI2_RX_DATA,XBAR_INOUT17,FLEXIO1_D08,GPIO4_IO8,USB_PHY1_TSTO_RX_HS_,,,,,,ALT5
+GPIO_EMC_09,SEMC_ADDR00,FLEXPWM2_PWM1_B,SAI2_RX_SYNC,FLEXCAN2_TX,FLEXIO1_D09,GPIO4_IO9,USB_PHY1_TSTI_TX_EN,,FLEXSPI2_B_SS1_B,,,,ALT5
+GPIO_EMC_10,SEMC_ADDR01,FLEXPWM2_PWM2_A,SAI2_RX_BCLK,FLEXCAN2_RX,FLEXIO1_D10,GPIO4_IO10,USB_PHY1_TSTI_TX_HIZ,,FLEXSPI2_B_SS0_B,,,,ALT5
+GPIO_EMC_11,SEMC_ADDR02,FLEXPWM2_PWM2_B,LPI2C4_SDA,USDHC2_RESET_B,FLEXIO1_D11,GPIO4_IO11,USB_PHY2_TSTO_RX_HS_RXD,,FLEXSPI2_B_DQS,,,,ALT5
+GPIO_EMC_12,SEMC_ADDR03,XBAR_INOUT24,LPI2C4_SCL,USDHC1_WP,FLEXPWM1_PWM3_A,GPIO4_IO12,USB_PHY1_TSTO_PLL_CLK20DIV,,FLEXSPI2_B_SCLK,,,,ALT5
+GPIO_EMC_13,SEMC_ADDR04,XBAR_INOUT25,LPUART3_TXD,MQS_RIGHT,FLEXPWM1_PWM3_B,GPIO4_IO13,USB_PHY2_TSTO_PLL_CLK20DIV,,FLEXSPI2_B_DATA0,,,,ALT5
+GPIO_EMC_14,SEMC_ADDR05,XBAR_INOUT19,LPUART3_RXD,MQS_LEFT,LPSPI2_PCS1,GPIO4_IO14,USB_PHY2_TSTO_RX_SQUELCH,,FLEXSPI2_B_DATA1,,,,ALT5
+GPIO_EMC_15,SEMC_ADDR06,XBAR_INOUT20,LPUART3_CTS_B,SPDIF_OUT,TMR3_TIMER0,GPIO4_IO15,USB_PHY2_TSTO_RX_DISCON_DET,,FLEXSPI2_B_DATA2,,,,ALT5
+GPIO_EMC_16,SEMC_ADDR07,XBAR_INOUT21,LPUART3_RTS_B,SPDIF_IN,TMR3_TIMER1,GPIO4_IO16,,,FLEXSPI2_B_DATA3,,,,ALT5
+GPIO_EMC_17,SEMC_ADDR08,FLEXPWM4_PWM3_A,LPUART4_CTS_B,FLEXCAN1_TX,TMR3_TIMER2,GPIO4_IO17,,,,,,,ALT5
+GPIO_EMC_18,SEMC_ADDR09,FLEXPWM4_PWM3_B,LPUART4_RTS_B,FLEXCAN1_RX,TMR3_TIMER3,GPIO4_IO18,SNVS_VIO_5_CTL,,,,,,ALT5
+GPIO_EMC_19,SEMC_ADDR11,FLEXPWM2_PWM3_A,LPUART4_TXD,ENET_RX_DATA1,TMR2_TIMER0,GPIO4_IO19,SNVS_VIO_5_B,,,,,,ALT5
+GPIO_EMC_20,SEMC_ADDR12,FLEXPWM2_PWM3_B,LPUART4_RXD,ENET_RX_DATA0,TMR2_TIMER1,GPIO4_IO20,,,,,,,ALT5
+GPIO_EMC_21,SEMC_BA0,FLEXPWM3_PWM3_A,LPI2C3_SDA,ENET_TX_DATA1,TMR2_TIMER2,GPIO4_IO21,,,,,,,ALT5
+GPIO_EMC_22,SEMC_BA1,FLEXPWM3_PWM3_B,LPI2C3_SCL,ENET_TX_DATA0,TMR2_TIMER3,GPIO4_IO22,,,FLEXSPI2_A_SS1_B,,,,ALT5
+GPIO_EMC_23,SEMC_ADDR10,FLEXPWM1_PWM0_A,LPUART5_TXD,ENET_RX_EN,GPT1_CAPTURE2,GPIO4_IO23,,,FLEXSPI2_A_DQS,,,,ALT5
+GPIO_EMC_24,SEMC_CAS,FLEXPWM1_PWM0_B,LPUART5_RXD,ENET_TX_EN,GPT1_CAPTURE1,GPIO4_IO24,,,FLEXSPI2_A_SS0_B,,,,ALT5
+GPIO_EMC_25,SEMC_RAS,FLEXPWM1_PWM1_A,LPUART6_TXD,ENET_TX_CLK,ENET_REF_CLK,GPIO4_IO25,,,FLEXSPI2_A_SCLK,,,,ALT5
+GPIO_EMC_26,SEMC_CLK,FLEXPWM1_PWM1_B,LPUART6_RXD,ENET_RX_ER,FLEXIO1_D12,GPIO4_IO26,,,FLEXSPI2_A_DATA0,,,,ALT5
+GPIO_EMC_27,SEMC_CKE,FLEXPWM1_PWM2_A,LPUART5_RTS_B,LPSPI1_SCK,FLEXIO1_D13,GPIO4_IO27,,,FLEXSPI2_A_DATA1,,,,ALT5
+GPIO_EMC_28,SEMC_WE,FLEXPWM1_PWM2_B,LPUART5_CTS_B,LPSPI1_SOUT,FLEXIO1_D14,GPIO4_IO28,,,FLEXSPI2_A_DATA2,,,,ALT5
+GPIO_EMC_29,SEMC_CS0,FLEXPWM3_PWM0_A,LPUART6_RTS_B,LPSPI1_SIN,FLEXIO1_D15,GPIO4_IO29,,,FLEXSPI2_A_DATA3,,,,ALT5
+GPIO_EMC_30,SEMC_DATA08,FLEXPWM3_PWM0_B,LPUART6_CTS_B,LPSPI1_PCS0,CSI_DATA23,GPIO4_IO30,,,ENET2_TDATA0,,,,ALT5
+GPIO_EMC_31,SEMC_DATA09,FLEXPWM3_PWM1_A,LPUART7_TXD,LPSPI1_PCS1,CSI_DATA22,GPIO4_IO31,,,ENET2_TDATA1,,,,ALT5
+GPIO_EMC_32,SEMC_DATA10,FLEXPWM3_PWM1_B,LPUART7_RXD,CCM_PMIC_READY,CSI_DATA21,GPIO3_IO18,,,ENET2_TX_EN,,,,ALT5
+GPIO_EMC_33,SEMC_DATA11,FLEXPWM3_PWM2_A,USDHC1_RESET_B,SAI3_RX_DATA,CSI_DATA20,GPIO3_IO19,,,ENET2_TX_CLK,ENET2_REF_CLK2,,,ALT5
+GPIO_EMC_34,SEMC_DATA12,FLEXPWM3_PWM2_B,USDHC1_VSELECT,SAI3_RX_SYNC,CSI_DATA19,GPIO3_IO20,,,ENET2_RX_ER,,,,ALT5
+GPIO_EMC_35,SEMC_DATA13,XBAR_INOUT18,GPT1_COMPARE1,SAI3_RX_BCLK,CSI_DATA18,GPIO3_IO21,USDHC1_CD_B,,ENET2_RDATA0,,,,ALT5
+GPIO_EMC_36,SEMC_DATA14,XBAR_INOUT22,GPT1_COMPARE2,SAI3_TX_DATA,CSI_DATA17,GPIO3_IO22,USDHC1_WP,,ENET2_RDATA1,FLEXCAN3_TX,,,ALT5
+GPIO_EMC_37,SEMC_DATA15,XBAR_INOUT23,GPT1_COMPARE3,SAI3_MCLK,CSI_DATA16,GPIO3_IO23,USDHC2_WP,,ENET2_RX_EN,FLEXCAN3_RX,,,ALT5
+GPIO_EMC_38,SEMC_DM1,FLEXPWM1_PWM3_A,LPUART8_TXD,SAI3_TX_BCLK,CSI_FIELD,GPIO3_IO24,USDHC2_VSELECT,,ENET2_MDC,,,,ALT5
+GPIO_EMC_39,SEMC_DQS,FLEXPWM1_PWM3_B,LPUART8_RXD,SAI3_TX_SYNC,WDOG1_B,GPIO3_IO25,USDHC2_CD_B,,ENET2_MDIO,,,,ALT5
+GPIO_EMC_40,SEMC_RDY,GPT2_CAPTURE2,LPSPI1_PCS2,USB_OTG2_OC,ENET_MDC,GPIO3_IO26,USDHC2_RESET_B,,,SEMC_CLK5,,,ALT5
+GPIO_EMC_41,SEMC_CSX0,GPT2_CAPTURE1,LPSPI1_PCS3,USB_OTG2_PWR,ENET_MDIO,GPIO3_IO27,USDHC1_VSELECT,,,,,,ALT5
+GPIO_SD_B0_00,USDHC1_CMD,FLEXPWM1_PWM0_A,LPI2C3_SCL,XBAR_INOUT04,LPSPI1_SCK,GPIO3_IO12,FLEXSPI_A_SS1_B,,ENET2_TX_EN,SEMC_DQS4,,,ALT5
+GPIO_SD_B0_01,USDHC1_CLK,FLEXPWM1_PWM0_B,LPI2C3_SDA,XBAR_INOUT05,LPSPI1_PCS0,GPIO3_IO13,FLEXSPI_B_SS1_B,,ENET2_TX_CLK,ENET2_REF_CLK2,,,ALT5
+GPIO_SD_B0_02,USDHC1_DATA0,FLEXPWM1_PWM1_A,LPUART8_CTS_B,XBAR_INOUT06,LPSPI1_SOUT,GPIO3_IO14,,,ENET2_RX_ER,SEMC_CLK5,,,ALT5
+GPIO_SD_B0_03,USDHC1_DATA1,FLEXPWM1_PWM1_B,LPUART8_RTS_B,XBAR_INOUT07,LPSPI1_SIN,GPIO3_IO15,,,ENET2_RDATA0,SEMC_CLK6,,,ALT5
+GPIO_SD_B0_04,USDHC1_DATA2,FLEXPWM1_PWM2_A,LPUART8_TXD,XBAR_INOUT08,FLEXSPI_B_SS0_B,GPIO3_IO16,CCM_CLKO1,,ENET2_RDATA1,,,,ALT5
+GPIO_SD_B0_05,USDHC1_DATA3,FLEXPWM1_PWM2_B,LPUART8_RXD,XBAR_INOUT09,FLEXSPI_B_DQS,GPIO3_IO17,CCM_CLKO2,,ENET2_RX_EN,,,,ALT5
+GPIO_SD_B1_00,USDHC2_DATA3,FLEXSPI_B_DATA3,FLEXPWM1_PWM3_A,"SAI1_TX_DATA3,SAI1_RX_DATA1",LPUART4_TXD,GPIO3_IO00,,,SAI3_RX_DATA,,,,ALT5
+GPIO_SD_B1_01,USDHC2_DATA2,FLEXSPI_B_DATA2,FLEXPWM1_PWM3_B,"SAI1_TX_DATA2,SAI1_RX_DATA2",LPUART4_RXD,GPIO3_IO01,,,SAI3_TX_DATA,,,,ALT5
+GPIO_SD_B1_02,USDHC2_DATA1,FLEXSPI_B_DATA1,FLEXPWM2_PWM3_A,"SAI1_TX_DATA1,SAI1_RX_DATA3",FLEXCAN1_TX,GPIO3_IO02,CCM_WAIT,,SAI3_TX_SYNC,,,,ALT5
+GPIO_SD_B1_03,USDHC2_DATA0,FLEXSPI_B_DATA0,FLEXPWM2_PWM3_B,SAI1_MCLK,FLEXCAN1_RX,GPIO3_IO03,CCM_PMIC_READY,,SAI3_TX_BCLK,,,,ALT5
+GPIO_SD_B1_04,USDHC2_CLK,FLEXSPI_B_SCLK,LPI2C1_SCL,SAI1_RX_SYNC,FLEXSPI_A_SS1_B,GPIO3_IO04,CCM_STOP,,SAI3_MCLK,,,,ALT5
+GPIO_SD_B1_05,USDHC2_CMD,FLEXSPI_A_DQS,LPI2C1_SDA,SAI1_RX_BCLK,FLEXSPI_B_SS0_B,GPIO3_IO05,,,SAI3_RX_SYNC,,,,ALT5
+GPIO_SD_B1_06,USDHC2_RESET_B,FLEXSPI_A_SS0_B,LPUART7_CTS_B,SAI1_RX_DATA0,LPSPI2_PCS0,GPIO3_IO06,,,SAI3_RX_BCLK,,,,ALT5
+GPIO_SD_B1_07,SEMC_CSX1,FLEXSPI_A_SCLK,LPUART7_RTS_B,SAI1_TX_DATA0,LPSPI2_SCK,GPIO3_IO07,,,,,,,ALT5
+GPIO_SD_B1_08,USDHC2_DATA4,FLEXSPI_A_DATA0,LPUART7_TXD,SAI1_TX_BCLK,LPSPI2_SOUT,GPIO3_IO08,SEMC_CSX2,,,,,,ALT5
+GPIO_SD_B1_09,USDHC2_DATA5,FLEXSPI_A_DATA1,LPUART7_RXD,SAI1_TX_SYNC,LPSPI2_SIN,GPIO3_IO09,,,,,,,ALT5
+GPIO_SD_B1_10,USDHC2_DATA6,FLEXSPI_A_DATA2,LPUART2_RXD,LPI2C2_SDA,LPSPI2_PCS2,GPIO3_IO10,,,,,,,ALT5
+GPIO_SD_B1_11,USDHC2_DATA7,FLEXSPI_A_DATA3,LPUART2_TXD,LPI2C2_SCL,LPSPI2_PCS3,GPIO3_IO11,,,,,,,ALT5
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
index 7d56478579..e3d7c6a129 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
@@ -4,6 +4,6 @@
 #define BOARD_FLASH_SIZE (2 * 1024 * 1024)
 
 // Teensy 4.0 has 1 board LED
-#define MICROPY_HW_LED1_PIN (GPIO_B0_03)
+#define MICROPY_HW_LED1_PIN (pin_GPIO_B0_03)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
diff --git a/ports/mimxrt/boards/TEENSY40/pins.c b/ports/mimxrt/boards/TEENSY40/pins.c
deleted file mode 100644
index c7bfc102d4..0000000000
--- a/ports/mimxrt/boards/TEENSY40/pins.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 Philipp Ebensberger
- *
- * 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 "pin.h"
-
-static pin_af_obj_t GPIO_B0_03_af[] = {
-    PIN_AF(GPIO2_IO03, PIN_AF_MODE_ALT5, GPIO2, 0x10B0U),
-};
-
-pin_obj_t GPIO_B0_03 = PIN(GPIO_B0_03, GPIO2, 3, GPIO_B0_03_af);
diff --git a/ports/mimxrt/boards/TEENSY40/pins.csv b/ports/mimxrt/boards/TEENSY40/pins.csv
new file mode 100644
index 0000000000..c9d7c9856d
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY40/pins.csv
@@ -0,0 +1,55 @@
+D0,GPIO_AD_B0_03
+D1,GPIO_AD_B0_02
+D2,GPIO_EMC_04
+D3,GPIO_EMC_05
+D4,GPIO_EMC_06
+D5,GPIO_EMC_08
+D6,GPIO_B0_10
+D7,GPIO_B1_01
+D8,GPIO_B1_00
+D9,GPIO_B0_11
+D10,GPIO_B0_00
+D11,GPIO_B0_02
+D12,GPIO_B0_01
+D13,GPIO_B0_03
+D14,GPIO_AD_B1_02
+D15,GPIO_AD_B1_03
+D16,GPIO_AD_B1_07
+D17,GPIO_AD_B1_06
+D18,GPIO_AD_B1_01
+D19,GPIO_AD_B1_00
+D20,GPIO_AD_B1_10
+D21,GPIO_AD_B1_11
+D22,GPIO_AD_B1_08
+D23,GPIO_AD_B1_09
+D24,GPIO_AD_B0_12
+D25,GPIO_AD_B0_13
+D26,GPIO_AD_B1_14
+D27,GPIO_AD_B1_15
+D28,GPIO_EMC_32
+D29,GPIO_EMC_31
+D30,GPIO_EMC_37
+D31,GPIO_EMC_36
+D32,GPIO_B0_12
+D33,GPIO_EMC_07
+DAT1,GPIO_AD_B0_03
+DAT0,GPIO_AD_B0_02
+CLK,GPIO_AD_B0_01
+CMD,GPIO_ASD_B0_00
+DAT3,GPIO_SD_B0_05
+DAT2,GPIO_SD_B0_04
+A0,GPIO_AD_B1_02
+A1,GPIO_AD_B1_03
+A2,GPIO_AD_B1_07
+A3,GPIO_AD_B1_06
+A4,GPIO_AD_B1_01
+A5,GPIO_AD_B1_00
+A6,GPIO_AD_B1_10
+A7,GPIO_AD_B1_11
+A8,GPIO_AD_B1_08
+A9,GPIO_AD_B1_09
+A10,GPIO_AD_B0_12
+A11,GPIO_AD_B0_13
+A12,GPIO_AD_B1_14
+A13,GPIO_AD_B1_15
+LED,GPIO_B0_03
\ No newline at end of file
diff --git a/ports/mimxrt/boards/TEENSY40/pins.h b/ports/mimxrt/boards/TEENSY40/pins.h
deleted file mode 100644
index c0b6dcdfa9..0000000000
--- a/ports/mimxrt/boards/TEENSY40/pins.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 Philipp Ebensberger
- *
- * 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.
- */
-
-// NOTE: pins.h shall only be included in in pin.h
-// hence no include guards are needed since they will be provided by pin.h
-
-extern pin_obj_t GPIO_B0_03;
diff --git a/ports/mimxrt/boards/make-pins.py b/ports/mimxrt/boards/make-pins.py
new file mode 100644
index 0000000000..5e5b81e31e
--- /dev/null
+++ b/ports/mimxrt/boards/make-pins.py
@@ -0,0 +1,259 @@
+#!/usr/bin/env python
+"""Creates the pin file for the MIMXRT10xx."""
+
+from __future__ import print_function
+
+import argparse
+import sys
+import csv
+
+SUPPORTED_AFS = {"GPIO"}
+MAX_AF = 10  # AF0 .. AF9
+
+
+def parse_pad(pad_str):
+    """Parses a string and returns a (port, gpio_bit) tuple."""
+    if len(pad_str) < 4:
+        raise ValueError("Expecting pad name to be at least 4 characters")
+    if pad_str[:4] != "GPIO":
+        raise ValueError("Expecting pad name to start with GPIO")
+    return pad_str
+
+
+def af_supported(af_str):
+    for supported_af in SUPPORTED_AFS:
+        if af_str.startswith(supported_af):
+            return True
+    else:
+        return False
+
+
+class Pin(object):
+    """Holds the information associated with a pin."""
+
+    def __init__(self, pad, gpio, pin, idx=0):
+        self.idx = idx
+        self.name = pad
+        self.pad = pad
+        self.gpio = gpio
+        self.pin = pin
+        self.alt_fn = []
+        self.adc_channel = 0
+        self.board_pin = False
+
+    def set_is_board_pin(self):
+        self.board_pin = True
+
+    def is_board_pin(self):
+        return self.board_pin
+
+    def parse_adc(self, adc_str):
+        pass
+
+    def parse_af(self, af_idx, af_strs_in):
+        pass
+
+    def add_af(self, af):
+        self.alt_fn.append(af)
+
+    def print_pin_af(self):
+        if self.alt_fn:
+            print(
+                "static const machine_pin_af_obj_t pin_{0}_af[{1}] = {{".format(
+                    self.name, len(self.alt_fn)
+                )
+            )
+            for af in self.alt_fn:
+                af.print()
+            print("};")
+        else:
+            raise ValueError("Pin '{}' has no alternative functions".format(self.name))
+
+    def print(self):
+        if self.alt_fn:
+            self.print_pin_af()
+            print(
+                "const machine_pin_obj_t pin_{0} = PIN({0}, {1}, {2}, pin_{3});\n".format(
+                    self.name, self.gpio, int(self.pin), self.name + "_af"
+                )
+            )
+        else:
+            raise ValueError("Pin '{}' has no alternative functions".format(self.name))
+
+    def print_header(self, hdr_file):
+        pass
+
+
+class AlternateFunction(object):
+    """Holds the information associated with a pins alternate function."""
+
+    def __init__(self, idx, af_str):
+        self.idx = idx
+        self.af_str = af_str
+        self.instance = self.af_str.split("_")[0]
+
+    def print(self):
+        """Prints the C representation of this AF."""
+        print(
+            "    PIN_AF({0}, PIN_AF_MODE_ALT{1}, {2}, {3}),".format(
+                self.af_str, self.idx, self.instance, "0x10B0U"
+            )
+        )
+
+
+class NamedPin(object):
+    def __init__(self, name, pad, idx):
+        self.name = name
+        self.pad = pad
+        self.idx = idx
+
+
+class Pins(object):
+    def __init__(self):
+        self.cpu_pins = []
+        self.board_pins = []
+
+    def find_pin_by_num(self, pin_num):
+        for pin in self.cpu_pins:
+            if pin.pin_num == pin_num:
+                return pin
+
+    def find_pin_by_name(self, pad):
+        for pin in self.cpu_pins:
+            if pin.pad == pad:
+                return pin
+
+    def parse_board_file(self, filename):
+        with open(filename, "r") as csvfile:
+            rows = csv.reader(csvfile)
+            for row in rows:
+                pin = self.find_pin_by_name(row[1])
+                if pin and row[0]:  # Only add board pins that have a name
+                    self.board_pins.append(NamedPin(row[0], pin.pad, pin.idx))
+
+    def parse_af_file(self, filename, pad_col, af_start_col):
+        af_end_col = af_start_col + MAX_AF
+        with open(filename, "r") as csvfile:
+            rows = csv.reader(csvfile)
+            header = next(rows)
+            for idx, row in enumerate(rows):
+                pad = row[pad_col]
+                gpio, pin = row[6].split("_")
+                pin_number = pin.lstrip("IO")
+
+                pin = Pin(pad, gpio, pin_number, idx=idx)
+
+                # Parse alternate functions
+                af_idx = 0
+                for af_idx, af in enumerate(row[af_start_col:af_end_col]):
+                    if af and af_supported(af):
+                        pin.add_af(AlternateFunction(af_idx, af))
+
+                self.cpu_pins.append(pin)
+
+    @staticmethod
+    def print_named(label, pins):
+        print("")
+        print(
+            "STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label)
+        )
+        for pin in pins:
+            print(
+                "    {{ MP_ROM_QSTR(MP_QSTR_{}), MP_ROM_PTR(&pin_{}) }},".format(pin.name, pin.pad)
+            )
+        print("};")
+        print(
+            "MP_DEFINE_CONST_DICT(machine_pin_{:s}_pins_locals_dict, pin_{:s}_pins_locals_dict_table);".format(
+                label, label
+            )
+        )
+
+    def print(self):
+        # Print Pin Object declarations
+        for pin in self.cpu_pins:
+            pin.print()
+
+        print("")
+        print("const machine_pin_obj_t* machine_pin_board_pins [] = {")
+        for pin in self.board_pins:
+            print("    &pin_{},".format(pin.pad))
+        print("};")
+        print("const uint32_t num_board_pins = {:d};".format(len(self.board_pins)))
+        # Print Pin mapping dictionaries
+        self.print_named("cpu", self.cpu_pins)
+        self.print_named("board", self.board_pins)
+        print("")
+
+    def print_header(self, hdr_filename):
+        with open(hdr_filename, "w") as hdr_file:
+            for pin in self.cpu_pins:
+                hdr_file.write("extern const machine_pin_obj_t pin_{};\n".format(pin.name))
+            hdr_file.write("extern const machine_pin_obj_t* machine_pin_board_pins[];\n")
+            hdr_file.write("extern const uint32_t num_board_pins;\n")
+            hdr_file.write("extern const mp_obj_dict_t machine_pin_cpu_pins_locals_dict;\n")
+            hdr_file.write("extern const mp_obj_dict_t machine_pin_board_pins_locals_dict;\n")
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        prog="make-pins.py",
+        usage="%(prog)s [options] [command]",
+        description="Generate board specific pin file",
+    )
+    parser.add_argument(
+        "-a",
+        "--af",
+        dest="af_filename",
+        help="Specifies the alternate function file for the chip",
+        default="mimxrt1021_af.csv",
+    )
+    parser.add_argument(
+        "-b",
+        "--board",
+        dest="board_filename",
+        help="Specifies the board file",
+        default="MIMXRT1020_EVK/pins.csv",
+    )
+    parser.add_argument(
+        "-p",
+        "--prefix",
+        dest="prefix_filename",
+        help="Specifies beginning portion of generated pins file",
+        default="mimxrt_prefix.c",
+    )
+    parser.add_argument(
+        "-r",
+        "--hdr",
+        dest="hdr_filename",
+        help="Specifies name of generated pin header file",
+        default="build/pins.h",
+    )
+
+    pins = Pins()
+
+    # test code
+    args = parser.parse_args()
+    #
+
+    if args.af_filename:
+        print("// --af {:s}".format(args.af_filename))
+        pins.parse_af_file(args.af_filename, 0, 1)
+
+    if args.board_filename:
+        print("// --board {:s}".format(args.board_filename))
+        pins.parse_board_file(args.board_filename)
+
+    if args.hdr_filename:
+        print("// --hdr {:s}".format(args.hdr_filename))
+
+    if args.prefix_filename:
+        print("// --prefix {:s}".format(args.prefix_filename))
+        with open(args.prefix_filename, "r") as prefix_file:
+            print(prefix_file.read())
+
+    pins.print()
+    pins.print_header(args.hdr_filename)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/ports/mimxrt/boards/mimxrt_prefix.c b/ports/mimxrt/boards/mimxrt_prefix.c
new file mode 100644
index 0000000000..59e338976e
--- /dev/null
+++ b/ports/mimxrt/boards/mimxrt_prefix.c
@@ -0,0 +1,26 @@
+#include <stdio.h>
+
+#include "py/obj.h"
+#include "py/mphal.h"
+#include "pin.h"
+
+#define PIN_AF(_name, _af_mode, _instance, _pad_config) \
+    { \
+        .base = { &machine_pin_af_type }, \
+        .name = MP_QSTR_##_name, \
+        .af_mode = (uint32_t)(_af_mode), \
+        .instance = (void *)(_instance), \
+        .pad_config = (uint32_t)(_pad_config), \
+    } \
+
+#define PIN(_name, _gpio, _pin, _af_list) \
+    { \
+        .base = { &machine_pin_type }, \
+        .name = MP_QSTR_##_name, \
+        .gpio = (_gpio), \
+        .pin = (uint32_t)(_pin), \
+        .muxRegister = (uint32_t)&(IOMUXC->SW_MUX_CTL_PAD[kIOMUXC_SW_MUX_CTL_PAD_##_name]), \
+        .configRegister = (uint32_t)&(IOMUXC->SW_PAD_CTL_PAD[kIOMUXC_SW_PAD_CTL_PAD_##_name]), \
+        .af_list_len = (size_t)(sizeof((_af_list)) / sizeof(machine_pin_af_obj_t)), \
+        .af_list = (_af_list), \
+    } \
diff --git a/ports/mimxrt/led.c b/ports/mimxrt/led.c
index bec97dd8f7..cb9f985464 100644
--- a/ports/mimxrt/led.c
+++ b/ports/mimxrt/led.c
@@ -44,7 +44,7 @@ const machine_led_obj_t machine_led_obj[NUM_LEDS] = {
 void led_init(void) {
     // Turn off LEDs and initialize
     for (mp_int_t led = 0; led < NUM_LEDS; led++) {
-        const pin_obj_t *led_pin = machine_led_obj[led].led_pin;
+        const machine_pin_obj_t *led_pin = machine_led_obj[led].led_pin;
 
         gpio_pin_config_t pin_config = {
             .outputLogic = 1U,
@@ -67,7 +67,7 @@ void led_state(machine_led_t led, int state) {
         return;
     }
 
-    const pin_obj_t *led_pin = machine_led_obj[led - 1].led_pin;
+    const machine_pin_obj_t *led_pin = machine_led_obj[led - 1].led_pin;
 
     if (state == 0) {
         // turn LED off
@@ -83,7 +83,7 @@ void led_toggle(machine_led_t led) {
         return;
     }
 
-    const pin_obj_t *led_pin = machine_led_obj[led - 1].led_pin;
+    const machine_pin_obj_t *led_pin = machine_led_obj[led - 1].led_pin;
     mp_hal_pin_toggle(led_pin);
 }
 
diff --git a/ports/mimxrt/led.h b/ports/mimxrt/led.h
index 35418321d1..a0628e90ed 100644
--- a/ports/mimxrt/led.h
+++ b/ports/mimxrt/led.h
@@ -42,7 +42,7 @@ typedef enum {
 typedef struct _machine_led_obj_t {
     mp_obj_base_t base;
     mp_uint_t led_id;
-    const pin_obj_t *led_pin;
+    const machine_pin_obj_t *led_pin;
 } machine_led_obj_t;
 
 void led_init(void);
diff --git a/ports/mimxrt/machine_pin.c b/ports/mimxrt/machine_pin.c
new file mode 100644
index 0000000000..583ee4a265
--- /dev/null
+++ b/ports/mimxrt/machine_pin.c
@@ -0,0 +1,273 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Philipp Ebensberger
+ *
+ * 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 <stdint.h>
+
+#include "fsl_gpio.h"
+#include "fsl_iomuxc.h"
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "pin.h"
+#include "mphalport.h"
+
+// Local functions
+STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
+
+// Class Methods
+STATIC void machine_pin_obj_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind);
+STATIC mp_obj_t machine_pin_obj_call(mp_obj_t self_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args);
+STATIC mp_obj_t machine_pin_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args);
+
+// Instance Methods
+STATIC mp_obj_t machine_pin_off(mp_obj_t self_in);
+STATIC mp_obj_t machine_pin_on(mp_obj_t self_in);
+STATIC mp_obj_t machine_pin_value(size_t n_args, const mp_obj_t *args);
+STATIC mp_obj_t machine_pin_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args);
+
+// Local data
+enum {
+    PIN_INIT_ARG_MODE = 0,
+    PIN_INIT_ARG_PULL,
+    PIN_INIT_ARG_VALUE,
+    PIN_INIT_ARG_DRIVE,
+};
+
+// Pin mapping dictionaries
+const mp_obj_type_t machine_pin_cpu_pins_obj_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_cpu,
+    .locals_dict = (mp_obj_t)&machine_pin_cpu_pins_locals_dict,
+};
+
+const mp_obj_type_t machine_pin_board_pins_obj_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_board,
+    .locals_dict = (mp_obj_t)&machine_pin_board_pins_locals_dict,
+};
+
+STATIC mp_obj_t machine_pin_obj_call(mp_obj_t self_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 0, 1, false);
+    machine_pin_obj_t *self = self_in;
+
+    if (n_args == 0) {
+        return MP_OBJ_NEW_SMALL_INT(mp_hal_pin_read(self));
+    } else {
+        mp_hal_pin_write(self, mp_obj_is_true(args[0]));
+        return mp_const_none;
+    }
+}
+
+STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    static const mp_arg_t allowed_args[] = {
+        [PIN_INIT_ARG_MODE] { MP_QSTR_mode, MP_ARG_REQUIRED | MP_ARG_INT },
+        [PIN_INIT_ARG_PULL] { MP_QSTR_pull, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE}},
+        [PIN_INIT_ARG_VALUE] { MP_QSTR_value, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
+        [PIN_INIT_ARG_DRIVE] { MP_QSTR_drive, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = PIN_DRIVE_POWER_3}},
+        // TODO: Implement additional arguments
+        /*
+        { MP_QSTR_af, MP_ARG_INT, {.u_int = -1}}, // legacy
+        { MP_QSTR_alt, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1}},*/
+    };
+
+    // Parse args
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // Get io mode
+    uint mode = args[PIN_INIT_ARG_MODE].u_int;
+    if (!IS_GPIO_MODE(mode)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("invalid pin mode: %d"), mode);
+    }
+
+    // Handle configuration for GPIO
+    if ((mode == PIN_MODE_IN) || (mode == PIN_MODE_OUT) || (mode == PIN_MODE_OPEN_DRAIN)) {
+        gpio_pin_config_t pin_config;
+        const machine_pin_af_obj_t *af_obj;
+        uint32_t pad_config = 0UL;
+        uint8_t pull = PIN_PULL_DISABLED;
+
+        // Generate pin configuration
+        if ((args[PIN_INIT_ARG_VALUE].u_obj != MP_OBJ_NULL) && (mp_obj_is_true(args[PIN_INIT_ARG_VALUE].u_obj))) {
+            pin_config.outputLogic = 1U;
+        } else {
+            pin_config.outputLogic = 0U;
+        }
+        pin_config.direction = mode == PIN_MODE_IN ? kGPIO_DigitalInput : kGPIO_DigitalOutput;
+        pin_config.interruptMode = kGPIO_NoIntmode;
+
+        af_obj = pin_find_af(self, PIN_AF_MODE_ALT5);  // GPIO is always ALT5
+        if (af_obj == NULL) {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("requested AF %d not available for pin %d"), PIN_AF_MODE_ALT5, mode);
+        }
+
+        // Generate pad configuration
+        if (args[PIN_INIT_ARG_PULL].u_obj != mp_const_none) {
+            pull = (uint8_t)mp_obj_get_int(args[PIN_INIT_ARG_PULL].u_obj);
+        }
+
+        pad_config |= IOMUXC_SW_PAD_CTL_PAD_SRE(0U);  // Slow Slew Rate
+        pad_config |= IOMUXC_SW_PAD_CTL_PAD_SPEED(0b01);  // medium(100MHz)
+
+        if (mode == PIN_MODE_OPEN_DRAIN) {
+            pad_config |= IOMUXC_SW_PAD_CTL_PAD_ODE(0b1);  // Open Drain Enabled
+        } else {
+            pad_config |= IOMUXC_SW_PAD_CTL_PAD_ODE(0b0);  // Open Drain Disabled
+        }
+
+        if (pull == PIN_PULL_DISABLED) {
+            pad_config |= IOMUXC_SW_PAD_CTL_PAD_PKE(0); // Pull/Keeper Disabled
+        } else if (pull == PIN_PULL_HOLD) {
+            pad_config |= IOMUXC_SW_PAD_CTL_PAD_PKE(1) | // Pull/Keeper Enabled
+                IOMUXC_SW_PAD_CTL_PAD_PUE(0);            // Keeper selected
+        } else {
+            pad_config |= IOMUXC_SW_PAD_CTL_PAD_PKE(1) |  // Pull/Keeper Enabled
+                IOMUXC_SW_PAD_CTL_PAD_PUE(1) |            // Pull selected
+                IOMUXC_SW_PAD_CTL_PAD_PUS(pull);
+        }
+
+        if (mode == PIN_MODE_IN) {
+            pad_config |= IOMUXC_SW_PAD_CTL_PAD_DSE(0b000) |  // output driver disabled
+                IOMUXC_SW_PAD_CTL_PAD_HYS(1U);  // Hysteresis enabled
+        } else {
+            uint drive = args[PIN_INIT_ARG_DRIVE].u_int;
+            if (!IS_GPIO_DRIVE(drive)) {
+                mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("invalid drive strength: %d"), drive);
+            }
+
+            pad_config |= IOMUXC_SW_PAD_CTL_PAD_DSE(drive) |
+                IOMUXC_SW_PAD_CTL_PAD_HYS(0U);  // Hysteresis disabled
+        }
+
+        // Configure PAD as GPIO
+        IOMUXC_SetPinMux(self->muxRegister, af_obj->af_mode, 0, 0, self->configRegister, 1U);  // Software Input On Field: Input Path is determined by functionality
+        IOMUXC_SetPinConfig(self->muxRegister, af_obj->af_mode, 0, 0, self->configRegister, pad_config);
+        GPIO_PinInit(self->gpio, self->pin, &pin_config);
+    }
+
+    return mp_const_none;
+}
+
+STATIC void machine_pin_obj_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
+    (void)kind;
+    const machine_pin_obj_t *self = MP_OBJ_TO_PTR(o);
+    mp_printf(print, "Pin(%s)", qstr_str(self->name));
+}
+
+// pin(id, mode, pull, ...)
+STATIC mp_obj_t machine_pin_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
+
+    const machine_pin_obj_t *pin = pin_find(args[0]);
+
+    if (n_args > 1 || n_kw > 0) {
+        // pin mode given, so configure this GPIO
+        mp_map_t kw_args;
+        mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+        machine_pin_obj_init_helper(pin, n_args - 1, args + 1, &kw_args);
+    }
+
+    return (mp_obj_t)pin;
+}
+
+// pin.off()
+STATIC mp_obj_t machine_pin_off(mp_obj_t self_in) {
+    machine_pin_obj_t *self = self_in;
+    mp_hal_pin_low(self);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_off_obj, machine_pin_off);
+
+// pin.on()
+STATIC mp_obj_t machine_pin_on(mp_obj_t self_in) {
+    machine_pin_obj_t *self = self_in;
+    mp_hal_pin_high(self);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_on_obj, machine_pin_on);
+
+// pin.value([value])
+STATIC mp_obj_t machine_pin_value(size_t n_args, const mp_obj_t *args) {
+    return machine_pin_obj_call(args[0], (n_args - 1), 0, args + 1);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pin_value_obj, 1, 2, machine_pin_value);
+
+// pin.init(mode, pull, [kwargs])
+STATIC mp_obj_t machine_pin_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    return machine_pin_obj_init_helper(args[0], n_args - 1, args + 1, kw_args);
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_init_obj, 1, machine_pin_init);
+
+STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
+    // instance methods
+    { MP_ROM_QSTR(MP_QSTR_off),     MP_ROM_PTR(&machine_pin_off_obj) },
+    { MP_ROM_QSTR(MP_QSTR_on),      MP_ROM_PTR(&machine_pin_on_obj) },
+    { MP_ROM_QSTR(MP_QSTR_low),     MP_ROM_PTR(&machine_pin_off_obj) },
+    { MP_ROM_QSTR(MP_QSTR_high),    MP_ROM_PTR(&machine_pin_on_obj) },
+    { MP_ROM_QSTR(MP_QSTR_value),   MP_ROM_PTR(&machine_pin_value_obj) },
+    { MP_ROM_QSTR(MP_QSTR_init),    MP_ROM_PTR(&machine_pin_init_obj) },
+    // class attributes
+    { MP_ROM_QSTR(MP_QSTR_board),   MP_ROM_PTR(&machine_pin_board_pins_obj_type) },
+    { MP_ROM_QSTR(MP_QSTR_cpu),     MP_ROM_PTR(&machine_pin_cpu_pins_obj_type) },
+    // class constants
+    { MP_ROM_QSTR(MP_QSTR_IN),      MP_ROM_INT(PIN_MODE_IN) },
+    { MP_ROM_QSTR(MP_QSTR_OUT),     MP_ROM_INT(PIN_MODE_OUT) },
+    { MP_ROM_QSTR(MP_QSTR_OPEN_DRAIN), MP_ROM_INT(PIN_MODE_OPEN_DRAIN) },
+
+    { MP_ROM_QSTR(MP_QSTR_PULL_UP), MP_ROM_INT(PIN_PULL_UP_100K) },
+    { MP_ROM_QSTR(MP_QSTR_PULL_UP_47K), MP_ROM_INT(PIN_PULL_UP_47K) },
+    { MP_ROM_QSTR(MP_QSTR_PULL_UP_22K), MP_ROM_INT(PIN_PULL_UP_22K) },
+    { MP_ROM_QSTR(MP_QSTR_PULL_DOWN), MP_ROM_INT(PIN_PULL_DOWN_100K) },
+    { MP_ROM_QSTR(MP_QSTR_PULL_HOLD), MP_ROM_INT(PIN_PULL_HOLD) },
+
+    { MP_ROM_QSTR(MP_QSTR_DRIVER_OFF), MP_ROM_INT(PIN_DRIVE_OFF) },
+    { MP_ROM_QSTR(MP_QSTR_POWER_0),    MP_ROM_INT(PIN_DRIVE_POWER_0) }, // R0 (150 Ohm @3.3V / 260 Ohm @ 1.8V)
+    { MP_ROM_QSTR(MP_QSTR_POWER_1),    MP_ROM_INT(PIN_DRIVE_POWER_1) }, // R0/2
+    { MP_ROM_QSTR(MP_QSTR_POWER_2),    MP_ROM_INT(PIN_DRIVE_POWER_2) }, // R0/3
+    { MP_ROM_QSTR(MP_QSTR_POWER_3),    MP_ROM_INT(PIN_DRIVE_POWER_3) }, // R0/4
+    { MP_ROM_QSTR(MP_QSTR_POWER_4),    MP_ROM_INT(PIN_DRIVE_POWER_4) }, // R0/5
+    { MP_ROM_QSTR(MP_QSTR_POWER_5),    MP_ROM_INT(PIN_DRIVE_POWER_5) }, // R0/6
+    { MP_ROM_QSTR(MP_QSTR_POWER_6),    MP_ROM_INT(PIN_DRIVE_POWER_6) }, // R0/7
+
+};
+STATIC MP_DEFINE_CONST_DICT(machine_pin_locals_dict, machine_pin_locals_dict_table);
+
+const mp_obj_type_t machine_pin_type = {
+    {&mp_type_type},
+    .name = MP_QSTR_Pin,
+    .print = machine_pin_obj_print,
+    .call = machine_pin_obj_call,
+    .make_new = machine_pin_obj_make_new,
+    .locals_dict = (mp_obj_dict_t *)&machine_pin_locals_dict,
+};
+
+// FIXME: Create actual pin_af type!!!
+const mp_obj_type_t machine_pin_af_type = {
+    {&mp_type_type},
+    .name = MP_QSTR_PinAF,
+    .print = machine_pin_obj_print,
+    .make_new = machine_pin_obj_make_new,
+    .locals_dict = (mp_obj_dict_t *)&machine_pin_locals_dict,
+};
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index a6aab7b4ab..1bb6b6a352 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -28,6 +28,7 @@
 #include "py/runtime.h"
 #include "extmod/machine_mem.h"
 #include "led.h"
+#include "pin.h"
 
 #include CPU_HEADER_H
 
@@ -52,6 +53,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     #if NUM_LEDS
     { MP_ROM_QSTR(MP_QSTR_LED),                 MP_ROM_PTR(&machine_led_type) },
     #endif
+    { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
 
diff --git a/ports/mimxrt/mphalport.h b/ports/mimxrt/mphalport.h
index 993e151566..a6a28ab4a5 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -29,10 +29,14 @@
 
 #include <stdint.h>
 #include "ticks.h"
+#include "pin.h"
 
+#define mp_hal_pin_obj_t const machine_pin_obj_t *
 #define mp_hal_pin_high(p) (GPIO_PinWrite(p->gpio, p->pin, 1U))
 #define mp_hal_pin_low(p) (GPIO_PinWrite(p->gpio, p->pin, 0U))
+#define mp_hal_pin_write(p, value) (GPIO_PinWrite(p->gpio, p->pin, value))
 #define mp_hal_pin_toggle(p) (GPIO_PortToggle(p->gpio, (1 << p->pin)))
+#define mp_hal_pin_read(p) (GPIO_PinRead(p->gpio, p->pin))
 
 void mp_hal_set_interrupt_char(int c);
 
diff --git a/ports/mimxrt/pin.c b/ports/mimxrt/pin.c
index b30f4be41c..7a437661e3 100644
--- a/ports/mimxrt/pin.c
+++ b/ports/mimxrt/pin.c
@@ -24,14 +24,104 @@
  * THE SOFTWARE.
  */
 
+#include "py/runtime.h"
 #include "pin.h"
 
-const mp_obj_type_t pin_type = {
-    .base = {&mp_type_type},
-    .name = MP_QSTR_Pin,
-};
 
-const mp_obj_type_t pin_af_type = {
-    {&mp_type_type},
-    .name = MP_QSTR_PinAF,
-};
+void pin_init(void) {
+    return;
+}
+
+uint32_t pin_get_mode(const machine_pin_obj_t *pin) {
+    uint32_t pin_mode = PIN_MODE_ALT;
+    uint32_t config_register = *((volatile uint32_t *)pin->configRegister);
+    uint8_t af_mode = pin_get_af(pin);
+
+    if (af_mode == PIN_AF_MODE_ALT5) {
+        bool open_drain_enabled = (config_register & IOMUXC_SW_PAD_CTL_PAD_ODE_MASK) >> IOMUXC_SW_PAD_CTL_PAD_ODE_SHIFT;
+
+        if (open_drain_enabled) {
+            pin_mode = PIN_MODE_OPEN_DRAIN;
+        } else {
+            // Check pin direction
+            if ((pin->gpio->GDIR & (1U << pin->pin)) >> pin->pin) {
+                pin_mode = PIN_MODE_OUT;
+            } else {
+                pin_mode = PIN_MODE_IN;
+            }
+        }
+    }
+
+    return pin_mode;
+}
+
+uint32_t pin_get_af(const machine_pin_obj_t *pin) {
+    uint32_t mux_register = *((volatile uint32_t *)pin->muxRegister);
+
+    // Read configured AF-Mode of pin
+    return (uint32_t)(mux_register & IOMUXC_SW_MUX_CTL_PAD_MUX_MODE_MASK) >> IOMUXC_SW_MUX_CTL_PAD_MUX_MODE_SHIFT;
+}
+
+const machine_pin_obj_t *pin_find(mp_obj_t user_obj) {
+    const machine_pin_obj_t *pin_obj;
+
+    // If a pin was provided, then use it
+    if (mp_obj_is_type(user_obj, &machine_pin_type)) {
+        pin_obj = user_obj;
+        return pin_obj;
+    }
+
+    // If pin is SMALL_INT
+    if (mp_obj_is_small_int(user_obj)) {
+        uint8_t value = MP_OBJ_SMALL_INT_VALUE(user_obj);
+        if (value < num_board_pins) {
+            return machine_pin_board_pins[value];
+        }
+    }
+
+    // See if the pin name matches a board pin
+    pin_obj = pin_find_named_pin(&machine_pin_board_pins_locals_dict, user_obj);
+    if (pin_obj) {
+        return pin_obj;
+    }
+
+    // See if the pin name matches a cpu pin
+    pin_obj = pin_find_named_pin(&machine_pin_cpu_pins_locals_dict, user_obj);
+    if (pin_obj) {
+        return pin_obj;
+    }
+
+    mp_raise_ValueError(MP_ERROR_TEXT("Pin doesn't exist"));
+}
+
+const machine_pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t name) {
+    mp_map_t *named_map = mp_obj_dict_get_map((mp_obj_t)named_pins);
+    mp_map_elem_t *named_elem = mp_map_lookup(named_map, name, MP_MAP_LOOKUP);
+    if (named_elem != NULL && named_elem->value != NULL) {
+        return named_elem->value;
+    }
+    return NULL;
+}
+
+const machine_pin_af_obj_t *pin_find_af(const machine_pin_obj_t *pin, uint8_t fn) {
+    const machine_pin_af_obj_t *af_obj = NULL;
+
+    for (int i = 0; i < pin->af_list_len; ++i) {
+        af_obj = &pin->af_list[i];
+        if (af_obj->af_mode == fn) {
+            return af_obj;
+        }
+    }
+
+    return NULL;
+}
+
+const machine_pin_af_obj_t *pin_find_af_by_index(const machine_pin_obj_t *pin, mp_uint_t af_idx) {
+    // TODO: Implement pin_find_af_by_index function
+    return NULL;
+}
+
+const machine_pin_af_obj_t *pin_find_af_by_name(const machine_pin_obj_t *pin, const char *name) {
+    // TODO: Implement pin_find_af_by_name function
+    return NULL;
+}
diff --git a/ports/mimxrt/pin.h b/ports/mimxrt/pin.h
index cfb1e6b572..268b505b38 100644
--- a/ports/mimxrt/pin.h
+++ b/ports/mimxrt/pin.h
@@ -27,12 +27,32 @@
 #ifndef MICROPY_INCLUDED_MIMXRT_PIN_H
 #define MICROPY_INCLUDED_MIMXRT_PIN_H
 
-#include "fsl_gpio.h"
+#include <stdint.h>
 #include "py/obj.h"
+#include "fsl_gpio.h"
+
+// ------------------------------------------------------------------------------------------------------------------ //
+
+#define IS_GPIO_MODE(MODE) (((MODE) == PIN_MODE_IN) || \
+    ((MODE) == PIN_MODE_OUT) || \
+    ((MODE) == PIN_MODE_OPEN_DRAIN) || \
+    ((MODE) == PIN_MODE_ALT))
+
+#define IS_GPIO_DRIVE(DRIVE) (((DRIVE) == PIN_DRIVE_OFF) || \
+    ((DRIVE) == PIN_DRIVE_POWER_0) || \
+    ((DRIVE) == PIN_DRIVE_POWER_1) || \
+    ((DRIVE) == PIN_DRIVE_POWER_2) || \
+    ((DRIVE) == PIN_DRIVE_POWER_3) || \
+    ((DRIVE) == PIN_DRIVE_POWER_4) || \
+    ((DRIVE) == PIN_DRIVE_POWER_5) || \
+    ((DRIVE) == PIN_DRIVE_POWER_6))
+
+// ------------------------------------------------------------------------------------------------------------------ //
 
 enum {
     PIN_MODE_IN = 0,
     PIN_MODE_OUT,
+    PIN_MODE_OPEN_DRAIN,
     PIN_MODE_ALT,
 };
 
@@ -47,13 +67,38 @@ enum {
     PIN_AF_MODE_ALT8,
 };
 
+enum {
+    PIN_PULL_DOWN_100K = 0,
+    PIN_PULL_UP_47K,
+    PIN_PULL_UP_100K,
+    PIN_PULL_UP_22K,
+    PIN_PULL_DISABLED,
+    PIN_PULL_HOLD,
+};
+
+enum {
+    PIN_DRIVE_OFF = 0b000,
+    PIN_DRIVE_POWER_0, // R0 (150 Ohm @3.3V / 260 Ohm @ 1.8V)
+    PIN_DRIVE_POWER_1, // R0/2
+    PIN_DRIVE_POWER_2, // R0/3
+    PIN_DRIVE_POWER_3, // R0/4
+    PIN_DRIVE_POWER_4, // R0/5
+    PIN_DRIVE_POWER_5, // R0/6
+    PIN_DRIVE_POWER_6, // R0/7
+};
+
+
+
+
+// ------------------------------------------------------------------------------------------------------------------ //
+
 typedef struct {
     mp_obj_base_t base;
     qstr name;  // port name
-    uint32_t af_mode;  // alternate function
+    uint8_t af_mode;  // alternate function
     void *instance;  // pointer to peripheral instance for alternate function
     uint32_t pad_config;  // pad configuration for alternate function
-} pin_af_obj_t;
+} machine_pin_af_obj_t;
 
 typedef struct {
     mp_obj_base_t base;
@@ -62,39 +107,38 @@ typedef struct {
     uint32_t pin;  // pin number
     uint32_t muxRegister;
     uint32_t configRegister;
-    uint32_t mode;  // current pin mode
-    uint32_t af_mode;  // current alternate function mode
     size_t af_list_len;  // length of available alternate functions list
-    const pin_af_obj_t *af_list;  // pointer tolist with alternate functions
-} pin_obj_t;
+    const machine_pin_af_obj_t *af_list;  // pointer tolist with alternate functions
+} machine_pin_obj_t;
 
-extern const mp_obj_type_t pin_type;
-extern const mp_obj_type_t pin_af_type;
+// ------------------------------------------------------------------------------------------------------------------ //
 
-#define PIN_AF(_name, _af_mode, _instance, _pad_config) \
-    { \
-        .base = { &pin_af_type }, \
-        .name = MP_QSTR_##_name, \
-        .af_mode = (uint32_t)(_af_mode), \
-        .instance = (void *)(_instance), \
-        .pad_config = (uint32_t)(_pad_config), \
-    } \
+extern const mp_obj_type_t machine_pin_type;
+extern const mp_obj_type_t machine_pin_af_type;
 
-#define PIN(_name, _gpio, _pin, _af_list) \
-    { \
-        .base = { &pin_type }, \
-        .name = MP_QSTR_##_name, \
-        .gpio = (_gpio), \
-        .pin = (uint32_t)(_pin), \
-        .muxRegister = (uint32_t)&(IOMUXC->SW_MUX_CTL_PAD[kIOMUXC_SW_MUX_CTL_PAD_##_name]), \
-        .configRegister = (uint32_t)&(IOMUXC->SW_PAD_CTL_PAD[kIOMUXC_SW_PAD_CTL_PAD_##_name]), \
-        .mode = PIN_MODE_IN, \
-        .af_mode = PIN_AF_MODE_ALT5, \
-        .af_list_len = (size_t)(sizeof((_af_list)) / sizeof(pin_af_obj_t)), \
-        .af_list = (_af_list), \
-    } \
+// ------------------------------------------------------------------------------------------------------------------ //
 
 // Include board specific pins
-#include "pins.h"
+#include "genhdr/pins.h"  // pins.h must included at this location
+
+extern const machine_pin_obj_t *machine_pin_board_pins[];
+extern const uint32_t num_board_pins;
+
+extern const mp_obj_type_t machine_pin_board_pins_obj_type;
+extern const mp_obj_type_t machine_pin_cpu_pins_obj_type;
+
+extern const mp_obj_dict_t machine_pin_cpu_pins_locals_dict;
+extern const mp_obj_dict_t machine_pin_board_pins_locals_dict;
+
+// ------------------------------------------------------------------------------------------------------------------ //
+
+void pin_init(void);
+uint32_t pin_get_mode(const machine_pin_obj_t *pin);
+uint32_t pin_get_af(const machine_pin_obj_t *pin);
+const machine_pin_obj_t *pin_find(mp_obj_t user_obj);
+const machine_pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t name);
+const machine_pin_af_obj_t *pin_find_af(const machine_pin_obj_t *pin, uint8_t fn);
+const machine_pin_af_obj_t *pin_find_af_by_index(const machine_pin_obj_t *pin, mp_uint_t af_idx);
+const machine_pin_af_obj_t *pin_find_af_by_name(const machine_pin_obj_t *pin, const char *name);
 
 #endif // MICROPY_INCLUDED_MIMXRT_PIN_H
diff --git a/ports/mimxrt/tusb_port.c b/ports/mimxrt/tusb_port.c
index 0d73b09235..2b1ccabbe7 100644
--- a/ports/mimxrt/tusb_port.c
+++ b/ports/mimxrt/tusb_port.c
@@ -76,7 +76,7 @@ static const uint8_t usbd_desc_cfg[USBD_DESC_LEN] = {
 
 static const char *const usbd_desc_str[] = {
     [USBD_STR_MANUF] = "MicroPython",
-    [USBD_STR_PRODUCT] = "Board in FS mode",
+    [USBD_STR_PRODUCT] = "Board in FS mode", // Todo: fix string to indicate that product is running in High Speed mode
     [USBD_STR_SERIAL] = "000000000000", // TODO
     [USBD_STR_CDC] = "Board CDC",
 };

From c326d9a67ba1846bba38f284fa9b8f712dd2d48a Mon Sep 17 00:00:00 2001
From: Philipp Ebensberger <philipp.ebensberger@3bricks-software.de>
Date: Sat, 24 Apr 2021 22:15:12 +0200
Subject: [PATCH 144/349] mimxrt: Enable built-in help.

---
 ports/mimxrt/mpconfigport.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 65b91675a5..e6b15e1b71 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -58,6 +58,7 @@
 #define MICROPY_PY_BUILTINS_FILTER          (0)
 #define MICROPY_PY_BUILTINS_REVERSED        (1)
 #define MICROPY_PY_BUILTINS_MIN_MAX         (0)
+#define MICROPY_PY_BUILTINS_HELP            (1)
 #define MICROPY_PY___FILE__                 (0)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO     (1)
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN       (1)

From 5f68f0d08ab1effd0fae8a00bdda46dbc788d9db Mon Sep 17 00:00:00 2001
From: Philipp Ebensberger <philipp.ebensberger@3bricks-software.de>
Date: Sat, 24 Apr 2021 21:34:07 +0200
Subject: [PATCH 145/349] github/workflows: Add CI workflow for mimxrt port.

---
 .github/workflows/ports_mimxrt.yml | 23 +++++++++++++++++++++++
 tools/ci.sh                        | 13 +++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 .github/workflows/ports_mimxrt.yml

diff --git a/.github/workflows/ports_mimxrt.yml b/.github/workflows/ports_mimxrt.yml
new file mode 100644
index 0000000000..8fbc2209e4
--- /dev/null
+++ b/.github/workflows/ports_mimxrt.yml
@@ -0,0 +1,23 @@
+name: mimxrt port
+
+on:
+  push:
+  pull_request:
+    paths:
+      - '.github/workflows/*.yml'
+      - 'tools/**'
+      - 'py/**'
+      - 'extmod/**'
+      - 'lib/**'
+      - 'drivers/**'
+      - 'ports/mimxrt/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_mimxrt_setup
+    - name: Build
+      run: source tools/ci.sh && ci_mimxrt_build
diff --git a/tools/ci.sh b/tools/ci.sh
index 7b38ce0df0..df812141f5 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -138,6 +138,19 @@ function ci_esp8266_build {
     make ${MAKEOPTS} -C ports/esp8266 BOARD=GENERIC_1M
 }
 
+########################################################################################
+# ports/mimxrt
+
+function ci_mimxrt_setup {
+    ci_gcc_arm_setup
+}
+
+function ci_mimxrt_build {
+    make ${MAKEOPTS} -C ports/mimxrt submodules
+    make ${MAKEOPTS} -C ports/mimxrt BOARD=MIMXRT1020_EVK
+    make ${MAKEOPTS} -C ports/mimxrt BOARD=TEENSY40
+}
+
 ########################################################################################
 # ports/nrf
 

From c732b80f0584156b6ff98e8baa90c011539bf88a Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 25 May 2021 14:49:21 +0200
Subject: [PATCH 146/349] mimxrt: Extend the Pin module for SoftI2C, SoftSPI
 support.

This change consists mostly of changing and extending the required
definitions in mphalport.h.
---
 ports/mimxrt/machine_pin.c | 14 ++++++++++++++
 ports/mimxrt/mphalport.h   | 14 +++++++++++++-
 ports/mimxrt/pin.h         |  1 +
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/ports/mimxrt/machine_pin.c b/ports/mimxrt/machine_pin.c
index 583ee4a265..f63778cbe5 100644
--- a/ports/mimxrt/machine_pin.c
+++ b/ports/mimxrt/machine_pin.c
@@ -68,6 +68,20 @@ const mp_obj_type_t machine_pin_board_pins_obj_type = {
     .locals_dict = (mp_obj_t)&machine_pin_board_pins_locals_dict,
 };
 
+// Simplified mode setting used by the extmod modules
+void machine_pin_set_mode(const machine_pin_obj_t *self, uint8_t mode) {
+    gpio_pin_config_t pin_config = {kGPIO_DigitalInput, 1, kGPIO_NoIntmode};
+
+    pin_config.direction = (mode == PIN_MODE_IN ? kGPIO_DigitalInput : kGPIO_DigitalOutput);
+    GPIO_PinInit(self->gpio, self->pin, &pin_config);
+    if (mode == PIN_MODE_OPEN_DRAIN) {
+        uint32_t pad_config = *(uint32_t *)self->configRegister;
+        pad_config |= IOMUXC_SW_PAD_CTL_PAD_ODE(0b1) | IOMUXC_SW_PAD_CTL_PAD_DSE(0b110);
+        IOMUXC_SetPinMux(self->muxRegister, PIN_AF_MODE_ALT5, 0, 0, self->configRegister, 1U);  // Software Input On Field: Input Path is determined by functionality
+        IOMUXC_SetPinConfig(self->muxRegister, PIN_AF_MODE_ALT5, 0, 0, self->configRegister, pad_config);
+    }
+}
+
 STATIC mp_obj_t machine_pin_obj_call(mp_obj_t self_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
     machine_pin_obj_t *self = self_in;
diff --git a/ports/mimxrt/mphalport.h b/ports/mimxrt/mphalport.h
index a6a28ab4a5..78b390b4eb 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -31,12 +31,22 @@
 #include "ticks.h"
 #include "pin.h"
 
+#define MP_HAL_PIN_FMT                  "%q"
+
 #define mp_hal_pin_obj_t const machine_pin_obj_t *
+#define mp_hal_get_pin_obj(o)   pin_find(o)
+#define mp_hal_pin_name(p)      ((p)->name)
+#define mp_hal_pin_input(p) machine_pin_set_mode(p, PIN_MODE_IN);
+#define mp_hal_pin_output(p) machine_pin_set_mode(p, PIN_MODE_OUT);
+#define mp_hal_pin_open_drain(p) machine_pin_set_mode(p, PIN_MODE_OPEN_DRAIN);
 #define mp_hal_pin_high(p) (GPIO_PinWrite(p->gpio, p->pin, 1U))
 #define mp_hal_pin_low(p) (GPIO_PinWrite(p->gpio, p->pin, 0U))
 #define mp_hal_pin_write(p, value) (GPIO_PinWrite(p->gpio, p->pin, value))
 #define mp_hal_pin_toggle(p) (GPIO_PortToggle(p->gpio, (1 << p->pin)))
-#define mp_hal_pin_read(p) (GPIO_PinRead(p->gpio, p->pin))
+#define mp_hal_pin_read(p) (GPIO_PinReadPadStatus(p->gpio, p->pin))
+
+#define mp_hal_pin_od_low(p)    mp_hal_pin_low(p)
+#define mp_hal_pin_od_high(p)   mp_hal_pin_high(p)
 
 void mp_hal_set_interrupt_char(int c);
 
@@ -57,6 +67,8 @@ static inline void mp_hal_delay_us(mp_uint_t us) {
     ticks_delay_us64(us);
 }
 
+#define mp_hal_delay_us_fast(us) mp_hal_delay_us(us)
+
 static inline mp_uint_t mp_hal_ticks_cpu(void) {
     return 0;
 }
diff --git a/ports/mimxrt/pin.h b/ports/mimxrt/pin.h
index 268b505b38..6afedd1f59 100644
--- a/ports/mimxrt/pin.h
+++ b/ports/mimxrt/pin.h
@@ -140,5 +140,6 @@ const machine_pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_
 const machine_pin_af_obj_t *pin_find_af(const machine_pin_obj_t *pin, uint8_t fn);
 const machine_pin_af_obj_t *pin_find_af_by_index(const machine_pin_obj_t *pin, mp_uint_t af_idx);
 const machine_pin_af_obj_t *pin_find_af_by_name(const machine_pin_obj_t *pin, const char *name);
+void machine_pin_set_mode(const machine_pin_obj_t *pin, uint8_t mode);
 
 #endif // MICROPY_INCLUDED_MIMXRT_PIN_H

From 4ee8ec6931e6a5958d2a5710c6a8f7cd7c0f3862 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 25 May 2021 22:15:58 +1000
Subject: [PATCH 147/349] py/asmarm: Use builtin func to flush I- and D-cache
 on ARM 7 archs.

The inline assembler code does not work for __ARM_ARCH == 7.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/asmarm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/py/asmarm.c b/py/asmarm.c
index e91421578b..5662d75e19 100644
--- a/py/asmarm.c
+++ b/py/asmarm.c
@@ -40,7 +40,7 @@
 
 void asm_arm_end_pass(asm_arm_t *as) {
     if (as->base.pass == MP_ASM_PASS_EMIT) {
-        #if defined(__linux__) && defined(__GNUC__)
+        #if (defined(__linux__) && defined(__GNUC__)) || __ARM_ARCH == 7
         char *start = mp_asm_base_get_code(&as->base);
         char *end = start + mp_asm_base_get_code_size(&as->base);
         __builtin___clear_cache(start, end);
@@ -48,10 +48,10 @@ void asm_arm_end_pass(asm_arm_t *as) {
         // flush I- and D-cache
         asm volatile (
             "0:"
-            "mrc p15, 0, r15, c7, c10, 3\n"
+            "mrc p15, 0, r15, c7, c10, 3\n" // test and clean D-cache
             "bne 0b\n"
             "mov r0, #0\n"
-            "mcr p15, 0, r0, c7, c7, 0\n"
+            "mcr p15, 0, r0, c7, c7, 0\n" // invalidate I-cache and D-cache
             : : : "r0", "cc");
         #endif
     }

From 2c1a6a237d4e68c077c175d16f4d76518c00e4d2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 25 May 2021 22:16:06 +1000
Subject: [PATCH 148/349] tools/mpy-tool.py: Support relocating ARMv6 arch.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpy-tool.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index ea756d3ee2..bfc3cf27e3 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -532,6 +532,7 @@ class RawCodeNative(RawCode):
             if config.native_arch in (
                 MP_NATIVE_ARCH_X86,
                 MP_NATIVE_ARCH_X64,
+                MP_NATIVE_ARCH_ARMV6,
                 MP_NATIVE_ARCH_XTENSA,
                 MP_NATIVE_ARCH_XTENSAWIN,
             ):

From f5cba77e50c9b3ae73d01cb373ad3226247ccd7b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 25 May 2021 22:16:11 +1000
Subject: [PATCH 149/349] tools/tinytest-codegen.py: Add command-line option to
 exclude tests.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/tinytest-codegen.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/tinytest-codegen.py b/tools/tinytest-codegen.py
index 116a217b4b..cba0b94480 100755
--- a/tools/tinytest-codegen.py
+++ b/tools/tinytest-codegen.py
@@ -108,9 +108,12 @@ argparser = argparse.ArgumentParser(
     description="Convert native MicroPython tests to tinytest/upytesthelper C code"
 )
 argparser.add_argument("--stdin", action="store_true", help="read list of tests from stdin")
+argparser.add_argument("--exclude", action="append", help="exclude test by name")
 args = argparser.parse_args()
 
 if not args.stdin:
+    if args.exclude:
+        exclude_tests += tuple(args.exclude)
     for group in test_dirs:
         tests += [test for test in glob("{}/*.py".format(group)) if test not in exclude_tests]
 else:

From b84406f3133a36a703a1506d754fc046dd955922 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 25 May 2021 22:16:08 +1000
Subject: [PATCH 150/349] qemu-arm: Add support for Cortex-A9 via sabrelite
 board.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/qemu-arm/Makefile       | 21 ++++++++++++----
 ports/qemu-arm/Makefile.test  |  7 +++++-
 ports/qemu-arm/imx6.ld        | 47 +++++++++++++++++++++++++++++++++++
 ports/qemu-arm/mpconfigport.h | 11 +++++---
 ports/qemu-arm/startup.c      | 27 ++++++++++++++++++++
 ports/qemu-arm/uart.c         | 27 ++++++++++++++++++++
 6 files changed, 131 insertions(+), 9 deletions(-)
 create mode 100644 ports/qemu-arm/imx6.ld

diff --git a/ports/qemu-arm/Makefile b/ports/qemu-arm/Makefile
index aebc5afaeb..22d0bf39cd 100644
--- a/ports/qemu-arm/Makefile
+++ b/ports/qemu-arm/Makefile
@@ -16,7 +16,8 @@ ifeq ($(BOARD),netduino2)
 CFLAGS += -mthumb -mcpu=cortex-m3 -mfloat-abi=soft
 CFLAGS += -DQEMU_SOC_STM32
 LDSCRIPT = stm32.ld
-SRC_BOARD_O = lib/utils/gchelper_m3.o
+SRC_BOARD_O = lib/utils/gchelper_native.o lib/utils/gchelper_m3.o
+MPY_CROSS_FLAGS += -march=armv7m
 endif
 
 ifeq ($(BOARD),microbit)
@@ -24,14 +25,26 @@ CFLAGS += -mthumb -mcpu=cortex-m0 -mfloat-abi=soft
 CFLAGS += -DQEMU_SOC_NRF51
 LDSCRIPT = nrf51.ld
 QEMU_EXTRA = -global nrf51-soc.flash-size=1048576 -global nrf51-soc.sram-size=262144
-SRC_BOARD_O = lib/utils/gchelper_m0.o
+SRC_BOARD_O = lib/utils/gchelper_native.o lib/utils/gchelper_m0.o
+MPY_CROSS_FLAGS += -march=armv7m
 endif
 
 ifeq ($(BOARD),mps2-an385)
 CFLAGS += -mthumb -mcpu=cortex-m3 -mfloat-abi=soft
 CFLAGS += -DQEMU_SOC_MPS2
 LDSCRIPT = mps2.ld
-SRC_BOARD_O = lib/utils/gchelper_m3.o
+SRC_BOARD_O = lib/utils/gchelper_native.o lib/utils/gchelper_m3.o
+MPY_CROSS_FLAGS += -march=armv7m
+endif
+
+ifeq ($(BOARD),sabrelite)
+CFLAGS += -mcpu=cortex-a9
+CFLAGS += -DQEMU_SOC_IMX6
+LDSCRIPT = imx6.ld
+QEMU_EXTRA = -m 128M
+SRC_BOARD_O = lib/utils/gchelper_generic.o
+# It's really armv7a but closest supported value is armv6.
+MPY_CROSS_FLAGS += -march=armv6
 endif
 
 CROSS_COMPILE ?= arm-none-eabi-
@@ -95,7 +108,6 @@ LIB_SRC_C += $(addprefix lib/,\
 	libm/atanf.c \
 	libm/atan2f.c \
 	libm/roundf.c \
-	utils/gchelper_native.c \
 	utils/sys_stdio_mphal.c \
 	)
 
@@ -125,7 +137,6 @@ ifneq ($(FROZEN_MANIFEST),)
 CFLAGS += -DMICROPY_MODULE_FROZEN_STR
 CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
 CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
-MPY_CROSS_FLAGS += -march=armv7m
 endif
 
 all: run
diff --git a/ports/qemu-arm/Makefile.test b/ports/qemu-arm/Makefile.test
index 6b7f1dc7ab..b4ad6114b8 100644
--- a/ports/qemu-arm/Makefile.test
+++ b/ports/qemu-arm/Makefile.test
@@ -4,6 +4,11 @@ FROZEN_MANIFEST ?= "freeze('test-frzmpy')"
 
 include Makefile
 
+ifeq ($(BOARD),sabrelite)
+# These don't work on Cortex-A9.
+TESTS_EXCLUDE = inlineasm/asmdiv.py inlineasm/asmspecialregs.py
+endif
+
 CFLAGS += -DTEST
 
 .PHONY: $(BUILD)/genhdr/tests.h
@@ -11,7 +16,7 @@ CFLAGS += -DTEST
 $(BUILD)/test_main.o: $(BUILD)/genhdr/tests.h
 $(BUILD)/genhdr/tests.h:
 	(cd $(TOP)/tests; ./run-tests.py --target=qemu-arm --write-exp)
-	$(Q)echo "Generating $@";(cd $(TOP)/tests; ../tools/tinytest-codegen.py) > $@
+	$(Q)echo "Generating $@";(cd $(TOP)/tests; ../tools/tinytest-codegen.py $(addprefix --exclude ,$(TESTS_EXCLUDE))) > $@
 
 $(BUILD)/lib/tinytest/tinytest.o: CFLAGS += -DNO_FORKING
 
diff --git a/ports/qemu-arm/imx6.ld b/ports/qemu-arm/imx6.ld
new file mode 100644
index 0000000000..7155956f15
--- /dev/null
+++ b/ports/qemu-arm/imx6.ld
@@ -0,0 +1,47 @@
+/* Vector table is at 0x00000000, entry point is 0x10000000. */
+
+MEMORY
+{
+    ROM : ORIGIN = 0x00000000, LENGTH = 96K
+    RAM : ORIGIN = 0x10000000, LENGTH = 128M
+}
+
+_estack = ORIGIN(RAM) + LENGTH(RAM);
+
+SECTIONS
+{
+    .rom : {
+        . = ALIGN(4);
+        KEEP(*(.isr_vector))
+        . = ALIGN(4);
+    } > ROM
+
+    .text : {
+        . = ALIGN(4);
+        *(.text.Reset_Handler)
+        *(.text*)
+        *(.rodata*)
+        . = ALIGN(4);
+        _etext = .;
+        _sidata = _etext;
+    } > RAM
+
+    .data : AT ( _sidata )
+    {
+        . = ALIGN(4);
+        _sdata = .;
+        *(.data*)
+        . = ALIGN(4);
+        _edata = .;
+    } > RAM
+
+    .bss :
+    {
+        . = ALIGN(4);
+        _sbss = .;
+        *(.bss*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = .;
+    } > RAM
+}
diff --git a/ports/qemu-arm/mpconfigport.h b/ports/qemu-arm/mpconfigport.h
index 498ab3ed2c..1f05719caa 100644
--- a/ports/qemu-arm/mpconfigport.h
+++ b/ports/qemu-arm/mpconfigport.h
@@ -3,9 +3,16 @@
 // options to control how MicroPython is built
 
 #define MICROPY_ALLOC_PATH_MAX      (512)
-#define MICROPY_EMIT_X64            (0)
+
+#if defined(__ARM_ARCH_ISA_ARM)
+#define MICROPY_EMIT_ARM            (1)
+#define MICROPY_EMIT_INLINE_THUMB   (1)
+#elif defined(__ARM_ARCH_ISA_THUMB)
 #define MICROPY_EMIT_THUMB          (1)
 #define MICROPY_EMIT_INLINE_THUMB   (1)
+#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
+#endif
+
 #define MICROPY_MALLOC_USES_ALLOCATED_SIZE (1)
 #define MICROPY_MEM_STATS           (1)
 #define MICROPY_DEBUG_PRINTERS      (0)
@@ -43,8 +50,6 @@
 
 // type definitions for the specific machine
 
-#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
-
 #define MP_SSIZE_MAX (0x7fffffff)
 
 #define UINT_FMT "%lu"
diff --git a/ports/qemu-arm/startup.c b/ports/qemu-arm/startup.c
index 58bdf7af9e..a52b068c33 100644
--- a/ports/qemu-arm/startup.c
+++ b/ports/qemu-arm/startup.c
@@ -28,6 +28,27 @@ void Default_Handler(void) {
     }
 }
 
+#if defined(__ARM_ARCH_ISA_ARM)
+
+// ARM architecture with standard ARM ISA.
+
+__attribute__((naked, section(".isr_vector"))) void isr_vector(void) {
+    __asm volatile (
+        "b Reset_Handler\n"
+        "b Default_Handler\n"
+        "b Default_Handler\n"
+        "b Default_Handler\n"
+        "b Default_Handler\n"
+        "nop\n"
+        "b Default_Handler\n"
+        "b Default_Handler\n"
+        );
+}
+
+#elif defined(__ARM_ARCH_ISA_THUMB)
+
+// ARM architecture with Thumb-only ISA.
+
 const uint32_t isr_vector[] __attribute__((section(".isr_vector"))) = {
     (uint32_t)&_estack,
     (uint32_t)&Reset_Handler,
@@ -47,6 +68,8 @@ const uint32_t isr_vector[] __attribute__((section(".isr_vector"))) = {
     (uint32_t)&Default_Handler, // SysTick_Handler
 };
 
+#endif
+
 void _start(void) {
     // Enable the UART
     uart_init();
@@ -68,7 +91,11 @@ __attribute__((naked)) void exit(int status) {
         "ldr r1, =0x20026\n" // ADP_Stopped_ApplicationExit, a clean exit
         ".notclean:\n"
         "movs r0, #0x18\n" // SYS_EXIT
+        #if defined(__ARM_ARCH_ISA_ARM)
+        "svc 0x00123456\n"
+        #elif defined(__ARM_ARCH_ISA_THUMB)
         "bkpt 0xab\n"
+        #endif
         );
     for (;;) {
     }
diff --git a/ports/qemu-arm/uart.c b/ports/qemu-arm/uart.c
index 8710e9e9f6..828398cd17 100644
--- a/ports/qemu-arm/uart.c
+++ b/ports/qemu-arm/uart.c
@@ -75,4 +75,31 @@ void uart_tx_strn(const char *buf, size_t len) {
     }
 }
 
+#elif defined(QEMU_SOC_IMX6)
+
+#define UART_UCR1_UARTEN (1 << 0)
+#define UART_UCR2_TXEN (1 << 2)
+
+typedef struct _UART_t {
+    volatile uint32_t URXD; // 0x00
+    volatile uint32_t r0[15];
+    volatile uint32_t UTXD; // 0x40
+    volatile uint32_t r1[15];
+    volatile uint32_t UCR1; // 0x80
+    volatile uint32_t UCR2; // 0x84
+} UART_t;
+
+#define UART1 ((UART_t *)(0x02020000))
+
+void uart_init(void) {
+    UART1->UCR1 = UART_UCR1_UARTEN;
+    UART1->UCR2 = UART_UCR2_TXEN;
+}
+
+void uart_tx_strn(const char *buf, size_t len) {
+    for (size_t i = 0; i < len; ++i) {
+        UART1->UTXD = buf[i];
+    }
+}
+
 #endif

From e7c0a8bca31063c295afdaf8e49c8ab24b70a90d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 25 May 2021 22:14:56 +1000
Subject: [PATCH 151/349] tools/ci.sh: Build Cortex-A9 sabrelite board as part
 of qemu-arm CI.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index df812141f5..c986c9fef8 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -194,6 +194,8 @@ function ci_qemu_arm_build {
     make ${MAKEOPTS} -C ports/qemu-arm CFLAGS_EXTRA=-DMP_ENDIANNESS_BIG=1
     make ${MAKEOPTS} -C ports/qemu-arm clean
     make ${MAKEOPTS} -C ports/qemu-arm -f Makefile.test test
+    make ${MAKEOPTS} -C ports/qemu-arm -f Makefile.test clean
+    make ${MAKEOPTS} -C ports/qemu-arm -f Makefile.test BOARD=sabrelite test
 }
 
 ########################################################################################

From dc86e044761a132ddd7026f0f9555f958ba8046a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 20 May 2021 10:02:57 +1000
Subject: [PATCH 152/349] tests: Make float and framebuf tests skip or run on
 big-endian archs.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/framebuf16.py                                 | 7 ++++++-
 tests/extmod/framebuf_subclass.py                          | 7 ++++++-
 ...ytearray_construct.py => bytearray_construct_endian.py} | 0
 .../{bytes_construct.py => bytes_construct_endian.py}      | 2 +-
 tests/float/float_array.py                                 | 2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)
 rename tests/float/{bytearray_construct.py => bytearray_construct_endian.py} (100%)
 rename tests/float/{bytes_construct.py => bytes_construct_endian.py} (77%)

diff --git a/tests/extmod/framebuf16.py b/tests/extmod/framebuf16.py
index e658f1345a..cd7f5ec015 100644
--- a/tests/extmod/framebuf16.py
+++ b/tests/extmod/framebuf16.py
@@ -1,9 +1,14 @@
 try:
-    import framebuf
+    import framebuf, usys
 except ImportError:
     print("SKIP")
     raise SystemExit
 
+# This test and its .exp file is based on a little-endian architecture.
+if usys.byteorder != "little":
+    print("SKIP")
+    raise SystemExit
+
 
 def printbuf():
     print("--8<--")
diff --git a/tests/extmod/framebuf_subclass.py b/tests/extmod/framebuf_subclass.py
index aad5d2a1e9..a9e3c5efc7 100644
--- a/tests/extmod/framebuf_subclass.py
+++ b/tests/extmod/framebuf_subclass.py
@@ -1,11 +1,16 @@
 # test subclassing framebuf.FrameBuffer
 
 try:
-    import framebuf
+    import framebuf, usys
 except ImportError:
     print("SKIP")
     raise SystemExit
 
+# This test and its .exp file is based on a little-endian architecture.
+if usys.byteorder != "little":
+    print("SKIP")
+    raise SystemExit
+
 
 class FB(framebuf.FrameBuffer):
     def __init__(self, n):
diff --git a/tests/float/bytearray_construct.py b/tests/float/bytearray_construct_endian.py
similarity index 100%
rename from tests/float/bytearray_construct.py
rename to tests/float/bytearray_construct_endian.py
diff --git a/tests/float/bytes_construct.py b/tests/float/bytes_construct_endian.py
similarity index 77%
rename from tests/float/bytes_construct.py
rename to tests/float/bytes_construct_endian.py
index 0806087b0e..208f56162f 100644
--- a/tests/float/bytes_construct.py
+++ b/tests/float/bytes_construct_endian.py
@@ -1,4 +1,4 @@
-# test construction of bytearray from array with float type
+# test construction of bytes from array with float type
 
 try:
     from uarray import array
diff --git a/tests/float/float_array.py b/tests/float/float_array.py
index 3c2189869b..219b6b86ae 100644
--- a/tests/float/float_array.py
+++ b/tests/float/float_array.py
@@ -22,4 +22,4 @@ def test(a):
 test(array("f"))
 test(array("d"))
 
-print("{:.4f}".format(array("f", b"\xcc\xcc\xcc=")[0]))
+print("{:.4f}".format(array("f", bytes(array("I", [0x3DCCCCCC])))[0]))

From ef16834887de02cbddf414b560e5a2af9cae4b16 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 18 May 2021 13:20:02 +1000
Subject: [PATCH 153/349] github/workflows: Add workflow to build and run unix
 port on MIPS.

This adds a coverage build and running of the test suite on a MIPS 32-bit
big endian architecture.  It uses the feature of qemu to execute foreign
code as though it were native to the system (using qemu user mode).  The
code compiled for MIPS will run under the qemu VM, but all syscalls made by
this code go to the host (Linux) system.

See related #7268 and #7273.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_unix.yml | 14 ++++++++++++++
 tools/ci.sh                      | 27 +++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index aa4b8abdc9..5c4a4f3047 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -186,3 +186,17 @@ jobs:
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
+
+  qemu_mips:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_unix_qemu_mips_setup
+    - name: Build
+      run: source tools/ci.sh && ci_unix_qemu_mips_build
+    - name: Run main test suite
+      run: source tools/ci.sh && ci_unix_qemu_mips_run_tests
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests.py --print-failures
diff --git a/tools/ci.sh b/tools/ci.sh
index c986c9fef8..23e529e5e1 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -292,6 +292,13 @@ CI_UNIX_OPTS_SYS_SETTRACE_STACKLESS=(
     CFLAGS_EXTRA="-DMICROPY_STACKLESS=1 -DMICROPY_STACKLESS_STRICT=1 -DMICROPY_PY_SYS_SETTRACE=1"
 )
 
+CI_UNIX_OPTS_QEMU_MIPS=(
+    CROSS_COMPILE=mips-linux-gnu-
+    VARIANT=coverage
+    MICROPY_STANDALONE=1
+    LDFLAGS_EXTRA="-static"
+)
+
 function ci_unix_build_helper {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/unix "$@" submodules
@@ -478,6 +485,26 @@ function ci_unix_macos_run_tests {
     (cd tests && ./run-tests.py --exclude 'uasyncio_(basic|heaplock|lock|wait_task)' --exclude 'import_pkg7.py' --exclude 'urandom_basic.py')
 }
 
+function ci_unix_qemu_mips_setup {
+    sudo apt-get update
+    sudo apt-get install gcc-mips-linux-gnu g++-mips-linux-gnu
+    sudo apt-get install qemu-user
+    qemu-mips --version
+}
+
+function ci_unix_qemu_mips_build {
+    # qemu-mips on GitHub Actions will seg-fault if not linked statically
+    ci_unix_build_helper "${CI_UNIX_OPTS_QEMU_MIPS[@]}"
+}
+
+function ci_unix_qemu_mips_run_tests {
+    # Issues with MIPS tests:
+    # - (i)listdir does not work, it always returns the empty list (it's an issue with the underlying C call)
+    # - ffi tests do not work
+    file ./ports/unix/micropython-coverage
+    (cd tests && MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests.py --exclude 'vfs_posix.py' --exclude 'ffi_(callback|float|float2).py')
+}
+
 ########################################################################################
 # ports/windows
 

From 0abf6f830cd390e2e5dbd4a2c68f611f5c9507dc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 26 May 2021 16:57:39 +1000
Subject: [PATCH 154/349] esp8266/boards/GENERIC_512K: Add custom manifest
 without FS modules.

The 512k build does not have a filesystem so there is no reason to include
the filesystem-related modules.  This commit provides a custom manifest.py
for this board which no longer includes: _boot.py, flashbdev.py,
inisetup.py, upip.py, upip_utarfile.py.  This cuts the build down by about
9k of flash.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/boards/GENERIC_512K/manifest.py      | 4 ++++
 ports/esp8266/boards/GENERIC_512K/mpconfigboard.mk | 2 ++
 2 files changed, 6 insertions(+)
 create mode 100644 ports/esp8266/boards/GENERIC_512K/manifest.py

diff --git a/ports/esp8266/boards/GENERIC_512K/manifest.py b/ports/esp8266/boards/GENERIC_512K/manifest.py
new file mode 100644
index 0000000000..e7ab8ad535
--- /dev/null
+++ b/ports/esp8266/boards/GENERIC_512K/manifest.py
@@ -0,0 +1,4 @@
+freeze("$(PORT_DIR)/modules", ("apa102.py", "neopixel.py", "ntptime.py", "port_diag.py"))
+freeze("$(MPY_DIR)/drivers/dht", "dht.py")
+freeze("$(MPY_DIR)/drivers/onewire")
+include("$(MPY_DIR)/extmod/webrepl/manifest.py")
diff --git a/ports/esp8266/boards/GENERIC_512K/mpconfigboard.mk b/ports/esp8266/boards/GENERIC_512K/mpconfigboard.mk
index a7566f9f19..120351909b 100644
--- a/ports/esp8266/boards/GENERIC_512K/mpconfigboard.mk
+++ b/ports/esp8266/boards/GENERIC_512K/mpconfigboard.mk
@@ -1 +1,3 @@
 LD_FILES = boards/esp8266_512k.ld
+
+FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py

From 6a127810c03d7666f1866f5e48df3c102805dbe8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 25 May 2021 16:48:29 +1000
Subject: [PATCH 155/349] extmod/moduhashlib: Put hash obj in final state after
 digest is called.

If digest is called then the hash object is put in a "final" state and
calling update() or digest() again will raise a ValueError (instead of
silently producing the wrong result).

See issue #4119.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/moduhashlib.c               | 33 +++++++++++++++++++++++++++-
 tests/extmod/uhashlib_final.py     | 35 ++++++++++++++++++++++++++++++
 tests/extmod/uhashlib_final.py.exp |  1 +
 3 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 tests/extmod/uhashlib_final.py
 create mode 100644 tests/extmod/uhashlib_final.py.exp

diff --git a/extmod/moduhashlib.c b/extmod/moduhashlib.c
index 195a24334b..b170de9e58 100644
--- a/extmod/moduhashlib.c
+++ b/extmod/moduhashlib.c
@@ -60,9 +60,16 @@
 
 typedef struct _mp_obj_hash_t {
     mp_obj_base_t base;
-    char state[0];
+    bool final; // if set, update and digest raise an exception
+    uintptr_t state[0]; // must be aligned to a machine word
 } mp_obj_hash_t;
 
+static void uhashlib_ensure_not_final(mp_obj_hash_t *self) {
+    if (self->final) {
+        mp_raise_ValueError(MP_ERROR_TEXT("hash is final"));
+    }
+}
+
 #if MICROPY_PY_UHASHLIB_SHA256
 STATIC mp_obj_t uhashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg);
 
@@ -78,6 +85,7 @@ STATIC mp_obj_t uhashlib_sha256_make_new(const mp_obj_type_t *type, size_t n_arg
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
     mp_obj_hash_t *o = m_new_obj_var(mp_obj_hash_t, char, sizeof(mbedtls_sha256_context));
     o->base.type = type;
+    o->final = false;
     mbedtls_sha256_init((mbedtls_sha256_context *)&o->state);
     mbedtls_sha256_starts_ret((mbedtls_sha256_context *)&o->state, 0);
     if (n_args == 1) {
@@ -88,6 +96,7 @@ STATIC mp_obj_t uhashlib_sha256_make_new(const mp_obj_type_t *type, size_t n_arg
 
 STATIC mp_obj_t uhashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
+    uhashlib_ensure_not_final(self);
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(arg, &bufinfo, MP_BUFFER_READ);
     mbedtls_sha256_update_ret((mbedtls_sha256_context *)&self->state, bufinfo.buf, bufinfo.len);
@@ -96,6 +105,8 @@ STATIC mp_obj_t uhashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg) {
 
 STATIC mp_obj_t uhashlib_sha256_digest(mp_obj_t self_in) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
+    uhashlib_ensure_not_final(self);
+    self->final = true;
     vstr_t vstr;
     vstr_init_len(&vstr, 32);
     mbedtls_sha256_finish_ret((mbedtls_sha256_context *)&self->state, (unsigned char *)vstr.buf);
@@ -110,6 +121,7 @@ STATIC mp_obj_t uhashlib_sha256_make_new(const mp_obj_type_t *type, size_t n_arg
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
     mp_obj_hash_t *o = m_new_obj_var(mp_obj_hash_t, char, sizeof(CRYAL_SHA256_CTX));
     o->base.type = type;
+    o->final = false;
     sha256_init((CRYAL_SHA256_CTX *)o->state);
     if (n_args == 1) {
         uhashlib_sha256_update(MP_OBJ_FROM_PTR(o), args[0]);
@@ -119,6 +131,7 @@ STATIC mp_obj_t uhashlib_sha256_make_new(const mp_obj_type_t *type, size_t n_arg
 
 STATIC mp_obj_t uhashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
+    uhashlib_ensure_not_final(self);
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(arg, &bufinfo, MP_BUFFER_READ);
     sha256_update((CRYAL_SHA256_CTX *)self->state, bufinfo.buf, bufinfo.len);
@@ -127,6 +140,8 @@ STATIC mp_obj_t uhashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg) {
 
 STATIC mp_obj_t uhashlib_sha256_digest(mp_obj_t self_in) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
+    uhashlib_ensure_not_final(self);
+    self->final = true;
     vstr_t vstr;
     vstr_init_len(&vstr, SHA256_BLOCK_SIZE);
     sha256_final((CRYAL_SHA256_CTX *)self->state, (byte *)vstr.buf);
@@ -160,6 +175,7 @@ STATIC mp_obj_t uhashlib_sha1_make_new(const mp_obj_type_t *type, size_t n_args,
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
     mp_obj_hash_t *o = m_new_obj_var(mp_obj_hash_t, char, sizeof(SHA1_CTX));
     o->base.type = type;
+    o->final = false;
     SHA1_Init((SHA1_CTX *)o->state);
     if (n_args == 1) {
         uhashlib_sha1_update(MP_OBJ_FROM_PTR(o), args[0]);
@@ -169,6 +185,7 @@ STATIC mp_obj_t uhashlib_sha1_make_new(const mp_obj_type_t *type, size_t n_args,
 
 STATIC mp_obj_t uhashlib_sha1_update(mp_obj_t self_in, mp_obj_t arg) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
+    uhashlib_ensure_not_final(self);
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(arg, &bufinfo, MP_BUFFER_READ);
     SHA1_Update((SHA1_CTX *)self->state, bufinfo.buf, bufinfo.len);
@@ -177,6 +194,8 @@ STATIC mp_obj_t uhashlib_sha1_update(mp_obj_t self_in, mp_obj_t arg) {
 
 STATIC mp_obj_t uhashlib_sha1_digest(mp_obj_t self_in) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
+    uhashlib_ensure_not_final(self);
+    self->final = true;
     vstr_t vstr;
     vstr_init_len(&vstr, SHA1_SIZE);
     SHA1_Final((byte *)vstr.buf, (SHA1_CTX *)self->state);
@@ -196,6 +215,7 @@ STATIC mp_obj_t uhashlib_sha1_make_new(const mp_obj_type_t *type, size_t n_args,
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
     mp_obj_hash_t *o = m_new_obj_var(mp_obj_hash_t, char, sizeof(mbedtls_sha1_context));
     o->base.type = type;
+    o->final = false;
     mbedtls_sha1_init((mbedtls_sha1_context *)o->state);
     mbedtls_sha1_starts_ret((mbedtls_sha1_context *)o->state);
     if (n_args == 1) {
@@ -206,6 +226,7 @@ STATIC mp_obj_t uhashlib_sha1_make_new(const mp_obj_type_t *type, size_t n_args,
 
 STATIC mp_obj_t uhashlib_sha1_update(mp_obj_t self_in, mp_obj_t arg) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
+    uhashlib_ensure_not_final(self);
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(arg, &bufinfo, MP_BUFFER_READ);
     mbedtls_sha1_update_ret((mbedtls_sha1_context *)self->state, bufinfo.buf, bufinfo.len);
@@ -214,6 +235,8 @@ STATIC mp_obj_t uhashlib_sha1_update(mp_obj_t self_in, mp_obj_t arg) {
 
 STATIC mp_obj_t uhashlib_sha1_digest(mp_obj_t self_in) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
+    uhashlib_ensure_not_final(self);
+    self->final = true;
     vstr_t vstr;
     vstr_init_len(&vstr, 20);
     mbedtls_sha1_finish_ret((mbedtls_sha1_context *)self->state, (byte *)vstr.buf);
@@ -247,6 +270,7 @@ STATIC mp_obj_t uhashlib_md5_make_new(const mp_obj_type_t *type, size_t n_args,
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
     mp_obj_hash_t *o = m_new_obj_var(mp_obj_hash_t, char, sizeof(MD5_CTX));
     o->base.type = type;
+    o->final = false;
     MD5_Init((MD5_CTX *)o->state);
     if (n_args == 1) {
         uhashlib_md5_update(MP_OBJ_FROM_PTR(o), args[0]);
@@ -256,6 +280,7 @@ STATIC mp_obj_t uhashlib_md5_make_new(const mp_obj_type_t *type, size_t n_args,
 
 STATIC mp_obj_t uhashlib_md5_update(mp_obj_t self_in, mp_obj_t arg) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
+    uhashlib_ensure_not_final(self);
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(arg, &bufinfo, MP_BUFFER_READ);
     MD5_Update((MD5_CTX *)self->state, bufinfo.buf, bufinfo.len);
@@ -264,6 +289,8 @@ STATIC mp_obj_t uhashlib_md5_update(mp_obj_t self_in, mp_obj_t arg) {
 
 STATIC mp_obj_t uhashlib_md5_digest(mp_obj_t self_in) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
+    uhashlib_ensure_not_final(self);
+    self->final = true;
     vstr_t vstr;
     vstr_init_len(&vstr, MD5_SIZE);
     MD5_Final((byte *)vstr.buf, (MD5_CTX *)self->state);
@@ -283,6 +310,7 @@ STATIC mp_obj_t uhashlib_md5_make_new(const mp_obj_type_t *type, size_t n_args,
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
     mp_obj_hash_t *o = m_new_obj_var(mp_obj_hash_t, char, sizeof(mbedtls_md5_context));
     o->base.type = type;
+    o->final = false;
     mbedtls_md5_init((mbedtls_md5_context *)o->state);
     mbedtls_md5_starts_ret((mbedtls_md5_context *)o->state);
     if (n_args == 1) {
@@ -293,6 +321,7 @@ STATIC mp_obj_t uhashlib_md5_make_new(const mp_obj_type_t *type, size_t n_args,
 
 STATIC mp_obj_t uhashlib_md5_update(mp_obj_t self_in, mp_obj_t arg) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
+    uhashlib_ensure_not_final(self);
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(arg, &bufinfo, MP_BUFFER_READ);
     mbedtls_md5_update_ret((mbedtls_md5_context *)self->state, bufinfo.buf, bufinfo.len);
@@ -301,6 +330,8 @@ STATIC mp_obj_t uhashlib_md5_update(mp_obj_t self_in, mp_obj_t arg) {
 
 STATIC mp_obj_t uhashlib_md5_digest(mp_obj_t self_in) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
+    uhashlib_ensure_not_final(self);
+    self->final = true;
     vstr_t vstr;
     vstr_init_len(&vstr, 16);
     mbedtls_md5_finish_ret((mbedtls_md5_context *)self->state, (byte *)vstr.buf);
diff --git a/tests/extmod/uhashlib_final.py b/tests/extmod/uhashlib_final.py
new file mode 100644
index 0000000000..f562cc1780
--- /dev/null
+++ b/tests/extmod/uhashlib_final.py
@@ -0,0 +1,35 @@
+try:
+    import uhashlib
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+
+for algo_name in ("md5", "sha1", "sha256"):
+    algo = getattr(uhashlib, algo_name, None)
+    if not algo:
+        continue
+
+    # Running .digest() several times in row is not supported.
+    h = algo(b"123")
+    h.digest()
+    try:
+        h.digest()
+        print("fail")
+    except ValueError:
+        # Expected path, don't print anything so test output is the
+        # same even if the algorithm is not implemented on the port.
+        pass
+
+    # Partial digests are not supported.
+    h = algo(b"123")
+    h.digest()
+    try:
+        h.update(b"456")
+        print("fail")
+    except ValueError:
+        # Expected path, don't print anything so test output is the
+        # same even if the algorithm is not implemented on the port.
+        pass
+
+print("done")
diff --git a/tests/extmod/uhashlib_final.py.exp b/tests/extmod/uhashlib_final.py.exp
new file mode 100644
index 0000000000..19f86f493a
--- /dev/null
+++ b/tests/extmod/uhashlib_final.py.exp
@@ -0,0 +1 @@
+done

From 62f75376dd6932a694569e2b7a8701b3a6b13a77 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 26 May 2021 22:37:27 +1000
Subject: [PATCH 156/349] stm32/boards/NUCLEO_L432KC: Fix FS size and enable
 LFS1 filesystem.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h  | 2 +-
 ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.mk | 1 +
 ports/stm32/boards/stm32l432.ld                   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
index 0a3ac1f185..0f1134491f 100644
--- a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
@@ -13,13 +13,13 @@
 #define MICROPY_PY_UHEAPQ           (0)
 #define MICROPY_PY_UTIMEQ           (0)
 
-#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
 #define MICROPY_HW_ENABLE_RTC       (1)
 #define MICROPY_HW_ENABLE_ADC       (1)
 #define MICROPY_HW_ENABLE_DAC       (1)
 #define MICROPY_HW_ENABLE_USB       (0) // requires a custom USB connector on PA11/PA12
 #define MICROPY_HW_ENABLE_TIMER     (1)
 #define MICROPY_HW_HAS_SWITCH       (0)
+#define MICROPY_HW_HAS_FLASH        (1)
 
 // MSI is used and is 4MHz
 #define MICROPY_HW_CLK_PLLM (1)
diff --git a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.mk
index 6e220a4370..a87b4710e7 100644
--- a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.mk
@@ -6,6 +6,7 @@ OPENOCD_CONFIG = boards/openocd_stm32l4.cfg
 
 # MicroPython settings
 MICROPY_VFS_FAT = 0
+MICROPY_VFS_LFS1 ?= 1
 
 # Don't include default frozen modules because MCU is tight on flash space
 FROZEN_MANIFEST ?=
diff --git a/ports/stm32/boards/stm32l432.ld b/ports/stm32/boards/stm32l432.ld
index 4699543d66..469e834f91 100644
--- a/ports/stm32/boards/stm32l432.ld
+++ b/ports/stm32/boards/stm32l432.ld
@@ -6,7 +6,7 @@
 MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 230K /* sectors 0-114 */
-    FLASH_FS (r)    : ORIGIN = 0x08060000, LENGTH = 26K /* sectors 115-127 */
+    FLASH_FS (r)    : ORIGIN = 0x08039800, LENGTH = 26K /* sectors 115-127 */
     RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 64K /* SRAM1, 48K + SRAM2, 16K */
 }
 

From 211c3e41f12295f08a883ac326386ecb5bc8d68e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 27 May 2021 23:57:51 +1000
Subject: [PATCH 157/349] stm32/boards/PYBD_SF2: Disable GCC 11 warnings for
 array bounds.

With GCC 11 there is now a warning about array bounds of OTP-mac, due to
the OTP being a literal address.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/PYBD_SF2/board_init.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/stm32/boards/PYBD_SF2/board_init.c b/ports/stm32/boards/PYBD_SF2/board_init.c
index d1a0a09e7a..c3b54fa2f1 100644
--- a/ports/stm32/boards/PYBD_SF2/board_init.c
+++ b/ports/stm32/boards/PYBD_SF2/board_init.c
@@ -64,7 +64,15 @@ void board_sleep(int value) {
 void mp_hal_get_mac(int idx, uint8_t buf[6]) {
     // Check if OTP region has a valid MAC address, and use it if it does
     if (OTP->series == 0x00d1 && OTP->mac[0] == 'H' && OTP->mac[1] == 'J' && OTP->mac[2] == '0') {
+        #if __GNUC__ >= 11
+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Warray-bounds"
+        #pragma GCC diagnostic ignored "-Wstringop-overread"
+        #endif
         memcpy(buf, OTP->mac, 6);
+        #if __GNUC__ >= 11
+        #pragma GCC diagnostic pop
+        #endif
         buf[5] += idx;
         return;
     }

From 8e1892ac6f2f1acfcb257507d8350a8719fcb36f Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Mon, 26 Apr 2021 17:52:49 -0400
Subject: [PATCH 158/349] Implement RP2040 Alarm module

Adds light and deep sleep functionality for the TimeAlarm and PinAlarm
alarm categories. Adds board deinit for all platforms.
---
 locale/circuitpython.pot                      |   6 +
 .../boards/adafruit_feather_rp2040/board.c    |   3 +
 .../boards/adafruit_itsybitsy_rp2040/board.c  |   3 +
 .../boards/adafruit_qtpy_rp2040/board.c       |   3 +
 .../boards/pimoroni_keybow2040/board.c        |   6 +
 .../boards/pimoroni_picolipo_16mb/board.c     |   6 +
 .../boards/pimoroni_picolipo_4mb/board.c      |   6 +
 .../boards/pimoroni_picosystem/board.c        |   6 +
 .../boards/raspberry_pi_pico/board.c          |   3 +
 .../boards/sparkfun_pro_micro_rp2040/board.c  |   3 +
 .../boards/sparkfun_thing_plus_rp2040/board.c |   3 +
 .../common-hal/alarm/SleepMemory.c            |  63 +++++
 .../common-hal/alarm/SleepMemory.h            |  53 ++++
 ports/raspberrypi/common-hal/alarm/__init__.c | 241 ++++++++++++++++++
 ports/raspberrypi/common-hal/alarm/__init__.h |  42 +++
 .../common-hal/alarm/pin/PinAlarm.c           | 157 ++++++++++++
 .../common-hal/alarm/pin/PinAlarm.h           |  44 ++++
 .../common-hal/alarm/time/TimeAlarm.c         | 125 +++++++++
 .../common-hal/alarm/time/TimeAlarm.h         |  40 +++
 .../common-hal/alarm/touch/TouchAlarm.c       |  32 +++
 .../common-hal/alarm/touch/TouchAlarm.h       |  38 +++
 ports/raspberrypi/mpconfigport.mk             |   2 +
 22 files changed, 885 insertions(+)
 create mode 100644 ports/raspberrypi/common-hal/alarm/SleepMemory.c
 create mode 100644 ports/raspberrypi/common-hal/alarm/SleepMemory.h
 create mode 100644 ports/raspberrypi/common-hal/alarm/__init__.c
 create mode 100644 ports/raspberrypi/common-hal/alarm/__init__.h
 create mode 100644 ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c
 create mode 100644 ports/raspberrypi/common-hal/alarm/pin/PinAlarm.h
 create mode 100644 ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
 create mode 100644 ports/raspberrypi/common-hal/alarm/time/TimeAlarm.h
 create mode 100644 ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c
 create mode 100644 ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.h

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 1da8b1783c..c44573edd7 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -611,6 +611,10 @@ msgstr ""
 msgid "Can't set CCCD on local Characteristic"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
+msgid "Cannot alarm from RTC in deep sleep"
+msgstr ""
+
 #: shared-bindings/storage/__init__.c shared-bindings/usb_cdc/__init__.c
 #: shared-bindings/usb_hid/__init__.c shared-bindings/usb_midi/__init__.c
 msgid "Cannot change USB devices now"
@@ -1685,6 +1689,7 @@ msgstr ""
 
 #: ports/esp32s2/common-hal/alarm/time/TimeAlarm.c
 #: ports/nrf/common-hal/alarm/time/TimeAlarm.c
+#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
 #: ports/stm/common-hal/alarm/time/TimeAlarm.c
 msgid "Only one alarm.time alarm can be set."
 msgstr ""
@@ -2165,6 +2170,7 @@ msgstr ""
 msgid "Total data to write is larger than %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c
 #: ports/stm/common-hal/alarm/touch/TouchAlarm.c
 msgid "Touch alarms not available"
 msgstr ""
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040/board.c b/ports/raspberrypi/boards/adafruit_feather_rp2040/board.c
index c4021a83e9..eac54ce460 100644
--- a/ports/raspberrypi/boards/adafruit_feather_rp2040/board.c
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040/board.c
@@ -38,3 +38,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/adafruit_itsybitsy_rp2040/board.c b/ports/raspberrypi/boards/adafruit_itsybitsy_rp2040/board.c
index e05589883d..0b44184082 100644
--- a/ports/raspberrypi/boards/adafruit_itsybitsy_rp2040/board.c
+++ b/ports/raspberrypi/boards/adafruit_itsybitsy_rp2040/board.c
@@ -42,3 +42,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/adafruit_qtpy_rp2040/board.c b/ports/raspberrypi/boards/adafruit_qtpy_rp2040/board.c
index 332145ab84..431b1ad0e7 100644
--- a/ports/raspberrypi/boards/adafruit_qtpy_rp2040/board.c
+++ b/ports/raspberrypi/boards/adafruit_qtpy_rp2040/board.c
@@ -42,3 +42,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/pimoroni_keybow2040/board.c b/ports/raspberrypi/boards/pimoroni_keybow2040/board.c
index 67486d4c23..492703e3a1 100644
--- a/ports/raspberrypi/boards/pimoroni_keybow2040/board.c
+++ b/ports/raspberrypi/boards/pimoroni_keybow2040/board.c
@@ -35,3 +35,9 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/pimoroni_picolipo_16mb/board.c b/ports/raspberrypi/boards/pimoroni_picolipo_16mb/board.c
index 67486d4c23..492703e3a1 100644
--- a/ports/raspberrypi/boards/pimoroni_picolipo_16mb/board.c
+++ b/ports/raspberrypi/boards/pimoroni_picolipo_16mb/board.c
@@ -35,3 +35,9 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/pimoroni_picolipo_4mb/board.c b/ports/raspberrypi/boards/pimoroni_picolipo_4mb/board.c
index 67486d4c23..492703e3a1 100644
--- a/ports/raspberrypi/boards/pimoroni_picolipo_4mb/board.c
+++ b/ports/raspberrypi/boards/pimoroni_picolipo_4mb/board.c
@@ -35,3 +35,9 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/pimoroni_picosystem/board.c b/ports/raspberrypi/boards/pimoroni_picosystem/board.c
index 67486d4c23..492703e3a1 100644
--- a/ports/raspberrypi/boards/pimoroni_picosystem/board.c
+++ b/ports/raspberrypi/boards/pimoroni_picosystem/board.c
@@ -35,3 +35,9 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico/board.c b/ports/raspberrypi/boards/raspberry_pi_pico/board.c
index 67486d4c23..de6e424ed9 100644
--- a/ports/raspberrypi/boards/raspberry_pi_pico/board.c
+++ b/ports/raspberrypi/boards/raspberry_pi_pico/board.c
@@ -35,3 +35,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/sparkfun_pro_micro_rp2040/board.c b/ports/raspberrypi/boards/sparkfun_pro_micro_rp2040/board.c
index c4021a83e9..eac54ce460 100644
--- a/ports/raspberrypi/boards/sparkfun_pro_micro_rp2040/board.c
+++ b/ports/raspberrypi/boards/sparkfun_pro_micro_rp2040/board.c
@@ -38,3 +38,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/board.c b/ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/board.c
index c4021a83e9..eac54ce460 100644
--- a/ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/board.c
+++ b/ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/board.c
@@ -38,3 +38,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/common-hal/alarm/SleepMemory.c b/ports/raspberrypi/common-hal/alarm/SleepMemory.c
new file mode 100644
index 0000000000..4cf7abe305
--- /dev/null
+++ b/ports/raspberrypi/common-hal/alarm/SleepMemory.c
@@ -0,0 +1,63 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 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 <string.h>
+
+#include "py/runtime.h"
+#include "common-hal/alarm/SleepMemory.h"
+
+// Data storage for singleton instance of SleepMemory.
+// Might be RTC_SLOW_MEM or RTC_FAST_MEM, depending on setting of CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM.
+// static RTC_DATA_ATTR uint8_t _sleep_mem[SLEEP_MEMORY_LENGTH];
+
+void alarm_sleep_memory_reset(void) {
+    // ESP-IDF build system takes care of doing esp_sleep_pd_config() or the equivalentwith
+    // the correct settings, depending on which RTC mem we are using.
+    // https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/api-reference/system/sleep_modes.html#power-down-of-rtc-peripherals-and-memories
+}
+
+uint32_t common_hal_alarm_sleep_memory_get_length(alarm_sleep_memory_obj_t *self) {
+    return 0;//sizeof(_sleep_mem);
+}
+
+bool common_hal_alarm_sleep_memory_set_bytes(alarm_sleep_memory_obj_t *self, uint32_t start_index, const uint8_t *values, uint32_t len) {
+
+    // if (start_index + len > sizeof(_sleep_mem)) {
+    //     return false;
+    // }
+
+    // memcpy((uint8_t *)(_sleep_mem + start_index), values, len);
+    // return true;
+    return false;
+}
+
+void common_hal_alarm_sleep_memory_get_bytes(alarm_sleep_memory_obj_t *self, uint32_t start_index, uint8_t *values, uint32_t len) {
+
+    // if (start_index + len > sizeof(_sleep_mem)) {
+    //     return;
+    // }
+    // memcpy(values, (uint8_t *)(_sleep_mem + start_index), len);
+}
diff --git a/ports/raspberrypi/common-hal/alarm/SleepMemory.h b/ports/raspberrypi/common-hal/alarm/SleepMemory.h
new file mode 100644
index 0000000000..427fe30a8c
--- /dev/null
+++ b/ports/raspberrypi/common-hal/alarm/SleepMemory.h
@@ -0,0 +1,53 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 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.
+ */
+
+#ifndef MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ALARM_SLEEPMEMORY_H
+#define MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ALARM_SLEEPMEMORY_H
+
+#include "py/obj.h"
+
+// There are several places we could store persistent data for SleepMemory:
+//
+// RTC registers: There are a few 32-bit registers maintained during deep sleep.
+// We are already using one for saving sleep information during deep sleep.
+//
+// RTC Fast Memory: 8kB, also used for deep-sleep power-on stub.
+// RTC Slow Memory: 8kB, also used for the ULP (tiny co-processor available during sleep).
+//
+// The ESP-IDF build system takes care of the power management of these regions.
+// RTC_DATA_ATTR will allocate storage in RTC_SLOW_MEM unless CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM
+// is set. Any memory not allocated by us can be used by the ESP-IDF for heap or other purposes.
+
+// Use half of RTC_SLOW_MEM or RTC_FAST_MEM.
+#define SLEEP_MEMORY_LENGTH (4096)
+
+typedef struct {
+    mp_obj_base_t base;
+} alarm_sleep_memory_obj_t;
+
+extern void alarm_sleep_memory_reset(void);
+
+#endif // MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ALARM_SLEEPMEMORY_H
diff --git a/ports/raspberrypi/common-hal/alarm/__init__.c b/ports/raspberrypi/common-hal/alarm/__init__.c
new file mode 100644
index 0000000000..ebed6286cd
--- /dev/null
+++ b/ports/raspberrypi/common-hal/alarm/__init__.c
@@ -0,0 +1,241 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 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 "py/gc.h"
+#include "py/obj.h"
+#include "py/objtuple.h"
+#include "py/runtime.h"
+#include "lib/utils/interrupt_char.h"
+
+#include "shared-bindings/alarm/__init__.h"
+#include "shared-bindings/alarm/SleepMemory.h"
+#include "shared-bindings/alarm/pin/PinAlarm.h"
+#include "shared-bindings/alarm/time/TimeAlarm.h"
+#include "shared-bindings/alarm/touch/TouchAlarm.h"
+
+#include "shared-bindings/microcontroller/__init__.h"
+
+#include "supervisor/port.h"
+#include "supervisor/shared/workflow.h"
+
+#include "pico/stdlib.h"
+#include "hardware/sync.h"
+#include "hardware/clocks.h"
+#include "hardware/xosc.h"
+#include "hardware/structs/scb.h"
+#include "hardware/watchdog.h"
+#include "hardware/structs/watchdog.h"
+
+// XOSC shutdown
+#include "hardware/rtc.h"
+#include "hardware/pll.h"
+#include "hardware/regs/io_bank0.h"
+
+// Watchdog scratch register
+// Not used elsewhere in the SDK for now, keep an eye on it
+#define RP_WKUP_SCRATCH_REG 0
+
+// Turn off nonvolatile Busio and other wake-only peripherals
+// TODO: this only saves about 2mA right now, expand with other non-essentials
+const uint32_t RP_LIGHTSLEEP_EN0_MASK = ~(
+    CLOCKS_SLEEP_EN0_CLK_SYS_SPI1_BITS &
+    CLOCKS_SLEEP_EN0_CLK_PERI_SPI1_BITS &
+    CLOCKS_SLEEP_EN0_CLK_SYS_SPI0_BITS &
+    CLOCKS_SLEEP_EN0_CLK_PERI_SPI0_BITS &
+    CLOCKS_SLEEP_EN0_CLK_SYS_PWM_BITS &
+    CLOCKS_SLEEP_EN0_CLK_SYS_PIO1_BITS &
+    CLOCKS_SLEEP_EN0_CLK_SYS_PIO0_BITS &
+    CLOCKS_SLEEP_EN0_CLK_SYS_I2C1_BITS &
+    CLOCKS_SLEEP_EN0_CLK_SYS_I2C0_BITS &
+    CLOCKS_SLEEP_EN0_CLK_SYS_ADC_BITS &
+    CLOCKS_SLEEP_EN0_CLK_ADC_ADC_BITS
+    );
+
+// This bank has the USB clocks in it, leave it for now
+const uint32_t RP_LIGHTSLEEP_EN1_MASK = CLOCKS_SLEEP_EN1_RESET;
+
+STATIC void prepare_for_dormant_xosc(void);
+
+// Singleton instance of SleepMemory.
+const alarm_sleep_memory_obj_t alarm_sleep_memory_obj = {
+    .base = {
+        .type = &alarm_sleep_memory_type,
+    },
+};
+
+void alarm_reset(void) {
+    alarm_sleep_memory_reset();
+    alarm_pin_pinalarm_reset();
+    alarm_time_timealarm_reset();
+
+    // Reset the scratch source
+    watchdog_hw->scratch[RP_WKUP_SCRATCH_REG] = RP_SLEEP_WAKEUP_UNDEF;
+}
+
+STATIC uint8_t _get_wakeup_cause(void) {
+    // First check if the modules remember what last woke up
+    if (alarm_pin_pinalarm_woke_this_cycle()) {
+        return RP_SLEEP_WAKEUP_GPIO;
+    }
+    if (alarm_time_timealarm_woke_this_cycle()) {
+        return RP_SLEEP_WAKEUP_RTC;
+    }
+    // If waking from true deep sleep, modules will have lost their state,
+    // so check the deep wakeup cause manually
+    if (watchdog_hw->scratch[RP_WKUP_SCRATCH_REG] != RP_SLEEP_WAKEUP_UNDEF) {
+        return watchdog_hw->scratch[RP_WKUP_SCRATCH_REG];
+    }
+    return RP_SLEEP_WAKEUP_UNDEF;
+}
+
+// Set up light sleep or deep sleep alarms.
+STATIC void _setup_sleep_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms) {
+    alarm_pin_pinalarm_set_alarms(deep_sleep, n_alarms, alarms);
+    alarm_time_timealarm_set_alarms(deep_sleep, n_alarms, alarms);
+}
+
+bool common_hal_alarm_woken_from_sleep(void) {
+    return _get_wakeup_cause() != RP_SLEEP_WAKEUP_UNDEF;
+}
+
+mp_obj_t common_hal_alarm_create_wake_alarm(void) {
+    // If woken from deep sleep, create a copy alarm similar to what would have
+    // been passed in originally. Otherwise, just return none
+    uint8_t cause = _get_wakeup_cause();
+    switch (cause) {
+        case RP_SLEEP_WAKEUP_RTC: {
+            return alarm_time_timealarm_create_wakeup_alarm();
+        }
+
+        case RP_SLEEP_WAKEUP_GPIO: {
+            return alarm_pin_pinalarm_create_wakeup_alarm();
+        }
+
+        case RP_SLEEP_WAKEUP_UNDEF:
+        default:
+            // Not a deep sleep reset.
+            break;
+    }
+    return mp_const_none;
+}
+
+mp_obj_t common_hal_alarm_light_sleep_until_alarms(size_t n_alarms, const mp_obj_t *alarms) {
+    _setup_sleep_alarms(false, n_alarms, alarms);
+    // alarm_pin_pinalarm_light_reset();
+
+    mp_obj_t wake_alarm = mp_const_none;
+
+    while (!mp_hal_is_interrupted()) {
+        RUN_BACKGROUND_TASKS;
+        // Detect if interrupt was alarm or ctrl-C interrupt.
+        if (common_hal_alarm_woken_from_sleep()) {
+            uint8_t cause = _get_wakeup_cause();
+            switch (cause) {
+                case RP_SLEEP_WAKEUP_RTC: {
+                    wake_alarm = alarm_time_timealarm_find_triggered_alarm(n_alarms,alarms);
+                    break;
+                }
+                case RP_SLEEP_WAKEUP_GPIO: {
+                    wake_alarm = alarm_pin_pinalarm_find_triggered_alarm(n_alarms,alarms);
+                    break;
+                }
+                default:
+                    // Should not reach this, if all light sleep types are covered correctly
+                    break;
+            }
+            shared_alarm_save_wake_alarm(wake_alarm);
+            break;
+        }
+
+        // Prune the clock for sleep
+        clocks_hw->sleep_en0 &= RP_LIGHTSLEEP_EN0_MASK;
+        clocks_hw->sleep_en1 = RP_LIGHTSLEEP_EN1_MASK;
+        // port_idle_until_interrupt();
+
+        // Enable System Control Block (SCB) deep sleep
+        uint save = scb_hw->scr;
+        scb_hw->scr = save | M0PLUS_SCR_SLEEPDEEP_BITS;
+
+        __wfi();
+    }
+
+    if (mp_hal_is_interrupted()) {
+        return mp_const_none; // Shouldn't be given to python code because exception handling should kick in.
+    }
+
+    alarm_reset();
+    return wake_alarm;
+}
+
+void common_hal_alarm_set_deep_sleep_alarms(size_t n_alarms, const mp_obj_t *alarms) {
+    _setup_sleep_alarms(true, n_alarms, alarms);
+}
+
+void NORETURN common_hal_alarm_enter_deep_sleep(void) {
+    prepare_for_dormant_xosc();
+    xosc_dormant();
+    // // TODO: support ROSC when available in SDK
+    // rosc_set_dormant();
+
+    // Reset uses the watchdog. Use scratch registers to store wake reason
+    watchdog_hw->scratch[RP_WKUP_SCRATCH_REG] = _get_wakeup_cause();
+    reset_cpu();
+}
+
+void common_hal_alarm_gc_collect(void) {
+    gc_collect_ptr(shared_alarm_get_wake_alarm());
+}
+
+STATIC void prepare_for_dormant_xosc(void) {
+    // TODO: add ROSC support with sleep_run_from_dormant_source when it's added to SDK
+    uint src_hz = XOSC_MHZ * MHZ;
+    uint clk_ref_src = CLOCKS_CLK_REF_CTRL_SRC_VALUE_XOSC_CLKSRC;
+    clock_configure(clk_ref,
+        clk_ref_src,
+        0,         // No aux mux
+        src_hz,
+        src_hz);
+    clock_configure(clk_sys,
+        CLOCKS_CLK_SYS_CTRL_SRC_VALUE_CLK_REF,
+        0,             // Using glitchless mux
+        src_hz,
+        src_hz);
+    clock_stop(clk_usb);
+    clock_stop(clk_adc);
+    uint clk_rtc_src = CLOCKS_CLK_RTC_CTRL_AUXSRC_VALUE_XOSC_CLKSRC;
+    clock_configure(clk_rtc,
+        0,         // No GLMUX
+        clk_rtc_src,
+        src_hz,
+        46875);
+    clock_configure(clk_peri,
+        0,
+        CLOCKS_CLK_PERI_CTRL_AUXSRC_VALUE_CLK_SYS,
+        src_hz,
+        src_hz);
+    pll_deinit(pll_sys);
+    pll_deinit(pll_usb);
+}
diff --git a/ports/raspberrypi/common-hal/alarm/__init__.h b/ports/raspberrypi/common-hal/alarm/__init__.h
new file mode 100644
index 0000000000..3d5d86f8dc
--- /dev/null
+++ b/ports/raspberrypi/common-hal/alarm/__init__.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 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.
+ */
+
+#ifndef MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ALARM__INIT__H
+#define MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ALARM__INIT__H
+
+#include "common-hal/alarm/SleepMemory.h"
+
+#include "hardware/regs/clocks.h"
+
+#define RP_SLEEP_WAKEUP_UNDEF   0
+#define RP_SLEEP_WAKEUP_GPIO    1
+#define RP_SLEEP_WAKEUP_RTC     2
+
+extern const alarm_sleep_memory_obj_t alarm_sleep_memory_obj;
+
+extern void alarm_reset(void);
+
+#endif // MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ALARM__INIT__H
diff --git a/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c b/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c
new file mode 100644
index 0000000000..72958ced87
--- /dev/null
+++ b/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c
@@ -0,0 +1,157 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 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 "py/runtime.h"
+
+#include "shared-bindings/alarm/pin/PinAlarm.h"
+#include "shared-bindings/microcontroller/__init__.h"
+#include "common-hal/microcontroller/__init__.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+#include "pico/stdlib.h"
+#include "hardware/gpio.h"
+#include "hardware/structs/iobank0.h"
+
+STATIC bool woke_up;
+STATIC uint64_t alarm_triggered_pins; // 36 actual pins
+STATIC uint64_t alarm_reserved_pins; // 36 actual pins
+
+#define GPIO_IRQ_ALL_EVENTS 0x15u
+
+void gpio_callback(uint gpio, uint32_t events) {
+    alarm_triggered_pins |= (1 << gpio);
+    woke_up = true;
+
+    // does this need to be called, to prevent IRQ from constantly going off?
+    gpio_acknowledge_irq(gpio, events);
+
+    // Disable IRQ automatically
+    gpio_set_irq_enabled(gpio, events, false);
+    gpio_set_dormant_irq_enabled(gpio, events, false);
+}
+
+void common_hal_alarm_pin_pinalarm_construct(alarm_pin_pinalarm_obj_t *self, const mcu_pin_obj_t *pin, bool value, bool edge, bool pull) {
+    self->pin = pin;
+    self->value = value;
+    self->edge = edge;
+    self->pull = pull;
+}
+
+const mcu_pin_obj_t *common_hal_alarm_pin_pinalarm_get_pin(alarm_pin_pinalarm_obj_t *self) {
+    return self->pin;
+}
+
+bool common_hal_alarm_pin_pinalarm_get_value(alarm_pin_pinalarm_obj_t *self) {
+    return self->value;
+}
+
+bool common_hal_alarm_pin_pinalarm_get_edge(alarm_pin_pinalarm_obj_t *self) {
+    return self->edge;
+}
+
+bool common_hal_alarm_pin_pinalarm_get_pull(alarm_pin_pinalarm_obj_t *self) {
+    return self->pull;
+}
+
+bool alarm_pin_pinalarm_woke_this_cycle(void) {
+    return woke_up;
+}
+
+mp_obj_t alarm_pin_pinalarm_find_triggered_alarm(size_t n_alarms, const mp_obj_t *alarms) {
+    for (size_t i = 0; i < n_alarms; i++) {
+        if (!mp_obj_is_type(alarms[i], &alarm_pin_pinalarm_type)) {
+            continue;
+        }
+        alarm_pin_pinalarm_obj_t *alarm = MP_OBJ_TO_PTR(alarms[i]);
+        if (alarm_triggered_pins & (1 << alarm->pin->number)) {
+            return alarms[i];
+        }
+    }
+    return mp_const_none;
+}
+
+mp_obj_t alarm_pin_pinalarm_create_wakeup_alarm(void) {
+    alarm_pin_pinalarm_obj_t *alarm = m_new_obj(alarm_pin_pinalarm_obj_t);
+    alarm->base.type = &alarm_pin_pinalarm_type;
+    // TODO: how to obtain the correct pin from memory?
+    return alarm;
+}
+
+void alarm_pin_pinalarm_reset(void) {
+    alarm_triggered_pins = 0;
+    woke_up = false;
+
+    // Clear all GPIO interrupts
+    for (uint8_t i = 0; i < 4; i++) {
+        iobank0_hw->intr[i] = 0;
+    }
+
+    // Reset pins and pin IRQs
+    for (size_t i = 0; i < TOTAL_GPIO_COUNT; i++) {
+        if (alarm_reserved_pins & (1 << i)) {
+            gpio_set_irq_enabled(i, GPIO_IRQ_ALL_EVENTS, false);
+            reset_pin_number(i);
+        }
+    }
+    alarm_reserved_pins = 0;
+}
+
+void alarm_pin_pinalarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms) {
+    for (size_t i = 0; i < n_alarms; i++) {
+        if (mp_obj_is_type(alarms[i], &alarm_pin_pinalarm_type)) {
+            alarm_pin_pinalarm_obj_t *alarm = MP_OBJ_TO_PTR(alarms[i]);
+
+            gpio_init(alarm->pin->number);
+            if (alarm->pull) {
+                // If value is high, the pullup should be off, and vice versa
+                gpio_set_pulls(alarm->pin->number, !alarm->value, alarm->value);
+            } else {
+                // Clear in case the pulls are already on
+                gpio_set_pulls(alarm->pin->number, false, false);
+            }
+            gpio_set_dir(alarm->pin->number, GPIO_IN);
+            // Don't reset at end of VM (instead, pinalarm_reset will reset before next VM)
+            common_hal_never_reset_pin(alarm->pin);
+            alarm_reserved_pins |= (1 << alarm->pin->number);
+
+            uint32_t event;
+            if (alarm->value == true && alarm->edge == true) {
+                event = GPIO_IRQ_EDGE_RISE;
+            } else if (alarm->value == false && alarm->edge == true) {
+                event = GPIO_IRQ_EDGE_FALL;
+            } else if (alarm->value == true && alarm->edge == false) {
+                event = GPIO_IRQ_LEVEL_HIGH;
+            } else { // both false
+                event = GPIO_IRQ_LEVEL_LOW;
+            }
+
+            gpio_set_irq_enabled_with_callback((uint)alarm->pin->number, event, true, &gpio_callback);
+            if (deep_sleep) {
+                gpio_set_dormant_irq_enabled((uint)alarm->pin->number, event, true);
+            }
+        }
+    }
+}
diff --git a/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.h b/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.h
new file mode 100644
index 0000000000..cd1a21fd0d
--- /dev/null
+++ b/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.h
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 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 "py/obj.h"
+#include "py/objtuple.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    const mcu_pin_obj_t *pin;
+    bool value;
+    bool pull;
+    bool edge;
+} alarm_pin_pinalarm_obj_t;
+
+mp_obj_t alarm_pin_pinalarm_find_triggered_alarm(size_t n_alarms, const mp_obj_t *alarms);
+mp_obj_t alarm_pin_pinalarm_create_wakeup_alarm(void);
+
+void alarm_pin_pinalarm_reset(void);
+void alarm_pin_pinalarm_light_reset(void);
+void alarm_pin_pinalarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms);
+bool alarm_pin_pinalarm_woke_this_cycle(void);
diff --git a/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c b/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
new file mode 100644
index 0000000000..cb09b2a306
--- /dev/null
+++ b/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
@@ -0,0 +1,125 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 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 "py/runtime.h"
+
+#include "shared-bindings/alarm/time/TimeAlarm.h"
+#include "shared-bindings/time/__init__.h"
+
+#include "lib/timeutils/timeutils.h"
+
+#include "hardware/gpio.h"
+#include "hardware/rtc.h"
+
+STATIC bool woke_up = false;
+
+void timer_callback(void) {
+    woke_up = true;
+}
+
+void common_hal_alarm_time_timealarm_construct(alarm_time_timealarm_obj_t *self, mp_float_t monotonic_time) {
+    self->monotonic_time = monotonic_time;
+}
+
+mp_float_t common_hal_alarm_time_timealarm_get_monotonic_time(alarm_time_timealarm_obj_t *self) {
+    return self->monotonic_time;
+}
+
+mp_obj_t alarm_time_timealarm_find_triggered_alarm(size_t n_alarms, const mp_obj_t *alarms) {
+    for (size_t i = 0; i < n_alarms; i++) {
+        if (mp_obj_is_type(alarms[i], &alarm_time_timealarm_type)) {
+            return alarms[i];
+        }
+    }
+    return mp_const_none;
+}
+
+mp_obj_t alarm_time_timealarm_create_wakeup_alarm(void) {
+    alarm_time_timealarm_obj_t *timer = m_new_obj(alarm_time_timealarm_obj_t);
+    timer->base.type = &alarm_time_timealarm_type;
+    // TODO: Set monotonic_time based on the RTC state.
+    timer->monotonic_time = 0.0f;
+    return timer;
+}
+
+bool alarm_time_timealarm_woke_this_cycle(void) {
+    return woke_up;
+}
+
+void alarm_time_timealarm_reset(void) {
+    rtc_disable_alarm();
+    woke_up = false;
+}
+
+void alarm_time_timealarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms) {
+    bool timealarm_set = false;
+    alarm_time_timealarm_obj_t *timealarm = MP_OBJ_NULL;
+
+    for (size_t i = 0; i < n_alarms; i++) {
+        if (!mp_obj_is_type(alarms[i], &alarm_time_timealarm_type)) {
+            continue;
+        }
+        if (timealarm_set) {
+            mp_raise_ValueError(translate("Only one alarm.time alarm can be set."));
+        }
+        timealarm = MP_OBJ_TO_PTR(alarms[i]);
+        timealarm_set = true;
+    }
+    if (!timealarm_set) {
+        return;
+    }
+    if (deep_sleep) {
+        mp_raise_ValueError(translate("Cannot alarm from RTC in deep sleep"));
+    }
+
+    // Compute how long to actually sleep, considering the time now.
+    mp_float_t mono_seconds_to_date = uint64_to_float(common_hal_time_monotonic_ms()) / 1000.0f;
+    mp_float_t wakeup_in_secs = MAX(0.0f, timealarm->monotonic_time - mono_seconds_to_date);
+    datetime_t t;
+
+    rtc_get_datetime(&t);
+
+    uint32_t rtc_seconds_to_date = timeutils_seconds_since_2000(t.year, t.month,
+        t.day, t.hour, t.min, t.sec);
+
+    // The float value is always slightly under, so add 1 to compensate
+    uint32_t alarm_seconds = rtc_seconds_to_date + (uint32_t)wakeup_in_secs + 1;
+    timeutils_struct_time_t tm;
+    timeutils_seconds_since_2000_to_struct_time(alarm_seconds, &tm);
+
+    // reuse t
+    t.hour = tm.tm_hour;
+    t.min = tm.tm_min;
+    t.sec = tm.tm_sec;
+    t.day = tm.tm_mday;
+    t.month = tm.tm_mon;
+    t.year = tm.tm_year;
+    t.dotw = (tm.tm_wday + 1) % 7;
+
+    rtc_set_alarm(&t, &timer_callback);
+
+    woke_up = false;
+}
diff --git a/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.h b/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.h
new file mode 100644
index 0000000000..233a881e6e
--- /dev/null
+++ b/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.h
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 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 "py/obj.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    mp_float_t monotonic_time;
+} alarm_time_timealarm_obj_t;
+
+mp_obj_t alarm_time_timealarm_find_triggered_alarm(size_t n_alarms, const mp_obj_t *alarms);
+mp_obj_t alarm_time_timealarm_create_wakeup_alarm(void);
+
+void alarm_time_timealarm_reset(void);
+void alarm_time_timealarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms);
+bool alarm_time_timealarm_woke_this_cycle(void);
diff --git a/ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c b/ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c
new file mode 100644
index 0000000000..88c73726ee
--- /dev/null
+++ b/ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c
@@ -0,0 +1,32 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 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 "shared-bindings/alarm/touch/TouchAlarm.h"
+#include "shared-bindings/microcontroller/__init__.h"
+
+void common_hal_alarm_touch_touchalarm_construct(alarm_touch_touchalarm_obj_t *self, const mcu_pin_obj_t *pin) {
+    mp_raise_NotImplementedError(translate("Touch alarms not available"));
+}
diff --git a/ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.h b/ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.h
new file mode 100644
index 0000000000..f631293511
--- /dev/null
+++ b/ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.h
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 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.
+ */
+
+#ifndef MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ALARM_TOUCH_TOUCHALARM_H
+#define MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ALARM_TOUCH_TOUCHALARM_H
+
+#include "py/obj.h"
+#include "common-hal/microcontroller/Pin.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    const mcu_pin_obj_t *pin;
+} alarm_touch_touchalarm_obj_t;
+
+#endif  // MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ALARM_TOUCH_TOUCHALARM_H
diff --git a/ports/raspberrypi/mpconfigport.mk b/ports/raspberrypi/mpconfigport.mk
index 8bc70ed638..cdb8769bfc 100644
--- a/ports/raspberrypi/mpconfigport.mk
+++ b/ports/raspberrypi/mpconfigport.mk
@@ -17,6 +17,8 @@ endif
 # All raspberrypi ports have longints.
 LONGINT_IMPL = MPZ
 
+CIRCUITPY_ALARM ?= 1
+
 CIRCUITPY_RP2PIO ?= 1
 CIRCUITPY_NEOPIXEL_WRITE ?= $(CIRCUITPY_RP2PIO)
 CIRCUITPY_FRAMEBUFFERIO ?= 1

From db8704ecbd910e598fba4bc1817acf91d9da79e3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 28 May 2021 00:09:34 +1000
Subject: [PATCH 159/349] esp8266,esp32: Update manifest to point to new dirs
 in micropython-lib.

Following a refactoring of micropython-lib.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/manifest_release.py   |  9 +++++----
 ports/esp8266/boards/GENERIC/manifest.py | 10 +++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ports/esp32/boards/manifest_release.py b/ports/esp32/boards/manifest_release.py
index b5c7cd111b..8b9bcde6ff 100644
--- a/ports/esp32/boards/manifest_release.py
+++ b/ports/esp32/boards/manifest_release.py
@@ -1,6 +1,7 @@
 include("manifest.py")
 
-freeze("$(MPY_LIB_DIR)/upysh", "upysh.py")
-freeze("$(MPY_LIB_DIR)/urequests", "urequests.py")
-freeze("$(MPY_LIB_DIR)/umqtt.simple", "umqtt/simple.py")
-freeze("$(MPY_LIB_DIR)/umqtt.robust", "umqtt/robust.py")
+freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
+
+freeze("$(MPY_LIB_DIR)/micropython/upysh", "upysh.py")
+freeze("$(MPY_LIB_DIR)/micropython/umqtt.simple", "umqtt/simple.py")
+freeze("$(MPY_LIB_DIR)/micropython/umqtt.robust", "umqtt/robust.py")
diff --git a/ports/esp8266/boards/GENERIC/manifest.py b/ports/esp8266/boards/GENERIC/manifest.py
index 46f3b837be..9ce3ffe3aa 100644
--- a/ports/esp8266/boards/GENERIC/manifest.py
+++ b/ports/esp8266/boards/GENERIC/manifest.py
@@ -10,12 +10,12 @@ freeze("$(MPY_DIR)/drivers/display", "ssd1306.py")
 # Libraries from micropython-lib, include only if the library directory exists
 if os.path.isdir(convert_path("$(MPY_LIB_DIR)")):
     # file utilities
-    freeze("$(MPY_LIB_DIR)/upysh", "upysh.py")
+    freeze("$(MPY_LIB_DIR)/micropython/upysh", "upysh.py")
 
     # requests
-    freeze("$(MPY_LIB_DIR)/urequests", "urequests.py")
-    freeze("$(MPY_LIB_DIR)/urllib.urequest", "urllib/urequest.py")
+    freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
+    freeze("$(MPY_LIB_DIR)/micropython/urllib.urequest", "urllib/urequest.py")
 
     # umqtt
-    freeze("$(MPY_LIB_DIR)/umqtt.simple", "umqtt/simple.py")
-    freeze("$(MPY_LIB_DIR)/umqtt.robust", "umqtt/robust.py")
+    freeze("$(MPY_LIB_DIR)/micropython/umqtt.simple", "umqtt/simple.py")
+    freeze("$(MPY_LIB_DIR)/micropython/umqtt.robust", "umqtt/robust.py")

From feff243e8fe84be080a8265c21d79606b2437a65 Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Fri, 28 May 2021 13:52:05 -0400
Subject: [PATCH 160/349] Add RTC deep sleep alarm support

---
 locale/circuitpython.pot                      |  4 --
 .../common-hal/alarm/SleepMemory.c            |  2 +-
 ports/raspberrypi/common-hal/alarm/__init__.c | 49 +++++++++++++------
 .../common-hal/alarm/pin/PinAlarm.c           |  7 +++
 .../common-hal/alarm/pin/PinAlarm.h           |  1 +
 .../common-hal/alarm/time/TimeAlarm.c         |  7 ++-
 .../common-hal/alarm/time/TimeAlarm.h         |  1 +
 7 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 5198c7d924..a710b1effb 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -611,10 +611,6 @@ msgstr ""
 msgid "Can't set CCCD on local Characteristic"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
-msgid "Cannot alarm from RTC in deep sleep"
-msgstr ""
-
 #: shared-bindings/storage/__init__.c shared-bindings/usb_cdc/__init__.c
 #: shared-bindings/usb_hid/__init__.c shared-bindings/usb_midi/__init__.c
 msgid "Cannot change USB devices now"
diff --git a/ports/raspberrypi/common-hal/alarm/SleepMemory.c b/ports/raspberrypi/common-hal/alarm/SleepMemory.c
index 4cf7abe305..a444cbf207 100644
--- a/ports/raspberrypi/common-hal/alarm/SleepMemory.c
+++ b/ports/raspberrypi/common-hal/alarm/SleepMemory.c
@@ -40,7 +40,7 @@ void alarm_sleep_memory_reset(void) {
 }
 
 uint32_t common_hal_alarm_sleep_memory_get_length(alarm_sleep_memory_obj_t *self) {
-    return 0;//sizeof(_sleep_mem);
+    return 0;// sizeof(_sleep_mem);
 }
 
 bool common_hal_alarm_sleep_memory_set_bytes(alarm_sleep_memory_obj_t *self, uint32_t start_index, const uint8_t *values, uint32_t len) {
diff --git a/ports/raspberrypi/common-hal/alarm/__init__.c b/ports/raspberrypi/common-hal/alarm/__init__.c
index ebed6286cd..7f22242e9f 100644
--- a/ports/raspberrypi/common-hal/alarm/__init__.c
+++ b/ports/raspberrypi/common-hal/alarm/__init__.c
@@ -58,25 +58,31 @@
 // Not used elsewhere in the SDK for now, keep an eye on it
 #define RP_WKUP_SCRATCH_REG 0
 
-// Turn off nonvolatile Busio and other wake-only peripherals
+// Light sleep turns off nonvolatile Busio and other wake-only peripherals
 // TODO: this only saves about 2mA right now, expand with other non-essentials
 const uint32_t RP_LIGHTSLEEP_EN0_MASK = ~(
-    CLOCKS_SLEEP_EN0_CLK_SYS_SPI1_BITS &
-    CLOCKS_SLEEP_EN0_CLK_PERI_SPI1_BITS &
-    CLOCKS_SLEEP_EN0_CLK_SYS_SPI0_BITS &
-    CLOCKS_SLEEP_EN0_CLK_PERI_SPI0_BITS &
-    CLOCKS_SLEEP_EN0_CLK_SYS_PWM_BITS &
-    CLOCKS_SLEEP_EN0_CLK_SYS_PIO1_BITS &
-    CLOCKS_SLEEP_EN0_CLK_SYS_PIO0_BITS &
-    CLOCKS_SLEEP_EN0_CLK_SYS_I2C1_BITS &
-    CLOCKS_SLEEP_EN0_CLK_SYS_I2C0_BITS &
-    CLOCKS_SLEEP_EN0_CLK_SYS_ADC_BITS &
+    CLOCKS_SLEEP_EN0_CLK_SYS_SPI1_BITS |
+    CLOCKS_SLEEP_EN0_CLK_PERI_SPI1_BITS |
+    CLOCKS_SLEEP_EN0_CLK_SYS_SPI0_BITS |
+    CLOCKS_SLEEP_EN0_CLK_PERI_SPI0_BITS |
+    CLOCKS_SLEEP_EN0_CLK_SYS_PWM_BITS |
+    CLOCKS_SLEEP_EN0_CLK_SYS_PIO1_BITS |
+    CLOCKS_SLEEP_EN0_CLK_SYS_PIO0_BITS |
+    CLOCKS_SLEEP_EN0_CLK_SYS_I2C1_BITS |
+    CLOCKS_SLEEP_EN0_CLK_SYS_I2C0_BITS |
+    CLOCKS_SLEEP_EN0_CLK_SYS_ADC_BITS |
     CLOCKS_SLEEP_EN0_CLK_ADC_ADC_BITS
     );
-
 // This bank has the USB clocks in it, leave it for now
 const uint32_t RP_LIGHTSLEEP_EN1_MASK = CLOCKS_SLEEP_EN1_RESET;
 
+// Light sleeps used for TimeAlarm deep sleep turn off almost everything
+const uint32_t RP_LIGHTSLEEP_EN0_MASK_HARSH = (
+    CLOCKS_SLEEP_EN0_CLK_RTC_RTC_BITS |
+    CLOCKS_SLEEP_EN0_CLK_SYS_PADS_BITS
+    );
+const uint32_t RP_LIGHTSLEEP_EN1_MASK_HARSH = 0x0;
+
 STATIC void prepare_for_dormant_xosc(void);
 
 // Singleton instance of SleepMemory.
@@ -144,7 +150,6 @@ mp_obj_t common_hal_alarm_create_wake_alarm(void) {
 
 mp_obj_t common_hal_alarm_light_sleep_until_alarms(size_t n_alarms, const mp_obj_t *alarms) {
     _setup_sleep_alarms(false, n_alarms, alarms);
-    // alarm_pin_pinalarm_light_reset();
 
     mp_obj_t wake_alarm = mp_const_none;
 
@@ -173,7 +178,6 @@ mp_obj_t common_hal_alarm_light_sleep_until_alarms(size_t n_alarms, const mp_obj
         // Prune the clock for sleep
         clocks_hw->sleep_en0 &= RP_LIGHTSLEEP_EN0_MASK;
         clocks_hw->sleep_en1 = RP_LIGHTSLEEP_EN1_MASK;
-        // port_idle_until_interrupt();
 
         // Enable System Control Block (SCB) deep sleep
         uint save = scb_hw->scr;
@@ -195,8 +199,21 @@ void common_hal_alarm_set_deep_sleep_alarms(size_t n_alarms, const mp_obj_t *ala
 }
 
 void NORETURN common_hal_alarm_enter_deep_sleep(void) {
-    prepare_for_dormant_xosc();
-    xosc_dormant();
+    bool timealarm_set = alarm_time_timealarm_is_set();
+
+    // If there's a timealarm, just enter a very deep light sleep
+    if (timealarm_set) {
+        // Prune the clock for sleep
+        clocks_hw->sleep_en0 &= RP_LIGHTSLEEP_EN0_MASK_HARSH;
+        clocks_hw->sleep_en1 = RP_LIGHTSLEEP_EN1_MASK_HARSH;
+        // Enable System Control Block (SCB) deep sleep
+        uint save = scb_hw->scr;
+        scb_hw->scr = save | M0PLUS_SCR_SLEEPDEEP_BITS;
+        __wfi();
+    } else {
+        prepare_for_dormant_xosc();
+        xosc_dormant();
+    }
     // // TODO: support ROSC when available in SDK
     // rosc_set_dormant();
 
diff --git a/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c b/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c
index 72958ced87..276e2e409a 100644
--- a/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c
+++ b/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c
@@ -38,6 +38,7 @@
 STATIC bool woke_up;
 STATIC uint64_t alarm_triggered_pins; // 36 actual pins
 STATIC uint64_t alarm_reserved_pins; // 36 actual pins
+STATIC bool _pinalarm_set = false;
 
 #define GPIO_IRQ_ALL_EVENTS 0x15u
 
@@ -152,6 +153,12 @@ void alarm_pin_pinalarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_ob
             if (deep_sleep) {
                 gpio_set_dormant_irq_enabled((uint)alarm->pin->number, event, true);
             }
+
+            _pinalarm_set = true;
         }
     }
 }
+
+bool alarm_pin_pinalarm_is_set(void) {
+    return _pinalarm_set;
+}
diff --git a/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.h b/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.h
index cd1a21fd0d..d31ac6c878 100644
--- a/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.h
+++ b/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.h
@@ -42,3 +42,4 @@ void alarm_pin_pinalarm_reset(void);
 void alarm_pin_pinalarm_light_reset(void);
 void alarm_pin_pinalarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms);
 bool alarm_pin_pinalarm_woke_this_cycle(void);
+bool alarm_pin_pinalarm_is_set(void);
diff --git a/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c b/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
index cb09b2a306..4302e9e8cd 100644
--- a/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
+++ b/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
@@ -35,6 +35,7 @@
 #include "hardware/rtc.h"
 
 STATIC bool woke_up = false;
+STATIC bool _timealarm_set = false;
 
 void timer_callback(void) {
     woke_up = true;
@@ -92,7 +93,7 @@ void alarm_time_timealarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_
         return;
     }
     if (deep_sleep) {
-        mp_raise_ValueError(translate("Cannot alarm from RTC in deep sleep"));
+        _timealarm_set = true;
     }
 
     // Compute how long to actually sleep, considering the time now.
@@ -123,3 +124,7 @@ void alarm_time_timealarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_
 
     woke_up = false;
 }
+
+bool alarm_time_timealarm_is_set(void) {
+    return _timealarm_set;
+}
diff --git a/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.h b/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.h
index 233a881e6e..d5248551ae 100644
--- a/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.h
+++ b/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.h
@@ -38,3 +38,4 @@ mp_obj_t alarm_time_timealarm_create_wakeup_alarm(void);
 void alarm_time_timealarm_reset(void);
 void alarm_time_timealarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms);
 bool alarm_time_timealarm_woke_this_cycle(void);
+bool alarm_time_timealarm_is_set(void);

From 4982d0920ebd247758aa6321bb36a5eede0bd775 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 29 May 2021 11:04:01 +1000
Subject: [PATCH 161/349] tools/pyboard.py: Track raw REPL state via
 in_raw_repl variable.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/pyboard.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index 29a15f7eae..220c010937 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -255,6 +255,7 @@ class Pyboard:
     def __init__(
         self, device, baudrate=115200, user="micro", password="python", wait=0, exclusive=True
     ):
+        self.in_raw_repl = False
         self.use_raw_paste = True
         if device.startswith("exec:"):
             self.serial = ProcessToSerial(device[len("exec:") :])
@@ -348,8 +349,11 @@ class Pyboard:
             print(data)
             raise PyboardError("could not enter raw repl")
 
+        self.in_raw_repl = True
+
     def exit_raw_repl(self):
         self.serial.write(b"\r\x02")  # ctrl-B: enter friendly REPL
+        self.in_raw_repl = False
 
     def follow(self, timeout, data_consumer=None):
         # wait for normal output

From e4ba57c5cd6f68306726891c45f36b5129b633ec Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 29 May 2021 11:21:19 +1000
Subject: [PATCH 162/349] tools/pyboard.py: Add "soft_reset" option to
 Pyboard.enter_raw_repl().

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/pyboard.py | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index 220c010937..7d06aa847d 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -322,7 +322,7 @@ class Pyboard:
                 time.sleep(0.01)
         return data
 
-    def enter_raw_repl(self):
+    def enter_raw_repl(self, soft_reset=True):
         self.serial.write(b"\r\x03\x03")  # ctrl-C twice: interrupt any running program
 
         # flush input (without relying on serial.flushInput())
@@ -332,18 +332,23 @@ class Pyboard:
             n = self.serial.inWaiting()
 
         self.serial.write(b"\r\x01")  # ctrl-A: enter raw REPL
-        data = self.read_until(1, b"raw REPL; CTRL-B to exit\r\n>")
-        if not data.endswith(b"raw REPL; CTRL-B to exit\r\n>"):
-            print(data)
-            raise PyboardError("could not enter raw repl")
 
-        self.serial.write(b"\x04")  # ctrl-D: soft reset
-        data = self.read_until(1, b"soft reboot\r\n")
-        if not data.endswith(b"soft reboot\r\n"):
-            print(data)
-            raise PyboardError("could not enter raw repl")
-        # By splitting this into 2 reads, it allows boot.py to print stuff,
-        # which will show up after the soft reboot and before the raw REPL.
+        if soft_reset:
+            data = self.read_until(1, b"raw REPL; CTRL-B to exit\r\n>")
+            if not data.endswith(b"raw REPL; CTRL-B to exit\r\n>"):
+                print(data)
+                raise PyboardError("could not enter raw repl")
+
+            self.serial.write(b"\x04")  # ctrl-D: soft reset
+
+            # Waiting for "soft reboot" independently to "raw REPL" (done below)
+            # allows boot.py to print, which will show up after "soft reboot"
+            # and before "raw REPL".
+            data = self.read_until(1, b"soft reboot\r\n")
+            if not data.endswith(b"soft reboot\r\n"):
+                print(data)
+                raise PyboardError("could not enter raw repl")
+
         data = self.read_until(1, b"raw REPL; CTRL-B to exit\r\n")
         if not data.endswith(b"raw REPL; CTRL-B to exit\r\n"):
             print(data)

From a60ad3364132b9c4a30b20cd91fd5cd1ac965618 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 29 May 2021 17:12:54 +1000
Subject: [PATCH 163/349] tools/mpremote: Add new CLI utility to interact with
 remote device.

This has been under development since April 2017.  See #3034 and #6375.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/LICENSE                     |  21 +
 tools/mpremote/README.md                   |  71 +++
 tools/mpremote/mpremote.py                 |   6 +
 tools/mpremote/mpremote/__init__.py        |   1 +
 tools/mpremote/mpremote/console.py         | 162 ++++++
 tools/mpremote/mpremote/main.py            | 477 ++++++++++++++++
 tools/mpremote/mpremote/pyboardextended.py | 621 +++++++++++++++++++++
 tools/mpremote/pyproject.toml              |   6 +
 tools/mpremote/setup.cfg                   |  25 +
 9 files changed, 1390 insertions(+)
 create mode 100644 tools/mpremote/LICENSE
 create mode 100644 tools/mpremote/README.md
 create mode 100755 tools/mpremote/mpremote.py
 create mode 100644 tools/mpremote/mpremote/__init__.py
 create mode 100644 tools/mpremote/mpremote/console.py
 create mode 100644 tools/mpremote/mpremote/main.py
 create mode 100644 tools/mpremote/mpremote/pyboardextended.py
 create mode 100644 tools/mpremote/pyproject.toml
 create mode 100644 tools/mpremote/setup.cfg

diff --git a/tools/mpremote/LICENSE b/tools/mpremote/LICENSE
new file mode 100644
index 0000000000..5ec904cca1
--- /dev/null
+++ b/tools/mpremote/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2021 Damien P. George
+
+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.
diff --git a/tools/mpremote/README.md b/tools/mpremote/README.md
new file mode 100644
index 0000000000..a6aaa1755d
--- /dev/null
+++ b/tools/mpremote/README.md
@@ -0,0 +1,71 @@
+# mpremote -- MicroPython remote control
+
+This CLI tool provides an integrated set of utilities to remotely interact with
+and automate a MicroPython device over a serial connection.
+
+The simplest way to use this tool is:
+
+    mpremote
+
+This will automatically connect to the device and provide an interactive REPL.
+
+The full list of supported commands are:
+
+    mpremote connect <device>        -- connect to given device
+                                        device may be: list, auto, id:x, port:x
+                                        or any valid device name/path
+    mpremote disconnect              -- disconnect current device
+    mpremote mount <local-dir>       -- mount local directory on device
+    mpremote eval <string>           -- evaluate and print the string
+    mpremote exec <string>           -- execute the string
+    mpremote run <file>              -- run the given local script
+    mpremote fs <command> <args...>  -- execute filesystem commands on the device
+                                        command may be: cat, ls, cp, rm, mkdir, rmdir
+                                        use ":" as a prefix to specify a file on the device
+    mpremote repl                    -- enter REPL
+                                        options:
+                                            --capture <file>
+                                            --inject-code <string>
+                                            --inject-file <file>
+
+Multiple commands can be specified and they will be run sequentially.  Connection
+and disconnection will be done automatically at the start and end of the execution
+of the tool, if such commands are not explicitly given.  Automatic connection will
+search for the first available serial device.  If no action is specified then the
+REPL will be entered.
+
+Shortcuts can be defined using the macro system.  Built-in shortcuts are:
+
+- a0, a1, a2, a3: connect to `/dev/ttyACM?`
+- u0, u1, u2, u3: connect to `/dev/ttyUSB?`
+- c0, c1, c2, c3: connect to `COM?`
+- cat, ls, cp, rm, mkdir, rmdir, df: filesystem commands
+- reset: reset the device
+- bootloader: make the device enter its bootloader
+
+Any user configuration, including user-defined shortcuts, can be placed in
+.config/mpremote/config.py.  For example:
+
+    # Custom macro commands
+    commands = {
+        "c33": "connect id:334D335C3138",
+        "bl": "bootloader",
+        "double x=4": "eval x*2",
+    }
+
+Examples:
+
+    mpremote
+    mpremote a1
+    mpremote connect /dev/ttyUSB0 repl
+    mpremote ls
+    mpremote a1 ls
+    mpremote exec "import micropython; micropython.mem_info()"
+    mpremote eval 1/2 eval 3/4
+    mpremote mount .
+    mpremote mount . exec "import local_script"
+    mpremote ls
+    mpremote cat boot.py
+    mpremote cp :main.py .
+    mpremote cp main.py :
+    mpremote cp -r dir/ :
diff --git a/tools/mpremote/mpremote.py b/tools/mpremote/mpremote.py
new file mode 100755
index 0000000000..a91ff67b15
--- /dev/null
+++ b/tools/mpremote/mpremote.py
@@ -0,0 +1,6 @@
+#!/usr/bin/env python3
+
+import sys
+from mpremote import main
+
+sys.exit(main.main())
diff --git a/tools/mpremote/mpremote/__init__.py b/tools/mpremote/mpremote/__init__.py
new file mode 100644
index 0000000000..1bb8bf6d7f
--- /dev/null
+++ b/tools/mpremote/mpremote/__init__.py
@@ -0,0 +1 @@
+# empty
diff --git a/tools/mpremote/mpremote/console.py b/tools/mpremote/mpremote/console.py
new file mode 100644
index 0000000000..646bbfa22e
--- /dev/null
+++ b/tools/mpremote/mpremote/console.py
@@ -0,0 +1,162 @@
+import sys
+
+try:
+    import select, termios
+except ImportError:
+    termios = None
+    select = None
+    import msvcrt
+
+
+class ConsolePosix:
+    def __init__(self):
+        self.infd = sys.stdin.fileno()
+        self.infile = sys.stdin.buffer.raw
+        self.outfile = sys.stdout.buffer.raw
+        self.orig_attr = termios.tcgetattr(self.infd)
+
+    def enter(self):
+        # attr is: [iflag, oflag, cflag, lflag, ispeed, ospeed, cc]
+        attr = termios.tcgetattr(self.infd)
+        attr[0] &= ~(
+            termios.BRKINT | termios.ICRNL | termios.INPCK | termios.ISTRIP | termios.IXON
+        )
+        attr[1] = 0
+        attr[2] = attr[2] & ~(termios.CSIZE | termios.PARENB) | termios.CS8
+        attr[3] = 0
+        attr[6][termios.VMIN] = 1
+        attr[6][termios.VTIME] = 0
+        termios.tcsetattr(self.infd, termios.TCSANOW, attr)
+
+    def exit(self):
+        termios.tcsetattr(self.infd, termios.TCSANOW, self.orig_attr)
+
+    def waitchar(self):
+        # TODO pyb.serial might not have fd
+        select.select([console_in.infd, pyb.serial.fd], [], [])
+
+    def readchar(self):
+        res = select.select([self.infd], [], [], 0)
+        if res[0]:
+            return self.infile.read(1)
+        else:
+            return None
+
+    def write(self, buf):
+        self.outfile.write(buf)
+
+
+class ConsoleWindows:
+    KEY_MAP = {
+        b"H": b"A",  # UP
+        b"P": b"B",  # DOWN
+        b"M": b"C",  # RIGHT
+        b"K": b"D",  # LEFT
+        b"G": b"H",  # POS1
+        b"O": b"F",  # END
+        b"Q": b"6~",  # PGDN
+        b"I": b"5~",  # PGUP
+        b"s": b"1;5D",  # CTRL-LEFT,
+        b"t": b"1;5C",  # CTRL-RIGHT,
+        b"\x8d": b"1;5A",  #  CTRL-UP,
+        b"\x91": b"1;5B",  # CTRL-DOWN,
+        b"w": b"1;5H",  # CTRL-POS1
+        b"u": b"1;5F",  # CTRL-END
+        b"\x98": b"1;3A",  #  ALT-UP,
+        b"\xa0": b"1;3B",  # ALT-DOWN,
+        b"\x9d": b"1;3C",  #  ALT-RIGHT,
+        b"\x9b": b"1;3D",  # ALT-LEFT,
+        b"\x97": b"1;3H",  #  ALT-POS1,
+        b"\x9f": b"1;3F",  # ALT-END,
+        b"S": b"3~",  # DEL,
+        b"\x93": b"3;5~",  # CTRL-DEL
+        b"R": b"2~",  # INS
+        b"\x92": b"2;5~",  # CTRL-INS
+        b"\x94": b"Z",  # Ctrl-Tab = BACKTAB,
+    }
+
+    def enter(self):
+        pass
+
+    def exit(self):
+        pass
+
+    def inWaiting(self):
+        return 1 if msvcrt.kbhit() else 0
+
+    def waitchar(self):
+        while not (self.inWaiting() or pyb.serial.inWaiting()):
+            time.sleep(0.01)
+
+    def readchar(self):
+        if msvcrt.kbhit():
+            ch = msvcrt.getch()
+            while ch in b"\x00\xe0":  # arrow or function key prefix?
+                if not msvcrt.kbhit():
+                    return None
+                ch = msvcrt.getch()  # second call returns the actual key code
+                try:
+                    ch = b"\x1b[" + self.KEY_MAP[ch]
+                except KeyError:
+                    return None
+            return ch
+
+    def write(self, buf):
+        buf = buf.decode() if isinstance(buf, bytes) else buf
+        sys.stdout.write(buf)
+        sys.stdout.flush()
+        # for b in buf:
+        #     if isinstance(b, bytes):
+        #         msvcrt.putch(b)
+        #     else:
+        #         msvcrt.putwch(b)
+
+
+if termios:
+    Console = ConsolePosix
+    VT_ENABLED = True
+else:
+    Console = ConsoleWindows
+
+    # Windows VT mode ( >= win10 only)
+    # https://bugs.python.org/msg291732
+    import ctypes
+    from ctypes import wintypes
+
+    kernel32 = ctypes.WinDLL("kernel32", use_last_error=True)
+
+    ERROR_INVALID_PARAMETER = 0x0057
+    ENABLE_VIRTUAL_TERMINAL_PROCESSING = 0x0004
+
+    def _check_bool(result, func, args):
+        if not result:
+            raise ctypes.WinError(ctypes.get_last_error())
+        return args
+
+    LPDWORD = ctypes.POINTER(wintypes.DWORD)
+    kernel32.GetConsoleMode.errcheck = _check_bool
+    kernel32.GetConsoleMode.argtypes = (wintypes.HANDLE, LPDWORD)
+    kernel32.SetConsoleMode.errcheck = _check_bool
+    kernel32.SetConsoleMode.argtypes = (wintypes.HANDLE, wintypes.DWORD)
+
+    def set_conout_mode(new_mode, mask=0xFFFFFFFF):
+        # don't assume StandardOutput is a console.
+        # open CONOUT$ instead
+        fdout = os.open("CONOUT$", os.O_RDWR)
+        try:
+            hout = msvcrt.get_osfhandle(fdout)
+            old_mode = wintypes.DWORD()
+            kernel32.GetConsoleMode(hout, ctypes.byref(old_mode))
+            mode = (new_mode & mask) | (old_mode.value & ~mask)
+            kernel32.SetConsoleMode(hout, mode)
+            return old_mode.value
+        finally:
+            os.close(fdout)
+
+    # def enable_vt_mode():
+    mode = mask = ENABLE_VIRTUAL_TERMINAL_PROCESSING
+    try:
+        set_conout_mode(mode, mask)
+        VT_ENABLED = True
+    except WindowsError as e:
+        VT_ENABLED = False
diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
new file mode 100644
index 0000000000..1ce00305eb
--- /dev/null
+++ b/tools/mpremote/mpremote/main.py
@@ -0,0 +1,477 @@
+"""
+MicroPython Remote - Interaction and automation tool for MicroPython
+MIT license; Copyright (c) 2019-2021 Damien P. George
+
+This program provides a set of utilities to interact with and automate a
+MicroPython device over a serial connection.  Commands supported are:
+
+    mpremote                         -- auto-detect, connect and enter REPL
+    mpremote <device-shortcut>       -- connect to given device
+    mpremote connect <device>        -- connect to given device
+    mpremote disconnect              -- disconnect current device
+    mpremote mount <local-dir>       -- mount local directory on device
+    mpremote eval <string>           -- evaluate and print the string
+    mpremote exec <string>           -- execute the string
+    mpremote run <script>            -- run the given local script
+    mpremote fs <command> <args...>  -- execute filesystem commands on the device
+    mpremote repl                    -- enter REPL
+"""
+
+import os, select, sys, time
+import serial.tools.list_ports
+
+from . import pyboardextended as pyboard
+from .console import Console, ConsolePosix
+
+_PROG = "mpremote"
+
+_AUTO_CONNECT_SEARCH_LIST = [
+    "/dev/ttyACM0",
+    "/dev/ttyACM1",
+    "/dev/ttyACM2",
+    "/dev/ttyACM3",
+    "/dev/ttyUSB0",
+    "/dev/ttyUSB1",
+    "/dev/ttyUSB2",
+    "/dev/ttyUSB3",
+    "COM0",
+    "COM1",
+    "COM2",
+    "COM3",
+]
+
+_BUILTIN_COMMAND_EXPANSIONS = {
+    # Device connection shortcuts.
+    "a0": "connect /dev/ttyACM0",
+    "a1": "connect /dev/ttyACM1",
+    "a2": "connect /dev/ttyACM2",
+    "a3": "connect /dev/ttyACM3",
+    "u0": "connect /dev/ttyUSB0",
+    "u1": "connect /dev/ttyUSB1",
+    "u2": "connect /dev/ttyUSB2",
+    "u3": "connect /dev/ttyUSB3",
+    "c0": "connect COM0",
+    "c1": "connect COM1",
+    "c2": "connect COM2",
+    "c3": "connect COM3",
+    # Filesystem shortcuts.
+    "cat": "fs cat",
+    "ls": "fs ls",
+    "cp": "fs cp",
+    "rm": "fs rm",
+    "mkdir": "fs mkdir",
+    "rmdir": "fs rmdir",
+    "df": [
+        "exec",
+        "import uos\nprint('mount \\tsize \\tused \\tavail \\tuse%')\nfor _m in [''] + uos.listdir('/'):\n _s = uos.stat('/' + _m)\n if not _s[0] & 1 << 14: continue\n _s = uos.statvfs(_m)\n if _s[0]:\n  _size = _s[0] * _s[2]; _free = _s[0] * _s[3]; print(_m, _size, _size - _free, _free, int(100 * (_size - _free) / _size), sep='\\t')",
+    ],
+    # Other shortcuts.
+    "reset t_ms=100": [
+        "exec",
+        "--no-follow",
+        "import utime, umachine; utime.sleep_ms(t_ms); umachine.reset()",
+    ],
+    "bootloader t_ms=100": [
+        "exec",
+        "--no-follow",
+        "import utime, umachine; utime.sleep_ms(t_ms); umachine.bootloader()",
+    ],
+    "setrtc": [
+        "exec",
+        "import machine; machine.RTC().datetime((2020, 1, 1, 0, 10, 0, 0, 0))",
+    ],
+}
+
+
+def load_user_config():
+    # Create empty config object.
+    config = __build_class__(lambda: None, "Config")()
+    config.commands = {}
+
+    # Get config file name.
+    path = os.getenv("XDG_CONFIG_HOME")
+    if path is None:
+        path = os.getenv("HOME")
+        if path is None:
+            return config
+        path = os.path.join(path, ".config")
+    path = os.path.join(path, _PROG)
+    config_file = os.path.join(path, "config.py")
+
+    # Check if config file exists.
+    if not os.path.exists(config_file):
+        return config
+
+    # Exec the config file in its directory.
+    with open(config_file) as f:
+        config_data = f.read()
+    prev_cwd = os.getcwd()
+    os.chdir(path)
+    exec(config_data, config.__dict__)
+    os.chdir(prev_cwd)
+
+    return config
+
+
+def prepare_command_expansions(config):
+    global _command_expansions
+
+    _command_expansions = {}
+
+    for command_set in (_BUILTIN_COMMAND_EXPANSIONS, config.commands):
+        for cmd, sub in command_set.items():
+            cmd = cmd.split()
+            if len(cmd) == 1:
+                args = ()
+            else:
+                args = tuple(c.split("=") for c in cmd[1:])
+            if isinstance(sub, str):
+                sub = sub.split()
+            _command_expansions[cmd[0]] = (args, sub)
+
+
+def do_command_expansion(args):
+    def usage_error(cmd, exp_args, msg):
+        print(f"Command {cmd} {msg}; signature is:")
+        print("   ", cmd, " ".join("=".join(a) for a in exp_args))
+        sys.exit(1)
+
+    last_arg_idx = len(args)
+    pre = []
+    while args and args[0] in _command_expansions:
+        cmd = args.pop(0)
+        exp_args, exp_sub = _command_expansions[cmd]
+        for exp_arg in exp_args:
+            exp_arg_name = exp_arg[0]
+            if args and "=" not in args[0]:
+                # Argument given without a name.
+                value = args.pop(0)
+            elif args and args[0].startswith(exp_arg_name + "="):
+                # Argument given with correct name.
+                value = args.pop(0).split("=", 1)[1]
+            else:
+                # No argument given, or argument given with a different name.
+                if len(exp_arg) == 1:
+                    # Required argument (it has no default).
+                    usage_error(cmd, exp_args, f"missing argument {exp_arg_name}")
+                else:
+                    # Optional argument with a default.
+                    value = exp_arg[1]
+            pre.append(f"{exp_arg_name}={value}")
+
+        args[0:0] = exp_sub
+        last_arg_idx = len(exp_sub)
+
+    if last_arg_idx < len(args) and "=" in args[last_arg_idx]:
+        # Extra unknown arguments given.
+        arg = args[last_arg_idx].split("=", 1)[0]
+        usage_error(cmd, exp_args, f"given unexpected argument {arg}")
+        sys.exit(1)
+
+    # Insert expansion with optional setting of arguments.
+    if pre:
+        args[0:0] = ["exec", ";".join(pre)]
+
+
+def do_connect(args):
+    dev = args.pop(0)
+    try:
+        if dev == "list":
+            # List attached devices.
+            for p in sorted(serial.tools.list_ports.comports()):
+                print(
+                    "{} {} {:04x}:{:04x} {} {}".format(
+                        p.device, p.serial_number, p.pid, p.vid, p.manufacturer, p.product
+                    )
+                )
+            return None
+        elif dev == "auto":
+            # Auto-detect and auto-connect to the first available device.
+            ports = serial.tools.list_ports.comports()
+            for dev in _AUTO_CONNECT_SEARCH_LIST:
+                if any(p.device == dev for p in ports):
+                    try:
+                        return pyboard.PyboardExtended(dev, baudrate=115200)
+                    except pyboard.PyboardError as er:
+                        if not er.args[0].startswith("failed to access"):
+                            raise er
+            raise pyboard.PyboardError("no device found")
+        elif dev.startswith("id:"):
+            # Search for a device with the given serial number.
+            serial_number = dev[len("id:") :]
+            dev = None
+            for p in serial.tools.list_ports.comports():
+                if p.serial_number == serial_number:
+                    return pyboard.PyboardExtended(p.device, baudrate=115200)
+            raise pyboard.PyboardError("no device with serial number {}".format(serial_number))
+        else:
+            # Connect to the given device.
+            if dev.startswith("port:"):
+                dev = dev[len("port:") :]
+            return pyboard.PyboardExtended(dev, baudrate=115200)
+    except pyboard.PyboardError as er:
+        msg = er.args[0]
+        if msg.startswith("failed to access"):
+            msg += " (it may be in use by another program)"
+        print(msg)
+        sys.exit(1)
+
+
+def do_disconnect(pyb):
+    try:
+        if pyb.mounted:
+            if not pyb.in_raw_repl:
+                pyb.enter_raw_repl(soft_reset=False)
+            pyb.umount_local()
+        if pyb.in_raw_repl:
+            pyb.exit_raw_repl()
+    except OSError:
+        # Ignore any OSError exceptions when shutting down, eg:
+        # - pyboard.filesystem_command will close the connecton if it had an error
+        # - umounting will fail if serial port disappeared
+        pass
+    pyb.close()
+
+
+def do_filesystem(pyb, args):
+    def _list_recursive(files, path):
+        if os.path.isdir(path):
+            for entry in os.listdir(path):
+                _list_recursive(files, os.path.join(path, entry))
+        else:
+            files.append(os.path.split(path))
+
+    if args[0] == "cp" and args[1] == "-r":
+        args.pop(0)
+        args.pop(0)
+        assert args[-1] == ":"
+        args.pop()
+        src_files = []
+        for path in args:
+            _list_recursive(src_files, path)
+        known_dirs = {""}
+        pyb.exec_("import uos")
+        for dir, file in src_files:
+            dir_parts = dir.split("/")
+            for i in range(len(dir_parts)):
+                d = "/".join(dir_parts[: i + 1])
+                if d not in known_dirs:
+                    pyb.exec_("try:\n uos.mkdir('%s')\nexcept OSError as e:\n print(e)" % d)
+                    known_dirs.add(d)
+            pyboard.filesystem_command(pyb, ["cp", os.path.join(dir, file), ":" + dir + "/"])
+    else:
+        pyboard.filesystem_command(pyb, args)
+    args.clear()
+
+
+def do_repl_main_loop(pyb, console_in, console_out_write, *, code_to_inject, file_to_inject):
+    while True:
+        if isinstance(console_in, ConsolePosix):
+            # TODO pyb.serial might not have fd
+            select.select([console_in.infd, pyb.serial.fd], [], [])
+        else:
+            while not (console_in.inWaiting() or pyb.serial.inWaiting()):
+                time.sleep(0.01)
+        c = console_in.readchar()
+        if c:
+            if c == b"\x1d":  # ctrl-], quit
+                break
+            elif c == b"\x04":  # ctrl-D
+                # do a soft reset and reload the filesystem hook
+                pyb.soft_reset_with_mount(console_out_write)
+            elif c == b"\x0a" and code_to_inject is not None:  # ctrl-j, inject code
+                pyb.serial.write(code_to_inject)
+            elif c == b"\x0b" and file_to_inject is not None:  # ctrl-k, inject script
+                console_out_write(bytes("Injecting %s\r\n" % file_to_inject, "utf8"))
+                pyb.enter_raw_repl(soft_reset=False)
+                with open(file_to_inject, "rb") as f:
+                    pyfile = f.read()
+                try:
+                    pyb.exec_raw_no_follow(pyfile)
+                except pyboard.PyboardError as er:
+                    console_out_write(b"Error:\r\n")
+                    console_out_write(er)
+                pyb.exit_raw_repl()
+            else:
+                pyb.serial.write(c)
+
+        try:
+            n = pyb.serial.inWaiting()
+        except OSError as er:
+            if er.args[0] == 5:  # IO error, device disappeared
+                print("device disconnected")
+                break
+
+        if n > 0:
+            c = pyb.serial.read(1)
+            if c is not None:
+                # pass character through to the console
+                oc = ord(c)
+                if oc in (8, 9, 10, 13, 27) or 32 <= oc <= 126:
+                    console_out_write(c)
+                else:
+                    console_out_write(b"[%02x]" % ord(c))
+
+
+def do_repl(pyb, args):
+    capture_file = None
+    code_to_inject = None
+    file_to_inject = None
+
+    while len(args):
+        if args[0] == "--capture":
+            args.pop(0)
+            capture_file = args.pop(0)
+        elif args[0] == "--inject-code":
+            args.pop(0)
+            code_to_inject = bytes(args.pop(0).replace("\\n", "\r\n"), "utf8")
+        elif args[0] == "--inject-file":
+            args.pop(0)
+            file_to_inject = args.pop(0)
+        else:
+            break
+
+    print("Connected to MicroPython at %s" % pyb.device_name)
+    print("Use Ctrl-] to exit this shell")
+    if capture_file is not None:
+        print('Capturing session to file "%s"' % capture_file)
+        capture_file = open(capture_file, "wb")
+    if code_to_inject is not None:
+        print("Use Ctrl-J to inject", code_to_inject)
+    if file_to_inject is not None:
+        print('Use Ctrl-K to inject file "%s"' % file_to_inject)
+
+    console = Console()
+    console.enter()
+
+    def console_out_write(b):
+        console.write(b)
+        if capture_file is not None:
+            capture_file.write(b)
+            capture_file.flush()
+
+    try:
+        do_repl_main_loop(
+            pyb,
+            console,
+            console_out_write,
+            code_to_inject=code_to_inject,
+            file_to_inject=file_to_inject,
+        )
+    finally:
+        console.exit()
+        if capture_file is not None:
+            capture_file.close()
+
+
+def execbuffer(pyb, buf, follow):
+    ret_val = 0
+    try:
+        pyb.exec_raw_no_follow(buf)
+        if follow:
+            ret, ret_err = pyb.follow(timeout=None, data_consumer=pyboard.stdout_write_bytes)
+            if ret_err:
+                pyboard.stdout_write_bytes(ret_err)
+                ret_val = 1
+    except pyboard.PyboardError as er:
+        print(er)
+        ret_val = 1
+    except KeyboardInterrupt:
+        ret_val = 1
+    return ret_val
+
+
+def main():
+    config = load_user_config()
+    prepare_command_expansions(config)
+
+    args = sys.argv[1:]
+    pyb = None
+    did_action = False
+
+    try:
+        while args:
+            do_command_expansion(args)
+
+            cmds = {
+                "connect": (False, False, 1),
+                "disconnect": (False, False, 0),
+                "mount": (True, False, 1),
+                "repl": (False, True, 0),
+                "eval": (True, True, 1),
+                "exec": (True, True, 1),
+                "run": (True, True, 1),
+                "fs": (True, True, 1),
+            }
+            cmd = args.pop(0)
+            try:
+                need_raw_repl, is_action, num_args_min = cmds[cmd]
+            except KeyError:
+                print(f"{_PROG}: '{cmd}' is not a command")
+                return 1
+
+            if len(args) < num_args_min:
+                print(f"{_PROG}: '{cmd}' neads at least {num_args_min} argument(s)")
+                return 1
+
+            if cmd == "connect":
+                if pyb is not None:
+                    do_disconnect(pyb)
+                pyb = do_connect(args)
+                if pyb is None:
+                    did_action = True
+                continue
+
+            if pyb is None:
+                pyb = do_connect(["auto"])
+
+            if need_raw_repl:
+                if not pyb.in_raw_repl:
+                    pyb.enter_raw_repl()
+            else:
+                if pyb.in_raw_repl:
+                    pyb.exit_raw_repl()
+            if is_action:
+                did_action = True
+
+            if cmd == "disconnect":
+                do_disconnect(pyb)
+                pyb = None
+            elif cmd == "mount":
+                path = args.pop(0)
+                pyb.mount_local(path)
+                print(f"Local directory {path} is mounted at /remote")
+            elif cmd in ("exec", "eval", "run"):
+                follow = True
+                if args[0] == "--no-follow":
+                    args.pop(0)
+                    follow = False
+                if cmd == "exec":
+                    buf = args.pop(0)
+                elif cmd == "eval":
+                    buf = "print(" + args.pop(0) + ")"
+                else:
+                    filename = args.pop(0)
+                    try:
+                        with open(filename, "rb") as f:
+                            buf = f.read()
+                    except OSError:
+                        print(f"{_PROG}: could not read file '{filename}'")
+                        return 1
+                ret = execbuffer(pyb, buf, follow)
+                if ret:
+                    return ret
+            elif cmd == "fs":
+                do_filesystem(pyb, args)
+            elif cmd == "repl":
+                do_repl(pyb, args)
+
+        if not did_action:
+            if pyb is None:
+                pyb = do_connect(["auto"])
+            if pyb.in_raw_repl:
+                pyb.exit_raw_repl()
+            do_repl(pyb, args)
+    finally:
+        if pyb is not None:
+            do_disconnect(pyb)
diff --git a/tools/mpremote/mpremote/pyboardextended.py b/tools/mpremote/mpremote/pyboardextended.py
new file mode 100644
index 0000000000..e3f259b395
--- /dev/null
+++ b/tools/mpremote/mpremote/pyboardextended.py
@@ -0,0 +1,621 @@
+import os, re, serial, struct, time
+from errno import EPERM
+from .console import VT_ENABLED
+
+try:
+    from .pyboard import Pyboard, PyboardError, stdout_write_bytes, filesystem_command
+except ImportError:
+    import sys
+
+    sys.path.append(os.path.dirname(__file__) + "/../..")
+    from pyboard import Pyboard, PyboardError, stdout_write_bytes, filesystem_command
+
+fs_hook_cmds = {
+    "CMD_STAT": 1,
+    "CMD_ILISTDIR_START": 2,
+    "CMD_ILISTDIR_NEXT": 3,
+    "CMD_OPEN": 4,
+    "CMD_CLOSE": 5,
+    "CMD_READ": 6,
+    "CMD_WRITE": 7,
+    "CMD_SEEK": 8,
+    "CMD_REMOVE": 9,
+    "CMD_RENAME": 10,
+}
+
+fs_hook_code = """\
+import uos, uio, ustruct, micropython, usys
+
+
+class RemoteCommand:
+    def __init__(self, use_second_port):
+        self.buf4 = bytearray(4)
+        try:
+            import pyb
+            self.fout = pyb.USB_VCP()
+            if use_second_port:
+                self.fin = pyb.USB_VCP(1)
+            else:
+                self.fin = pyb.USB_VCP()
+        except:
+            import usys
+            self.fout = usys.stdout.buffer
+            self.fin = usys.stdin.buffer
+        import select
+        self.poller = select.poll()
+        self.poller.register(self.fin, select.POLLIN)
+
+    def poll_in(self):
+        for _ in self.poller.ipoll(1000):
+            return
+        self.end()
+        raise Exception('timeout waiting for remote')
+
+    def rd(self, n):
+        buf = bytearray(n)
+        self.rd_into(buf, n)
+        return buf
+
+    def rd_into(self, buf, n):
+        # implement reading with a timeout in case other side disappears
+        if n == 0:
+            return
+        self.poll_in()
+        r = self.fin.readinto(buf, n)
+        if r < n:
+            mv = memoryview(buf)
+            while r < n:
+                self.poll_in()
+                r += self.fin.readinto(mv[r:], n - r)
+
+    def begin(self, type):
+        micropython.kbd_intr(-1)
+        buf4 = self.buf4
+        buf4[0] = 0x18
+        buf4[1] = type
+        self.fout.write(buf4, 2)
+        # Wait for sync byte 0x18, but don't get stuck forever
+        for i in range(30):
+            self.poller.poll(1000)
+            self.fin.readinto(buf4, 1)
+            if buf4[0] == 0x18:
+                break
+
+    def end(self):
+        micropython.kbd_intr(3)
+
+    def rd_s8(self):
+        self.rd_into(self.buf4, 1)
+        n = self.buf4[0]
+        if n & 0x80:
+            n -= 0x100
+        return n
+
+    def rd_s32(self):
+        buf4 = self.buf4
+        self.rd_into(buf4, 4)
+        n = buf4[0] | buf4[1] << 8 | buf4[2] << 16 | buf4[3] << 24
+        if buf4[3] & 0x80:
+            n -= 0x100000000
+        return n
+
+    def rd_u32(self):
+        buf4 = self.buf4
+        self.rd_into(buf4, 4)
+        return buf4[0] | buf4[1] << 8 | buf4[2] << 16 | buf4[3] << 24
+
+    def rd_bytes(self, buf):
+        # TODO if n is large (eg >256) then we may miss bytes on stdin
+        n = self.rd_s32()
+        if buf is None:
+            ret = buf = bytearray(n)
+        else:
+            ret = n
+        self.rd_into(buf, n)
+        return ret
+
+    def rd_str(self):
+        n = self.rd_s32()
+        if n == 0:
+            return ''
+        else:
+            return str(self.rd(n), 'utf8')
+
+    def wr_s8(self, i):
+        self.buf4[0] = i
+        self.fout.write(self.buf4, 1)
+
+    def wr_s32(self, i):
+        ustruct.pack_into('<i', self.buf4, 0, i)
+        self.fout.write(self.buf4)
+
+    def wr_bytes(self, b):
+        self.wr_s32(len(b))
+        self.fout.write(b)
+
+    # str and bytes act the same in MicroPython
+    wr_str = wr_bytes
+
+
+class RemoteFile(uio.IOBase):
+    def __init__(self, cmd, fd, is_text):
+        self.cmd = cmd
+        self.fd = fd
+        self.is_text = is_text
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, a, b, c):
+        self.close()
+
+    def ioctl(self, request, arg):
+        if request == 4:  # CLOSE
+            self.close()
+        return 0
+
+    def flush(self):
+        pass
+
+    def close(self):
+        if self.fd is None:
+            return
+        c = self.cmd
+        c.begin(CMD_CLOSE)
+        c.wr_s8(self.fd)
+        c.end()
+        self.fd = None
+
+    def read(self, n=-1):
+        c = self.cmd
+        c.begin(CMD_READ)
+        c.wr_s8(self.fd)
+        c.wr_s32(n)
+        data = c.rd_bytes(None)
+        c.end()
+        if self.is_text:
+            data = str(data, 'utf8')
+        else:
+            data = bytes(data)
+        return data
+
+    def readinto(self, buf):
+        c = self.cmd
+        c.begin(CMD_READ)
+        c.wr_s8(self.fd)
+        c.wr_s32(len(buf))
+        n = c.rd_bytes(buf)
+        c.end()
+        return n
+
+    def readline(self):
+        l = ''
+        while 1:
+            c = self.read(1)
+            l += c
+            if c == '\\n' or c == '':
+                return l
+
+    def readlines(self):
+        ls = []
+        while 1:
+            l = self.readline()
+            if not l:
+                return ls
+            ls.append(l)
+
+    def write(self, buf):
+        c = self.cmd
+        c.begin(CMD_WRITE)
+        c.wr_s8(self.fd)
+        c.wr_bytes(buf)
+        n = c.rd_s32()
+        c.end()
+        return n
+
+    def seek(self, n):
+        c = self.cmd
+        c.begin(CMD_SEEK)
+        c.wr_s8(self.fd)
+        c.wr_s32(n)
+        n = c.rd_s32()
+        c.end()
+        return n
+
+
+class RemoteFS:
+    def __init__(self, cmd):
+        self.cmd = cmd
+
+    def mount(self, readonly, mkfs):
+        pass
+
+    def umount(self):
+        pass
+
+    def chdir(self, path):
+        if not path.startswith("/"):
+            path = self.path + path
+        if not path.endswith("/"):
+            path += "/"
+        if path != "/":
+            self.stat(path)
+        self.path = path
+
+    def getcwd(self):
+        return self.path
+
+    def remove(self, path):
+        c = self.cmd
+        c.begin(CMD_REMOVE)
+        c.wr_str(self.path + path)
+        res = c.rd_s32()
+        c.end()
+        if res < 0:
+            raise OSError(-res)
+
+    def rename(self, old, new):
+        c = self.cmd
+        c.begin(CMD_RENAME)
+        c.wr_str(self.path + old)
+        c.wr_str(self.path + new)
+        res = c.rd_s32()
+        c.end()
+        if res < 0:
+            raise OSError(-res)
+
+    def stat(self, path):
+        c = self.cmd
+        c.begin(CMD_STAT)
+        c.wr_str(self.path + path)
+        res = c.rd_s8()
+        if res < 0:
+            c.end()
+            raise OSError(-res)
+        mode = c.rd_u32()
+        size = c.rd_u32()
+        atime = c.rd_u32()
+        mtime = c.rd_u32()
+        ctime = c.rd_u32()
+        c.end()
+        return mode, 0, 0, 0, 0, 0, size, atime, mtime, ctime
+
+    def ilistdir(self, path):
+        c = self.cmd
+        c.begin(CMD_ILISTDIR_START)
+        c.wr_str(self.path + path)
+        res = c.rd_s8()
+        c.end()
+        if res < 0:
+            raise OSError(-res)
+        def next():
+            while True:
+                c.begin(CMD_ILISTDIR_NEXT)
+                name = c.rd_str()
+                if name:
+                    type = c.rd_u32()
+                    c.end()
+                    yield (name, type, 0)
+                else:
+                    c.end()
+                    break
+        return next()
+
+    def open(self, path, mode):
+        c = self.cmd
+        c.begin(CMD_OPEN)
+        c.wr_str(self.path + path)
+        c.wr_str(mode)
+        fd = c.rd_s8()
+        c.end()
+        if fd < 0:
+            raise OSError(-fd)
+        return RemoteFile(c, fd, mode.find('b') == -1)
+
+
+def __mount(use_second_port):
+    uos.mount(RemoteFS(RemoteCommand(use_second_port)), '/remote')
+    uos.chdir('/remote')
+"""
+
+# Apply basic compression on hook code.
+for key, value in fs_hook_cmds.items():
+    fs_hook_code = re.sub(key, str(value), fs_hook_code)
+fs_hook_code = re.sub(" *#.*$", "", fs_hook_code, flags=re.MULTILINE)
+fs_hook_code = re.sub("\n\n+", "\n", fs_hook_code)
+fs_hook_code = re.sub("    ", " ", fs_hook_code)
+fs_hook_code = re.sub("rd_", "r", fs_hook_code)
+fs_hook_code = re.sub("wr_", "w", fs_hook_code)
+fs_hook_code = re.sub("buf4", "b4", fs_hook_code)
+
+
+class PyboardCommand:
+    def __init__(self, fin, fout, path):
+        self.fin = fin
+        self.fout = fout
+        self.root = path + "/"
+        self.data_ilistdir = ["", []]
+        self.data_files = []
+
+    def rd_s8(self):
+        return struct.unpack("<b", self.fin.read(1))[0]
+
+    def rd_s32(self):
+        return struct.unpack("<i", self.fin.read(4))[0]
+
+    def rd_bytes(self):
+        n = self.rd_s32()
+        return self.fin.read(n)
+
+    def rd_str(self):
+        n = self.rd_s32()
+        if n == 0:
+            return ""
+        else:
+            return str(self.fin.read(n), "utf8")
+
+    def wr_s8(self, i):
+        self.fout.write(struct.pack("<b", i))
+
+    def wr_s32(self, i):
+        self.fout.write(struct.pack("<i", i))
+
+    def wr_u32(self, i):
+        self.fout.write(struct.pack("<I", i))
+
+    def wr_bytes(self, b):
+        self.wr_s32(len(b))
+        self.fout.write(b)
+
+    def wr_str(self, s):
+        b = bytes(s, "utf8")
+        self.wr_s32(len(b))
+        self.fout.write(b)
+
+    def log_cmd(self, msg):
+        print(f"[{msg}]", end="\r\n")
+
+    def path_check(self, path):
+        parent = os.path.realpath(self.root)
+        child = os.path.realpath(path)
+        if parent != os.path.commonpath([parent, child]):
+            raise OSError(EPERM, "")  # File is outside mounted dir
+
+    def do_stat(self):
+        path = self.root + self.rd_str()
+        # self.log_cmd(f"stat {path}")
+        try:
+            self.path_check(path)
+            stat = os.stat(path)
+        except OSError as er:
+            self.wr_s8(-abs(er.errno))
+        else:
+            self.wr_s8(0)
+            # Note: st_ino would need to be 64-bit if added here
+            self.wr_u32(stat.st_mode)
+            self.wr_u32(stat.st_size)
+            self.wr_u32(int(stat.st_atime))
+            self.wr_u32(int(stat.st_mtime))
+            self.wr_u32(int(stat.st_ctime))
+
+    def do_ilistdir_start(self):
+        path = self.root + self.rd_str()
+        try:
+            self.path_check(path)
+            self.wr_s8(0)
+        except OSError as er:
+            self.wr_s8(-abs(er.errno))
+        else:
+            self.data_ilistdir[0] = path
+            self.data_ilistdir[1] = os.listdir(path)
+
+    def do_ilistdir_next(self):
+        if self.data_ilistdir[1]:
+            entry = self.data_ilistdir[1].pop(0)
+            try:
+                stat = os.lstat(self.data_ilistdir[0] + "/" + entry)
+                mode = stat.st_mode & 0xC000
+            except OSError as er:
+                mode = 0
+            self.wr_str(entry)
+            self.wr_u32(mode)
+        else:
+            self.wr_str("")
+
+    def do_open(self):
+        path = self.root + self.rd_str()
+        mode = self.rd_str()
+        # self.log_cmd(f"open {path} {mode}")
+        try:
+            self.path_check(path)
+            f = open(path, mode)
+        except OSError as er:
+            self.wr_s8(-abs(er.errno))
+        else:
+            is_text = mode.find("b") == -1
+            try:
+                fd = self.data_files.index(None)
+                self.data_files[fd] = (f, is_text)
+            except ValueError:
+                fd = len(self.data_files)
+                self.data_files.append((f, is_text))
+            self.wr_s8(fd)
+
+    def do_close(self):
+        fd = self.rd_s8()
+        # self.log_cmd(f"close {fd}")
+        self.data_files[fd][0].close()
+        self.data_files[fd] = None
+
+    def do_read(self):
+        fd = self.rd_s8()
+        n = self.rd_s32()
+        buf = self.data_files[fd][0].read(n)
+        if self.data_files[fd][1]:
+            buf = bytes(buf, "utf8")
+        self.wr_bytes(buf)
+        # self.log_cmd(f"read {fd} {n} -> {len(buf)}")
+
+    def do_seek(self):
+        fd = self.rd_s8()
+        n = self.rd_s32()
+        # self.log_cmd(f"seek {fd} {n}")
+        self.data_files[fd][0].seek(n)
+        self.wr_s32(n)
+
+    def do_write(self):
+        fd = self.rd_s8()
+        buf = self.rd_bytes()
+        if self.data_files[fd][1]:
+            buf = str(buf, "utf8")
+        n = self.data_files[fd][0].write(buf)
+        self.wr_s32(n)
+        # self.log_cmd(f"write {fd} {len(buf)} -> {n}")
+
+    def do_remove(self):
+        path = self.root + self.rd_str()
+        # self.log_cmd(f"remove {path}")
+        try:
+            self.path_check(path)
+            os.remove(path)
+            ret = 0
+        except OSError as er:
+            ret = -abs(er.errno)
+        self.wr_s32(ret)
+
+    def do_rename(self):
+        old = self.root + self.rd_str()
+        new = self.root + self.rd_str()
+        # self.log_cmd(f"rename {old} {new}")
+        try:
+            self.path_check(old)
+            self.path_check(new)
+            os.rename(old, new)
+            ret = 0
+        except OSError as er:
+            ret = -abs(er.errno)
+        self.wr_s32(ret)
+
+    cmd_table = {
+        fs_hook_cmds["CMD_STAT"]: do_stat,
+        fs_hook_cmds["CMD_ILISTDIR_START"]: do_ilistdir_start,
+        fs_hook_cmds["CMD_ILISTDIR_NEXT"]: do_ilistdir_next,
+        fs_hook_cmds["CMD_OPEN"]: do_open,
+        fs_hook_cmds["CMD_CLOSE"]: do_close,
+        fs_hook_cmds["CMD_READ"]: do_read,
+        fs_hook_cmds["CMD_WRITE"]: do_write,
+        fs_hook_cmds["CMD_SEEK"]: do_seek,
+        fs_hook_cmds["CMD_REMOVE"]: do_remove,
+        fs_hook_cmds["CMD_RENAME"]: do_rename,
+    }
+
+
+class SerialIntercept:
+    def __init__(self, serial, cmd):
+        self.orig_serial = serial
+        self.cmd = cmd
+        self.buf = b""
+        self.orig_serial.timeout = 5.0
+
+    def _check_input(self, blocking):
+        if blocking or self.orig_serial.inWaiting() > 0:
+            c = self.orig_serial.read(1)
+            if c == b"\x18":
+                # a special command
+                c = self.orig_serial.read(1)[0]
+                self.orig_serial.write(b"\x18")  # Acknowledge command
+                PyboardCommand.cmd_table[c](self.cmd)
+            elif not VT_ENABLED and c == b"\x1b":
+                # ESC code, ignore these on windows
+                esctype = self.orig_serial.read(1)
+                if esctype == b"[":  # CSI
+                    while not (0x40 < self.orig_serial.read(1)[0] < 0x7E):
+                        # Looking for "final byte" of escape sequence
+                        pass
+            else:
+                self.buf += c
+
+    @property
+    def fd(self):
+        return self.orig_serial.fd
+
+    def close(self):
+        self.orig_serial.close()
+
+    def inWaiting(self):
+        self._check_input(False)
+        return len(self.buf)
+
+    def read(self, n):
+        while len(self.buf) < n:
+            self._check_input(True)
+        out = self.buf[:n]
+        self.buf = self.buf[n:]
+        return out
+
+    def write(self, buf):
+        self.orig_serial.write(buf)
+
+
+class PyboardExtended(Pyboard):
+    def __init__(self, dev, *args, **kwargs):
+        super().__init__(dev, *args, **kwargs)
+        self.device_name = dev
+        self.mounted = False
+
+    def mount_local(self, path, dev_out=None):
+        fout = self.serial
+        if dev_out is not None:
+            try:
+                fout = serial.Serial(dev_out)
+            except serial.SerialException:
+                port = list(serial.tools.list_ports.grep(dev_out))
+                if not port:
+                    raise
+                for p in port:
+                    try:
+                        fout = serial.Serial(p.device)
+                        break
+                    except serial.SerialException:
+                        pass
+        self.mounted = True
+        if self.eval('"RemoteFS" in globals()') == b"False":
+            self.exec_(fs_hook_code)
+        self.exec_("__mount(%s)" % (dev_out is not None))
+        self.cmd = PyboardCommand(self.serial, fout, path)
+        self.serial = SerialIntercept(self.serial, self.cmd)
+        self.dev_out = dev_out
+
+    def soft_reset_with_mount(self, out_callback):
+        self.serial.write(b"\x04")
+        if not self.mounted:
+            return
+
+        # Wait for a response to the soft-reset command.
+        for i in range(10):
+            if self.serial.inWaiting():
+                break
+            time.sleep(0.05)
+        else:
+            # Device didn't respond so it wasn't in a state to do a soft reset.
+            return
+
+        out_callback(self.serial.read(1))
+        self.serial = self.serial.orig_serial
+        n = self.serial.inWaiting()
+        while n > 0:
+            buf = self.serial.read(n)
+            out_callback(buf)
+            time.sleep(0.1)
+            n = self.serial.inWaiting()
+        self.serial.write(b"\x01")
+        self.exec_(fs_hook_code)
+        self.exec_("__mount(%s)" % (self.dev_out is not None))
+        self.exit_raw_repl()
+        self.read_until(4, b">>> ")
+        self.serial = SerialIntercept(self.serial, self.cmd)
+
+    def umount_local(self):
+        if self.mounted:
+            self.exec_('uos.umount("/remote")')
+            self.mounted = False
diff --git a/tools/mpremote/pyproject.toml b/tools/mpremote/pyproject.toml
new file mode 100644
index 0000000000..374b58cbf4
--- /dev/null
+++ b/tools/mpremote/pyproject.toml
@@ -0,0 +1,6 @@
+[build-system]
+requires = [
+    "setuptools>=42",
+    "wheel"
+]
+build-backend = "setuptools.build_meta"
diff --git a/tools/mpremote/setup.cfg b/tools/mpremote/setup.cfg
new file mode 100644
index 0000000000..4a1bf27c10
--- /dev/null
+++ b/tools/mpremote/setup.cfg
@@ -0,0 +1,25 @@
+[metadata]
+name = mpremote
+version = 0.0.4
+author = Damien George
+author_email = damien@micropython.org
+description = Tool for interacting remotely with MicroPython
+long_description = file: README.md
+long_description_content_type = text/markdown
+url = https://github.com/micropython/micropython
+project_urls =
+    Bug Tracker = https://github.com/micropython/micropython/issues
+classifiers =
+    Programming Language :: Python :: 3
+    License :: OSI Approved :: MIT License
+    Operating System :: OS Independent
+
+[options]
+packages = mpremote
+python_requires = >= 3.4
+install_requires =
+    pyserial >= 3.3
+
+[options.entry_points]
+console_scripts =
+  mpremote = mpremote.main:main

From f2dbc9102251f092e93b7c87cd8ffa5e9e5b880b Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sun, 1 Mar 2020 09:40:43 -0600
Subject: [PATCH 164/349] py/compile: Raise an error on async with/for outside
 an async function.

A simple reproducer is:

   async for x in (): x

Before this change, it would cause an assertion error in mpy-cross and
micropython-coverage.
---
 py/compile.c                          | 22 ++++++++++++++++------
 tests/basics/async_syntaxerror.py     | 19 +++++++++++++++++++
 tests/basics/async_syntaxerror.py.exp |  2 ++
 3 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 tests/basics/async_syntaxerror.py
 create mode 100644 tests/basics/async_syntaxerror.py.exp

diff --git a/py/compile.c b/py/compile.c
index 1182b8b1eb..0b02746a56 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -1970,13 +1970,23 @@ STATIC void compile_async_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
         compile_funcdef(comp, pns0);
         scope_t *fscope = (scope_t *)pns0->nodes[4];
         fscope->scope_flags |= MP_SCOPE_FLAG_GENERATOR;
-    } else if (MP_PARSE_NODE_STRUCT_KIND(pns0) == PN_for_stmt) {
-        // async for
-        compile_async_for_stmt(comp, pns0);
     } else {
-        // async with
-        assert(MP_PARSE_NODE_STRUCT_KIND(pns0) == PN_with_stmt);
-        compile_async_with_stmt(comp, pns0);
+        // async for/with; first verify the scope is a generator
+        int scope_flags = comp->scope_cur->scope_flags;
+        if (!(scope_flags & MP_SCOPE_FLAG_GENERATOR)) {
+            compile_syntax_error(comp, (mp_parse_node_t)pns0,
+                MP_ERROR_TEXT("async for/with outside async function"));
+            return;
+        }
+
+        if (MP_PARSE_NODE_STRUCT_KIND(pns0) == PN_for_stmt) {
+            // async for
+            compile_async_for_stmt(comp, pns0);
+        } else {
+            // async with
+            assert(MP_PARSE_NODE_STRUCT_KIND(pns0) == PN_with_stmt);
+            compile_async_with_stmt(comp, pns0);
+        }
     }
 }
 #endif
diff --git a/tests/basics/async_syntaxerror.py b/tests/basics/async_syntaxerror.py
new file mode 100644
index 0000000000..ddd2c4b59e
--- /dev/null
+++ b/tests/basics/async_syntaxerror.py
@@ -0,0 +1,19 @@
+# test syntax errors using async
+
+try:
+    exec
+except NameError:
+    print("SKIP")
+    raise SystemExit
+
+
+def test_syntax(code):
+    try:
+        exec(code)
+        print("no SyntaxError")
+    except SyntaxError:
+        print("SyntaxError")
+
+
+test_syntax("async for x in (): x")
+test_syntax("async with x: x")
diff --git a/tests/basics/async_syntaxerror.py.exp b/tests/basics/async_syntaxerror.py.exp
new file mode 100644
index 0000000000..5275689b41
--- /dev/null
+++ b/tests/basics/async_syntaxerror.py.exp
@@ -0,0 +1,2 @@
+SyntaxError
+SyntaxError

From 9a74546f8d2783502159cd99217c7d7e5d514261 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Mon, 10 May 2021 16:16:50 -0500
Subject: [PATCH 165/349] py/gc: Access the list of root pointers in an
 asan-compatible way.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/gc.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/py/gc.c b/py/gc.c
index 88adf2045e..56111bd3b6 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -342,9 +342,19 @@ void gc_collect_start(void) {
     #endif
 }
 
+// Address sanitizer needs to know that the access to ptrs[i] must always be
+// considered OK, even if it's a load from an address that would normally be
+// prohibited (due to being undefined, in a red zone, etc).
+#ifdef __GNUC__
+__attribute__((no_sanitize_address))
+#endif
+static void *gc_get_ptr(void **ptrs, int i) {
+    return ptrs[i];
+}
+
 void gc_collect_root(void **ptrs, size_t len) {
     for (size_t i = 0; i < len; i++) {
-        void *ptr = ptrs[i];
+        void *ptr = gc_get_ptr(ptrs, i);
         if (VERIFY_PTR(ptr)) {
             size_t block = BLOCK_FROM_PTR(ptr);
             if (ATB_GET_KIND(block) == AT_HEAD) {

From d67f4115b4be3619642c6e8694712ba5ed936e3e Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Mon, 10 May 2021 16:22:33 -0500
Subject: [PATCH 166/349] py/repl: Don't read past the end of import_str.

asan considers that memcmp(p, q, N) is permitted to access N bytes at each
of p and q, even for values of p and q that have a difference earlier.
Accessing additional values is frequently done in practice, reading 4 or
more bytes from each input at a time for efficiency, so when completing
"non_exist<TAB>" in the repl, this causes a diagnostic:

    ==16938==ERROR: AddressSanitizer: global-buffer-overflow on
    address 0x555555cd8dc8 at pc 0x7ffff726457b bp 0x7fffffffda20 sp 0x7fff
    READ of size 9 at 0x555555cd8dc8 thread T0
        #0 0x7ffff726457a  (/usr/lib/x86_64-linux-gnu/libasan.so.5+0xb857a)
        #1 0x555555b0e82a in mp_repl_autocomplete ../../py/repl.c:301
        #2 0x555555c89585 in readline_process_char ../../lib/mp-readline/re
        #3 0x555555c8ac6e in readline ../../lib/mp-readline/readline.c:513
        #4 0x555555b8dcbd in do_repl /home/jepler/src/micropython/ports/uni
        #5 0x555555b90859 in main_ /home/jepler/src/micropython/ports/unix/
        #6 0x555555b90a3a in main /home/jepler/src/micropython/ports/unix/m
        #7 0x7ffff619a09a in __libc_start_main ../csu/libc-start.c:308
        #8 0x55555595fd69 in _start (/home/jepler/src/micropython/ports/uni

    0x555555cd8dc8 is located 0 bytes to the right of global variable
    'import_str' defined in '../../py/repl.c:285:23' (0x555555cd8dc0) of
    size 8
      'import_str' is ascii string 'import '

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/repl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/repl.c b/py/repl.c
index 57bc21eff0..822e385abd 100644
--- a/py/repl.c
+++ b/py/repl.c
@@ -297,7 +297,7 @@ size_t mp_repl_autocomplete(const char *str, size_t len, const mp_print_t *print
     if (q_first == 0) {
         // If there're no better alternatives, and if it's first word
         // in the line, try to complete "import".
-        if (s_start == org_str && s_len > 0) {
+        if (s_start == org_str && s_len > 0 && s_len < sizeof(import_str) - 1) {
             if (memcmp(s_start, import_str, s_len) == 0) {
                 *compl_str = import_str + s_len;
                 return sizeof(import_str) - 1 - s_len;

From 486fe71c6ee3fbc4bbebf348832e88880b8a5bae Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Mon, 10 May 2021 17:12:15 -0500
Subject: [PATCH 167/349] tests/extmod/btree_gc.py: Close the database to avoid
 a memory leak.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 tests/extmod/btree_gc.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/extmod/btree_gc.py b/tests/extmod/btree_gc.py
index 153f4e7d78..1845aa0640 100644
--- a/tests/extmod/btree_gc.py
+++ b/tests/extmod/btree_gc.py
@@ -21,3 +21,6 @@ for i in range(N):
     db[b"thekey" + str(i)] = b"thelongvalue" + str(i)
     print(db[b"thekey" + str(i)])
     gc.collect()
+
+# Reclaim memory allocated by the db object.
+db.close()

From 025e4b6fbc32cd3118a5519cf6a18aa04b045abe Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 30 May 2021 09:42:27 +1000
Subject: [PATCH 168/349] tests/basics: Split out literal tests that raise
 SyntaxWarning on CPy.

Fixes issue #7330.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/basics/is_isnot.py             | 10 ----------
 tests/basics/is_isnot_literal.py     | 13 +++++++++++++
 tests/basics/is_isnot_literal.py.exp |  8 ++++++++
 tests/basics/op_error.py             | 14 --------------
 tests/basics/op_error_literal.py     | 18 ++++++++++++++++++
 tests/basics/op_error_literal.py.exp |  3 +++
 6 files changed, 42 insertions(+), 24 deletions(-)
 create mode 100644 tests/basics/is_isnot_literal.py
 create mode 100644 tests/basics/is_isnot_literal.py.exp
 create mode 100644 tests/basics/op_error_literal.py
 create mode 100644 tests/basics/op_error_literal.py.exp

diff --git a/tests/basics/is_isnot.py b/tests/basics/is_isnot.py
index 990190aa41..55459cb0a6 100644
--- a/tests/basics/is_isnot.py
+++ b/tests/basics/is_isnot.py
@@ -1,14 +1,4 @@
-print(1 is 1)
-print(1 is 2)
-print(1 is not 1)
-print(1 is not 2)
-
-
 print([1, 2] is [1, 2])
 a = [1, 2]
 b = a
 print(b is a)
-
-# TODO: strings require special "is" handling, postponed
-# until qstr refactor.
-#print("a" is "a")
diff --git a/tests/basics/is_isnot_literal.py b/tests/basics/is_isnot_literal.py
new file mode 100644
index 0000000000..1626fa949f
--- /dev/null
+++ b/tests/basics/is_isnot_literal.py
@@ -0,0 +1,13 @@
+# test "is" and "is not" with literal arguments
+# these raise a SyntaxWarning in CPython because the results are
+# implementation dependent; see https://bugs.python.org/issue34850
+
+print(1 is 1)
+print(1 is 2)
+print(1 is not 1)
+print(1 is not 2)
+
+print("a" is "a")
+print("a" is "b")
+print("a" is not "a")
+print("a" is not "b")
diff --git a/tests/basics/is_isnot_literal.py.exp b/tests/basics/is_isnot_literal.py.exp
new file mode 100644
index 0000000000..fc4b8f8129
--- /dev/null
+++ b/tests/basics/is_isnot_literal.py.exp
@@ -0,0 +1,8 @@
+True
+False
+False
+True
+True
+False
+False
+True
diff --git a/tests/basics/op_error.py b/tests/basics/op_error.py
index 63c35db3f5..98a3ab025a 100644
--- a/tests/basics/op_error.py
+++ b/tests/basics/op_error.py
@@ -29,18 +29,10 @@ except TypeError:
     print('TypeError')
 
 # unsupported subscription
-try:
-    1[0]
-except TypeError:
-    print('TypeError')
 try:
     1[0] = 1
 except TypeError:
     print('TypeError')
-try:
-    ''['']
-except TypeError:
-    print('TypeError')
 try:
     'a'[0] = 1
 except TypeError:
@@ -50,12 +42,6 @@ try:
 except TypeError:
     print('TypeError')
 
-# not callable
-try:
-    1()
-except TypeError:
-    print('TypeError')
-
 # not an iterator
 try:
     next(1)
diff --git a/tests/basics/op_error_literal.py b/tests/basics/op_error_literal.py
new file mode 100644
index 0000000000..00244ee2b2
--- /dev/null
+++ b/tests/basics/op_error_literal.py
@@ -0,0 +1,18 @@
+# test errors from bad operations with literals
+# these raise a SyntaxWarning in CPython; see https://bugs.python.org/issue15248
+
+# unsupported subscription
+try:
+    1[0]
+except TypeError:
+    print("TypeError")
+try:
+    ""[""]
+except TypeError:
+    print("TypeError")
+
+# not callable
+try:
+    1()
+except TypeError:
+    print("TypeError")
diff --git a/tests/basics/op_error_literal.py.exp b/tests/basics/op_error_literal.py.exp
new file mode 100644
index 0000000000..a8ea4fb10b
--- /dev/null
+++ b/tests/basics/op_error_literal.py.exp
@@ -0,0 +1,3 @@
+TypeError
+TypeError
+TypeError

From 34d4dab683c69578b0ddd1725290529dd812b291 Mon Sep 17 00:00:00 2001
From: Macarthur Inbody <133794m3r@gmail.com>
Date: Wed, 23 Dec 2020 12:05:26 -0500
Subject: [PATCH 169/349] extmod/modurandom: Add error message when getrandbits
 has bad value.

The random module's getrandbits() method didn't give a proper error message
when calling it with a value that was outside of the range of 1-32, which
can lead to confusion using this function (which under CPython can accept
numbers larger than 32).  Now instead of simply giving a ValueError it
gives an error message that states that the number of bits is constrained.

Also, since the random module's functions getrandbits() and randint()
differ from CPython, tests have been added to describe these differences.
For getrandbits the relevant documentation is shown and added to the docs.
The same is given for randint method so that the information is more easily
found.

Finally, since the int object lacks the bit_length() method there is a test
for that method also to include within the docs, showing the difference to
CPython.
---
 extmod/modurandom.c                         |  2 +-
 tests/cpydiff/modules_random_getrandbits.py | 12 ++++++++++++
 tests/cpydiff/modules_random_randint.py     | 12 ++++++++++++
 tests/cpydiff/types_int_bit_length.py       |  9 +++++++++
 4 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 tests/cpydiff/modules_random_getrandbits.py
 create mode 100644 tests/cpydiff/modules_random_randint.py
 create mode 100644 tests/cpydiff/types_int_bit_length.py

diff --git a/extmod/modurandom.c b/extmod/modurandom.c
index 5a736c1ebc..f44510be9b 100644
--- a/extmod/modurandom.c
+++ b/extmod/modurandom.c
@@ -88,7 +88,7 @@ STATIC uint32_t yasmarang_randbelow(uint32_t n) {
 STATIC mp_obj_t mod_urandom_getrandbits(mp_obj_t num_in) {
     int n = mp_obj_get_int(num_in);
     if (n > 32 || n == 0) {
-        mp_raise_ValueError(NULL);
+        mp_raise_ValueError(MP_ERROR_TEXT("bits must be 32 or less"));
     }
     uint32_t mask = ~0;
     // Beware of C undefined behavior when shifting by >= than bit size
diff --git a/tests/cpydiff/modules_random_getrandbits.py b/tests/cpydiff/modules_random_getrandbits.py
new file mode 100644
index 0000000000..523e3a329d
--- /dev/null
+++ b/tests/cpydiff/modules_random_getrandbits.py
@@ -0,0 +1,12 @@
+"""
+categories: Modules,random
+description: ``getrandbits`` method can only return a maximum of 32 bits at a time.
+cause: PRNG's internal state is only 32bits so it can only return a maximum of 32 bits of data at a time.
+workaround: If you need a number that has more than 32 bits then utilize the random module from micropython-lib.
+"""
+
+import random
+
+
+x = random.getrandbits(64)
+print("{}".format(x))
diff --git a/tests/cpydiff/modules_random_randint.py b/tests/cpydiff/modules_random_randint.py
new file mode 100644
index 0000000000..b05908a157
--- /dev/null
+++ b/tests/cpydiff/modules_random_randint.py
@@ -0,0 +1,12 @@
+"""
+categories: Modules,random
+description: ``randint`` method can only return an integer that is at most the native word size.
+cause: PRNG is only able to generate 32 bits of state at a time. The result is then cast into a native sized int instead of a full int object.
+workaround: If you need integers larger than native wordsize use the random module from micropython-lib.
+"""
+
+import random
+
+
+x = random.randint(2 ** 128 - 1, 2 ** 128)
+print("x={}".format(x))
diff --git a/tests/cpydiff/types_int_bit_length.py b/tests/cpydiff/types_int_bit_length.py
new file mode 100644
index 0000000000..2e907745a9
--- /dev/null
+++ b/tests/cpydiff/types_int_bit_length.py
@@ -0,0 +1,9 @@
+"""
+categories: Types,int
+description: ``bit_length`` method doesn't exist.
+cause: bit_length method is not implemented.
+workaround: Avoid using this method on MicroPython.
+"""
+
+x = 255
+print("{} is {} bits long.".format(x, x.bit_length()))

From c3199f56494429ba44f7e722597945dc91f3589c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 30 May 2021 16:52:08 +1000
Subject: [PATCH 170/349] extmod/modurandom: Support an argument of bits=0 to
 getrandbits.

This was changed in CPython 3.9; see https://bugs.python.org/issue40282.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modurandom.c               | 5 ++++-
 tests/extmod/urandom_basic.py     | 7 +++++--
 tests/extmod/urandom_basic.py.exp | 4 ++++
 3 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 tests/extmod/urandom_basic.py.exp

diff --git a/extmod/modurandom.c b/extmod/modurandom.c
index f44510be9b..21fbac6942 100644
--- a/extmod/modurandom.c
+++ b/extmod/modurandom.c
@@ -87,9 +87,12 @@ STATIC uint32_t yasmarang_randbelow(uint32_t n) {
 
 STATIC mp_obj_t mod_urandom_getrandbits(mp_obj_t num_in) {
     int n = mp_obj_get_int(num_in);
-    if (n > 32 || n == 0) {
+    if (n > 32 || n < 0) {
         mp_raise_ValueError(MP_ERROR_TEXT("bits must be 32 or less"));
     }
+    if (n == 0) {
+        return MP_OBJ_NEW_SMALL_INT(0);
+    }
     uint32_t mask = ~0;
     // Beware of C undefined behavior when shifting by >= than bit size
     mask >>= (32 - n);
diff --git a/tests/extmod/urandom_basic.py b/tests/extmod/urandom_basic.py
index 180197398f..f7f5a6d691 100644
--- a/tests/extmod/urandom_basic.py
+++ b/tests/extmod/urandom_basic.py
@@ -22,8 +22,11 @@ r = random.getrandbits(16)
 random.seed(1)
 print(random.getrandbits(16) == r)
 
-# check that it throws an error for zero bits
+# check that zero bits works
+print(random.getrandbits(0))
+
+# check that it throws an error for negative bits
 try:
-    random.getrandbits(0)
+    random.getrandbits(-1)
 except ValueError:
     print("ValueError")
diff --git a/tests/extmod/urandom_basic.py.exp b/tests/extmod/urandom_basic.py.exp
new file mode 100644
index 0000000000..d629828d79
--- /dev/null
+++ b/tests/extmod/urandom_basic.py.exp
@@ -0,0 +1,4 @@
+True
+True
+0
+ValueError

From 53519e322a5a0bb395676cdaa132f5e82de22909 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 30 May 2021 19:25:53 +1000
Subject: [PATCH 171/349] py/builtinimport: Change relative import's ValueError
 to ImportError.

Following CPython change, see https://bugs.python.org/issue37444.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/builtinimport.c                        | 2 +-
 tests/import/import_pkg7.py.exp           | 8 ++++++++
 tests/import/pkg7/subpkg1/subpkg2/mod3.py | 4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 tests/import/import_pkg7.py.exp

diff --git a/py/builtinimport.c b/py/builtinimport.c
index 874d2dd7f0..abbeefced5 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -313,7 +313,7 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
 
         // We must have some component left over to import from
         if (p == this_name) {
-            mp_raise_ValueError(MP_ERROR_TEXT("can't perform relative import"));
+            mp_raise_msg(&mp_type_ImportError, MP_ERROR_TEXT("can't perform relative import"));
         }
 
         uint new_mod_l = (mod_len == 0 ? (size_t)(p - this_name) : (size_t)(p - this_name) + 1 + mod_len);
diff --git a/tests/import/import_pkg7.py.exp b/tests/import/import_pkg7.py.exp
new file mode 100644
index 0000000000..8f21a615f6
--- /dev/null
+++ b/tests/import/import_pkg7.py.exp
@@ -0,0 +1,8 @@
+pkg __name__: pkg7
+pkg __name__: pkg7.subpkg1
+pkg __name__: pkg7.subpkg1.subpkg2
+mod1
+mod2
+mod1.foo
+mod2.bar
+ImportError
diff --git a/tests/import/pkg7/subpkg1/subpkg2/mod3.py b/tests/import/pkg7/subpkg1/subpkg2/mod3.py
index 0aa916d208..b0f4279fcf 100644
--- a/tests/import/pkg7/subpkg1/subpkg2/mod3.py
+++ b/tests/import/pkg7/subpkg1/subpkg2/mod3.py
@@ -7,5 +7,5 @@ print(bar)
 # attempted relative import beyond top-level package
 try:
     from .... import mod1
-except ValueError:
-    print("ValueError")
+except ImportError:
+    print("ImportError")

From a6a8941d84a4d38129bdc00be701a7ca8fc867b6 Mon Sep 17 00:00:00 2001
From: Matt Trentini <matthew.trentini@planetinnovation.com.au>
Date: Sun, 23 May 2021 17:20:43 +1000
Subject: [PATCH 172/349] docs/rp2: Add skeleton docs for the rp2 port.

---
 docs/index.rst               |   1 +
 docs/rp2/general.rst         |  18 +++
 docs/rp2/img/rpipico.jpg     | Bin 0 -> 89259 bytes
 docs/rp2/quickref.rst        | 288 +++++++++++++++++++++++++++++++++++
 docs/rp2/tutorial/intro.rst  |   6 +
 docs/templates/topindex.html |   4 +
 6 files changed, 317 insertions(+)
 create mode 100644 docs/rp2/general.rst
 create mode 100644 docs/rp2/img/rpipico.jpg
 create mode 100644 docs/rp2/quickref.rst
 create mode 100644 docs/rp2/tutorial/intro.rst

diff --git a/docs/index.rst b/docs/index.rst
index f760fa12a0..58552daf51 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -11,5 +11,6 @@ MicroPython documentation and references
     pyboard/quickref.rst
     esp8266/quickref.rst
     esp32/quickref.rst
+    rp2/quickref.rst
     wipy/quickref.rst
     unix/quickref.rst
diff --git a/docs/rp2/general.rst b/docs/rp2/general.rst
new file mode 100644
index 0000000000..9ff83a9656
--- /dev/null
+++ b/docs/rp2/general.rst
@@ -0,0 +1,18 @@
+.. _rp2_general:
+
+General information about the RP2xxx port
+=========================================
+
+The rp2 port supports boards powered by the Raspberry Pi Foundation's RP2xxx
+family of microcontrollers, most notably the Raspberry Pi Pico that employs
+the RP2040.
+
+Technical specifications and SoC datasheets
+-------------------------------------------
+
+Datasheets!
+
+Short summary of tech specs!
+
+Description of general structure of the port (it's built on top of the APIs
+provided by the Raspberry Pi SDK).
diff --git a/docs/rp2/img/rpipico.jpg b/docs/rp2/img/rpipico.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..336d3582775b8701d670403b0e63df8fcefc478c
GIT binary patch
literal 89259
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

literal 0
HcmV?d00001

diff --git a/docs/rp2/quickref.rst b/docs/rp2/quickref.rst
new file mode 100644
index 0000000000..6bbe179541
--- /dev/null
+++ b/docs/rp2/quickref.rst
@@ -0,0 +1,288 @@
+.. _rp2_quickref:
+
+Quick reference for the RP2
+===========================
+
+.. image:: img/rpipico.jpg
+    :alt: Raspberry Pi Pico
+    :width: 640px
+
+The Raspberry Pi Pico Development Board (image attribution: Raspberry Pi Foundation).
+
+Below is a quick reference for Raspberry Pi RP2xxx boards.  If it is your first time
+working with this board it may be useful to get an overview of the microcontroller:
+
+.. toctree::
+   :maxdepth: 1
+
+   general.rst
+   tutorial/intro.rst
+
+Installing MicroPython
+----------------------
+
+See the corresponding section of tutorial: :ref:`rp2_intro`. It also includes
+a troubleshooting subsection.
+
+General board control
+---------------------
+
+The MicroPython REPL is on the USB serial port.
+Tab-completion is useful to find out what methods an object has.
+Paste mode (ctrl-E) is useful to paste a large slab of Python code into
+the REPL.
+
+The :mod:`machine` module::
+
+    import machine
+
+    machine.freq()          # get the current frequency of the CPU
+    machine.freq(240000000) # set the CPU frequency to 240 MHz
+
+The :mod:`rp2` module::
+
+    import rp2
+
+Delay and timing
+----------------
+
+Use the :mod:`time <utime>` module::
+
+    import time
+
+    time.sleep(1)           # sleep for 1 second
+    time.sleep_ms(500)      # sleep for 500 milliseconds
+    time.sleep_us(10)       # sleep for 10 microseconds
+    start = time.ticks_ms() # get millisecond counter
+    delta = time.ticks_diff(time.ticks_ms(), start) # compute time difference
+
+Timers
+------
+
+How do they work?
+
+.. _rp2_Pins_and_GPIO:
+
+Pins and GPIO
+-------------
+
+Use the :ref:`machine.Pin <machine.Pin>` class::
+
+    from machine import Pin
+
+    p0 = Pin(0, Pin.OUT)    # create output pin on GPIO0
+    p0.on()                 # set pin to "on" (high) level
+    p0.off()                # set pin to "off" (low) level
+    p0.value(1)             # set pin to on/high
+
+    p2 = Pin(2, Pin.IN)     # create input pin on GPIO2
+    print(p2.value())       # get value, 0 or 1
+
+    p4 = Pin(4, Pin.IN, Pin.PULL_UP) # enable internal pull-up resistor
+    p5 = Pin(5, Pin.OUT, value=1) # set pin high on creation
+
+UART (serial bus)
+-----------------
+
+See :ref:`machine.UART <machine.UART>`. ::
+
+    from machine import UART
+
+    uart1 = UART(1, baudrate=9600, tx=33, rx=32)
+    uart1.write('hello')  # write 5 bytes
+    uart1.read(5)         # read up to 5 bytes
+
+
+PWM (pulse width modulation)
+----------------------------
+
+How does PWM work on the RPi RP2xxx?
+
+Use the ``machine.PWM`` class::
+
+    from machine import Pin, PWM
+
+    pwm0 = PWM(Pin(0))      # create PWM object from a pin
+    pwm0.freq()             # get current frequency
+    pwm0.freq(1000)         # set frequency
+    pwm0.duty_u16()         # get current duty cycle, range 0-65535
+    pwm0.duty_u16(200)      # set duty cycle, range 0-65535
+    pwm0.deinit()           # turn off PWM on the pin
+
+ADC (analog to digital conversion)
+----------------------------------
+
+How does the ADC module work?
+
+Use the :ref:`machine.ADC <machine.ADC>` class::
+
+    from machine import ADC
+
+    adc = ADC(Pin(32))          # create ADC object on ADC pin
+    adc.read_u16()              # read value, 0-65535 across voltage range 0.0v - 3.3v
+
+Software SPI bus
+----------------
+
+Software SPI (using bit-banging) works on all pins, and is accessed via the
+:ref:`machine.SoftSPI <machine.SoftSPI>` class::
+
+    from machine import Pin, SoftSPI
+
+    # construct a SoftSPI bus on the given pins
+    # polarity is the idle state of SCK
+    # phase=0 means sample on the first edge of SCK, phase=1 means the second
+    spi = SoftSPI(baudrate=100000, polarity=1, phase=0, sck=Pin(0), mosi=Pin(2), miso=Pin(4))
+
+    spi.init(baudrate=200000) # set the baudrate
+
+    spi.read(10)            # read 10 bytes on MISO
+    spi.read(10, 0xff)      # read 10 bytes while outputting 0xff on MOSI
+
+    buf = bytearray(50)     # create a buffer
+    spi.readinto(buf)       # read into the given buffer (reads 50 bytes in this case)
+    spi.readinto(buf, 0xff) # read into the given buffer and output 0xff on MOSI
+
+    spi.write(b'12345')     # write 5 bytes on MOSI
+
+    buf = bytearray(4)      # create a buffer
+    spi.write_readinto(b'1234', buf) # write to MOSI and read from MISO into the buffer
+    spi.write_readinto(buf, buf) # write buf to MOSI and read MISO back into buf
+
+.. Warning::
+   Currently *all* of ``sck``, ``mosi`` and ``miso`` *must* be specified when
+   initialising Software SPI.
+
+Hardware SPI bus
+----------------
+
+Hardware SPI is accessed via the :ref:`machine.SPI <machine.SPI>` class and
+has the same methods as software SPI above::
+
+    from machine import Pin, SPI
+
+    spi = SPI(1, 10000000)
+    spi = SPI(1, 10000000, sck=Pin(14), mosi=Pin(13), miso=Pin(12))
+    spi = SPI(2, baudrate=80000000, polarity=0, phase=0, bits=8, firstbit=0, sck=Pin(18), mosi=Pin(23), miso=Pin(19))
+
+Software I2C bus
+----------------
+
+Software I2C (using bit-banging) works on all output-capable pins, and is
+accessed via the :ref:`machine.SoftI2C <machine.SoftI2C>` class::
+
+    from machine import Pin, SoftI2C
+
+    i2c = SoftI2C(scl=Pin(5), sda=Pin(4), freq=100000)
+
+    i2c.scan()              # scan for devices
+
+    i2c.readfrom(0x3a, 4)   # read 4 bytes from device with address 0x3a
+    i2c.writeto(0x3a, '12') # write '12' to device with address 0x3a
+
+    buf = bytearray(10)     # create a buffer with 10 bytes
+    i2c.writeto(0x3a, buf)  # write the given buffer to the slave
+
+Hardware I2C bus
+----------------
+
+The driver is accessed via the :ref:`machine.I2C <machine.I2C>` class and
+has the same methods as software I2C above::
+
+    from machine import Pin, I2C
+
+    i2c = I2C(0)
+    i2c = I2C(1, scl=Pin(5), sda=Pin(4), freq=400000)
+
+Real time clock (RTC)
+---------------------
+
+See :ref:`machine.RTC <machine.RTC>` ::
+
+    from machine import RTC
+
+    rtc = RTC()
+    rtc.datetime((2017, 8, 23, 1, 12, 48, 0, 0)) # set a specific date and time
+    rtc.datetime() # get date and time
+
+WDT (Watchdog timer)
+--------------------
+
+Is there a watchdog timer?
+
+See :ref:`machine.WDT <machine.WDT>`. ::
+
+    from machine import WDT
+
+    # enable the WDT with a timeout of 5s (1s is the minimum)
+    wdt = WDT(timeout=5000)
+    wdt.feed()
+
+Deep-sleep mode
+---------------
+
+Is there deep-sleep support for the rp2?
+
+The following code can be used to sleep, wake and check the reset cause::
+
+    import machine
+
+    # check if the device woke from a deep sleep
+    if machine.reset_cause() == machine.DEEPSLEEP_RESET:
+        print('woke from a deep sleep')
+
+    # put the device to sleep for 10 seconds
+    machine.deepsleep(10000)
+
+OneWire driver
+--------------
+
+The OneWire driver is implemented in software and works on all pins::
+
+    from machine import Pin
+    import onewire
+
+    ow = onewire.OneWire(Pin(12)) # create a OneWire bus on GPIO12
+    ow.scan()               # return a list of devices on the bus
+    ow.reset()              # reset the bus
+    ow.readbyte()           # read a byte
+    ow.writebyte(0x12)      # write a byte on the bus
+    ow.write('123')         # write bytes on the bus
+    ow.select_rom(b'12345678') # select a specific device by its ROM code
+
+There is a specific driver for DS18S20 and DS18B20 devices::
+
+    import time, ds18x20
+    ds = ds18x20.DS18X20(ow)
+    roms = ds.scan()
+    ds.convert_temp()
+    time.sleep_ms(750)
+    for rom in roms:
+        print(ds.read_temp(rom))
+
+Be sure to put a 4.7k pull-up resistor on the data line.  Note that
+the ``convert_temp()`` method must be called each time you want to
+sample the temperature.
+
+NeoPixel and APA106 driver
+--------------------------
+
+Use the ``neopixel`` and ``apa106`` modules::
+
+    from machine import Pin
+    from neopixel import NeoPixel
+
+    pin = Pin(0, Pin.OUT)   # set GPIO0 to output to drive NeoPixels
+    np = NeoPixel(pin, 8)   # create NeoPixel driver on GPIO0 for 8 pixels
+    np[0] = (255, 255, 255) # set the first pixel to white
+    np.write()              # write data to all pixels
+    r, g, b = np[0]         # get first pixel colour
+
+
+The APA106 driver extends NeoPixel, but internally uses a different colour order::
+
+    from apa106 import APA106
+    ap = APA106(pin, 8)
+    r, g, b = ap[0]
+
+APA102 (DotStar) uses a different driver as it has an additional clock pin.
diff --git a/docs/rp2/tutorial/intro.rst b/docs/rp2/tutorial/intro.rst
new file mode 100644
index 0000000000..5609ab3798
--- /dev/null
+++ b/docs/rp2/tutorial/intro.rst
@@ -0,0 +1,6 @@
+.. _rp2_intro:
+
+Getting started with MicroPython on the RP2xxx
+==============================================
+
+Let's get started!
diff --git a/docs/templates/topindex.html b/docs/templates/topindex.html
index ff766b0cf2..42233942bc 100644
--- a/docs/templates/topindex.html
+++ b/docs/templates/topindex.html
@@ -58,6 +58,10 @@
         <a class="biglink" href="{{ pathto("esp32/quickref") }}">Quick reference for the ESP32</a><br/>
         <span class="linkdescr">pinout for ESP32-based boards, snippets of useful code, and a tutorial</span>
       </p>
+      <p class="biglink">
+        <a class="biglink" href="{{ pathto("rp2/quickref") }}">Quick reference for the Raspberry Pi RP2xxx</a><br/>
+        <span class="linkdescr">pinout for rp2xxx-based boards, snippets of useful code, and a tutorial</span>
+      </p>
       <p class="biglink">
         <a class="biglink" href="{{ pathto("wipy/quickref") }}">Quick reference for the WiPy/CC3200</a><br/>
         <span class="linkdescr">pinout for the WiPy/CC3200, snippets of useful code, and a tutorial</span>

From a18f695e294baf22bd7862e5be57aa0c820c7c77 Mon Sep 17 00:00:00 2001
From: IAMLIUBO <imliubo@makingfun.xyz>
Date: Thu, 27 May 2021 11:11:34 +0800
Subject: [PATCH 173/349] esp32/boards: Add M5STACK_ATOM board definition.

ATOM is a very small ESP32 development board produced by M5Stack, with a
size of 24mm * 24mm, with peripherals such as WS2812, IR, button, MPU6886
(Only Matrix), and 8 GPIO extensions.  It also has a plastic shell.
---
 ports/esp32/boards/M5STACK_ATOM/manifest.py   |  2 +
 .../esp32/boards/M5STACK_ATOM/modules/atom.py | 75 +++++++++++++++++++
 .../boards/M5STACK_ATOM/mpconfigboard.cmake   | 10 +++
 .../esp32/boards/M5STACK_ATOM/mpconfigboard.h |  2 +
 .../esp32/boards/M5STACK_ATOM/sdkconfig.board |  5 ++
 5 files changed, 94 insertions(+)
 create mode 100644 ports/esp32/boards/M5STACK_ATOM/manifest.py
 create mode 100644 ports/esp32/boards/M5STACK_ATOM/modules/atom.py
 create mode 100644 ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/M5STACK_ATOM/mpconfigboard.h
 create mode 100644 ports/esp32/boards/M5STACK_ATOM/sdkconfig.board

diff --git a/ports/esp32/boards/M5STACK_ATOM/manifest.py b/ports/esp32/boards/M5STACK_ATOM/manifest.py
new file mode 100644
index 0000000000..7ae2ed15d9
--- /dev/null
+++ b/ports/esp32/boards/M5STACK_ATOM/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+freeze("modules")
diff --git a/ports/esp32/boards/M5STACK_ATOM/modules/atom.py b/ports/esp32/boards/M5STACK_ATOM/modules/atom.py
new file mode 100644
index 0000000000..8f47585f19
--- /dev/null
+++ b/ports/esp32/boards/M5STACK_ATOM/modules/atom.py
@@ -0,0 +1,75 @@
+# M5Stack ATOM MicroPython Helper Library
+# MIT license; Copyright (c) 2021 IAMLIUBO work for M5STACK
+#
+# Hardware details:
+#       ATOM Lite    https://docs.m5stack.com/en/core/atom_lite
+#       ATOM Matrix  https://docs.m5stack.com/en/core/atom_matrix
+
+from micropython import const
+from machine import Pin
+import neopixel
+
+# M5STACK ATOM Hardware Pin Assignments
+"""
+          FRONT
+                  |3V3|
+|G21|   IR   G12  |G22|
+|G25|   BTN  G39  |G19|
+| 5V| WS2812  G27 |G23|
+|GNG| MPU G21 G25 |G33|
+     G32 G26 5V GND
+       Grove Port
+"""
+
+# WS2812
+WS2812_PIN = const(27)
+
+# Button
+BUTTON_PIN = const(39)
+
+# IR
+IR_PIN = const(12)
+
+# I2C
+I2C0_SCL_PIN = const(21)
+I2C0_SDA_PIN = const(25)
+
+# Grove port
+GROVE_PORT_PIN = (const(26), const(32))
+
+
+class ATOM:
+    def __init__(self, np_n):
+        self._np = neopixel.NeoPixel(pin=Pin(WS2812_PIN), n=np_n)
+        self._btn = Pin(BUTTON_PIN, Pin.IN, Pin.PULL_UP)
+
+    def get_button_status(self):
+        return self._btn.value()
+
+    def set_button_callback(self, cb):
+        self._btn.irq(trigger=Pin.IRQ_FALLING, handler=cb)
+
+    def set_pixel_color(self, num, r, g, b):
+        if num <= self._np.n:
+            self._np[num] = [r, g, b]
+            self._np.write()
+
+    def get_pixel_color(self, num):
+        if num <= self._np.n:
+            return self._np[num]
+
+    def set_pixels_color(self, r, g, b):
+        self._np.fill([r, g, b])
+        self._np.write()
+
+
+class Lite(ATOM):
+    # WS2812 number: 1
+    def __init__(self):
+        super(Lite, self).__init__(np_n=1)
+
+
+class Matrix(ATOM):
+    # WS2812 number: 25
+    def __init__(self):
+        super(Matrix, self).__init__(np_n=25)
diff --git a/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake b/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake
new file mode 100644
index 0000000000..548337a479
--- /dev/null
+++ b/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake
@@ -0,0 +1,10 @@
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.ble
+    boards/sdkconfig.240mhz
+    boards/M5STACK_ATOM/sdkconfig.board
+)
+
+if(NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
+endif()
diff --git a/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.h b/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.h
new file mode 100644
index 0000000000..4270b19caf
--- /dev/null
+++ b/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.h
@@ -0,0 +1,2 @@
+#define MICROPY_HW_BOARD_NAME "M5Stack ATOM"
+#define MICROPY_HW_MCU_NAME "ESP32-PICO-D4"
diff --git a/ports/esp32/boards/M5STACK_ATOM/sdkconfig.board b/ports/esp32/boards/M5STACK_ATOM/sdkconfig.board
new file mode 100644
index 0000000000..b299822dcb
--- /dev/null
+++ b/ports/esp32/boards/M5STACK_ATOM/sdkconfig.board
@@ -0,0 +1,5 @@
+CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_SPIRAM_SPEED_80M=y
+CONFIG_ESP32_REV_MIN_1=y
+CONFIG_LWIP_LOCAL_HOSTNAME="M5StackATOM"

From c5d2095e593e5f0834179b04fcb7b3675524408d Mon Sep 17 00:00:00 2001
From: Joseph Chiu <joechiu@joechiu.com>
Date: Wed, 5 May 2021 03:43:42 -0700
Subject: [PATCH 174/349] esp32/espneopixel: Add support for GPIO32 and GPIO33.

Adds support for NeoPixels on GPIO32 and GPIO33 on ESP32.  Otherwise,
NeoPixels wired to GPIO32/33 wll silently fail without any hints to the
user.

With thanks to @robert-hh.

Fixes issue #7221.
---
 ports/esp32/espneopixel.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/ports/esp32/espneopixel.c b/ports/esp32/espneopixel.c
index bcdf38873b..a5937b9c6b 100644
--- a/ports/esp32/espneopixel.c
+++ b/ports/esp32/espneopixel.c
@@ -11,9 +11,17 @@
 
 void IRAM_ATTR esp_neopixel_write(uint8_t pin, uint8_t *pixels, uint32_t numBytes, uint8_t timing) {
     uint8_t *p, *end, pix, mask;
-    uint32_t t, time0, time1, period, c, startTime, pinMask;
+    uint32_t t, time0, time1, period, c, startTime, pinMask, gpio_reg_set, gpio_reg_clear;
 
-    pinMask = 1 << pin;
+    if (pin < 32) {
+        pinMask = 1 << pin;
+        gpio_reg_set = GPIO_OUT_W1TS_REG;
+        gpio_reg_clear = GPIO_OUT_W1TC_REG;
+    } else {
+        pinMask = 1 << (pin - 32);
+        gpio_reg_set = GPIO_OUT1_W1TS_REG;
+        gpio_reg_clear = GPIO_OUT1_W1TC_REG;
+    }
     p = pixels;
     end = p + numBytes;
     pix = *p++;
@@ -42,12 +50,12 @@ void IRAM_ATTR esp_neopixel_write(uint8_t pin, uint8_t *pixels, uint32_t numByte
         while (((c = mp_hal_ticks_cpu()) - startTime) < period) {
             ;                                                       // Wait for bit start
         }
-        GPIO_REG_WRITE(GPIO_OUT_W1TS_REG, pinMask);                 // Set high
+        GPIO_REG_WRITE(gpio_reg_set, pinMask);                      // Set high
         startTime = c;                                              // Save start time
         while (((c = mp_hal_ticks_cpu()) - startTime) < t) {
             ;                                                       // Wait high duration
         }
-        GPIO_REG_WRITE(GPIO_OUT_W1TC_REG, pinMask);                 // Set low
+        GPIO_REG_WRITE(gpio_reg_clear, pinMask);                    // Set low
         if (!(mask >>= 1)) {                                        // Next bit/byte
             if (p >= end) {
                 break;

From fdaf2b80d9e67e9cf792b5aa034078c2fdad70d4 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 6 May 2021 20:35:33 +0200
Subject: [PATCH 175/349] mimxrt: Add custom help text and enable
 help("modules").

---
 ports/mimxrt/main.c         | 24 ++++++++++++++++++++++++
 ports/mimxrt/mpconfigport.h |  3 +++
 2 files changed, 27 insertions(+)

diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index 7832afffcb..387c96ef33 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -108,3 +108,27 @@ void MP_WEAK __assert_func(const char *file, int line, const char *func, const c
     }
 }
 #endif
+
+const char mimxrt_help_text[] =
+    "Welcome to MicroPython!\n"
+    "\n"
+    "For online help please visit https://micropython.org/help/.\n"
+    "\n"
+    "For access to the hardware use the 'machine' module. \n"
+    "\n"
+    "Quick overview of some objects:\n"
+    "  machine.Pin(pin) -- get a pin, eg machine.Pin(0)\n"
+    "  machine.Pin(pin, m, [p]) -- get a pin and configure it for IO mode m, pull mode p\n"
+    "    methods: init(..), value([v]), high(), low())\n"
+    "\n"
+    "Pin IO modes are: Pin.IN, Pin.OUT\n"
+    "Pin pull modes are: Pin.PULL_UP, Pin.PULL_UP_47K, Pin.PULL_UP_22K, Pin.PULL_DOWN, Pin.PULL_HOLD\n"
+    "\n"
+    "Useful control commands:\n"
+    "  CTRL-C -- interrupt a running program\n"
+    "  CTRL-D -- on a blank line, do a soft reset of the board\n"
+    "  CTRL-E -- on a blank line, enter paste mode\n"
+    "\n"
+    "For further help on a specific object, type help(obj)\n"
+    "For a list of available modules, type help('modules')\n"
+;
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index e6b15e1b71..72e804f676 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -43,6 +43,7 @@
 #define MICROPY_ENABLE_GC                   (1)
 #define MICROPY_KBD_EXCEPTION               (1)
 #define MICROPY_HELPER_REPL                 (1)
+#define MICROPY_REPL_AUTO_INDENT            (1)
 #define MICROPY_LONGINT_IMPL                (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_ENABLE_SOURCE_LINE          (1)
 #define MICROPY_ERROR_REPORTING             (MICROPY_ERROR_REPORTING_TERSE)
@@ -59,6 +60,8 @@
 #define MICROPY_PY_BUILTINS_REVERSED        (1)
 #define MICROPY_PY_BUILTINS_MIN_MAX         (0)
 #define MICROPY_PY_BUILTINS_HELP            (1)
+#define MICROPY_PY_BUILTINS_HELP_MODULES    (1)
+#define MICROPY_PY_BUILTINS_HELP_TEXT       mimxrt_help_text
 #define MICROPY_PY___FILE__                 (0)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO     (1)
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN       (1)

From c303b15f10d2925edf11392058e30e86deac9b91 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 7 May 2021 09:42:26 +0200
Subject: [PATCH 176/349] mimxrt: Enable frozen modules.

---
 ports/mimxrt/Makefile           | 3 +++
 ports/mimxrt/boards/manifest.py | 1 +
 ports/mimxrt/mpconfigport.h     | 2 ++
 3 files changed, 6 insertions(+)
 create mode 100644 ports/mimxrt/boards/manifest.py

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 0c893f9634..b4f581ccdc 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -15,6 +15,9 @@ include $(BOARD_DIR)/mpconfigboard.mk
 QSTR_DEFS = qstrdefsport.h
 QSTR_GLOBAL_DEPENDENCIES = $(BOARD_DIR)/mpconfigboard.h
 
+# MicroPython feature configurations
+FROZEN_MANIFEST ?= boards/manifest.py
+
 # Include py core make definitions
 include $(TOP)/py/py.mk
 
diff --git a/ports/mimxrt/boards/manifest.py b/ports/mimxrt/boards/manifest.py
new file mode 100644
index 0000000000..c80309cf67
--- /dev/null
+++ b/ports/mimxrt/boards/manifest.py
@@ -0,0 +1 @@
+freeze("$(PORT_DIR)/modules")
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 72e804f676..63ee5ea5cc 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -48,6 +48,8 @@
 #define MICROPY_ENABLE_SOURCE_LINE          (1)
 #define MICROPY_ERROR_REPORTING             (MICROPY_ERROR_REPORTING_TERSE)
 #define MICROPY_CAN_OVERRIDE_BUILTINS       (1)
+#define MICROPY_MODULE_FROZEN_MPY           (1)
+#define MICROPY_QSTR_EXTRA_POOL             mp_qstr_frozen_const_pool
 
 // Control over Python builtins
 #define MICROPY_PY_BUILTINS_STR_COUNT       (0)

From dfd4324eb1b758e37cfc77da8467e7f5d72f519c Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 7 May 2021 15:21:09 +0200
Subject: [PATCH 177/349] mimxrt: Add flash storage support with VFS and
 littlefs filesystem.

This commit adds full support for a filesystem on all boards, with a block
device object mimxrt.Flash() and uos.VfsLfs2 enabled.

Main changes are:
- Refactoring of linker scripts to accomodate reserved area for VFS.  VFS
  will take up most of the available flash. 1M is reserved for code.  9K is
  reserved for flash configuration, interrupts, etc.
- Addition of _boot.py with filesystem init code, called from main.c.
- Definition of the mimxrt module with a Flash class in modmimxrt.[ch].
- Implementation of a flash driver class in mimxrt_flash.c.  All flashing
  related functions are stored in ITCM RAM.
- Addition of the uos module with filesystem functions.
- Implementation of uos.urandom() for the sake of completeness of the uos
  module.

It uses sample code from CircuitPython supplied under MIT license, which
uses the NXP SDK example code.

Done in collaboration with Philipp Ebensberger aka @alphaFred who
contributed the essential part to enable writing to flash while code is
executing, among other things.
---
 ports/mimxrt/Makefile                         |  17 +-
 .../boards/MIMXRT1010_EVK/MIMXRT1010_EVK.ld   |   1 +
 .../evkmimxrt1010_flexspi_nor_config.h        |  44 ++-
 .../boards/MIMXRT1010_EVK/flash_config.c      |  76 ++++-
 .../boards/MIMXRT1010_EVK/mpconfigboard.h     |   1 +
 ports/mimxrt/boards/MIMXRT1011.ld             |  28 +-
 .../boards/MIMXRT1020_EVK/MIMXRT1020_EVK.ld   |   1 +
 .../evkmimxrt1020_flexspi_nor_config.h        |  44 ++-
 .../boards/MIMXRT1020_EVK/flash_config.c      |  89 +++++-
 .../boards/MIMXRT1020_EVK/mpconfigboard.h     |   1 +
 ports/mimxrt/boards/MIMXRT1021.ld             |  24 +-
 .../boards/MIMXRT1050_EVK/MIMXRT1050_EVK.ld   |   1 +
 .../evkmimxrt1050_flexspi_nor_config.h        |  44 ++-
 .../boards/MIMXRT1050_EVK/flash_config.c      |  81 +++++-
 .../boards/MIMXRT1050_EVK/mpconfigboard.h     |   1 +
 ports/mimxrt/boards/MIMXRT1052.ld             |  25 +-
 .../boards/MIMXRT1060_EVK/MIMXRT1060_EVK.ld   |   1 +
 .../evkmimxrt1060_flexspi_nor_config.h        |  44 ++-
 .../boards/MIMXRT1060_EVK/flash_config.c      |  76 ++++-
 .../boards/MIMXRT1060_EVK/mpconfigboard.h     |   1 +
 ports/mimxrt/boards/MIMXRT1062.ld             |  24 +-
 ports/mimxrt/boards/MIMXRT1064.ld             |  24 +-
 .../boards/MIMXRT1064_EVK/MIMXRT1064_EVK.ld   |   1 +
 .../evkmimxrt1064_flexspi_nor_config.h        |  45 ++-
 .../boards/MIMXRT1064_EVK/flash_config.c      |  76 ++++-
 .../boards/MIMXRT1064_EVK/mpconfigboard.h     |   1 +
 ports/mimxrt/boards/TEENSY40/TEENSY40.ld      |   2 +
 ports/mimxrt/boards/TEENSY40/flash_config.c   |  99 ++++++-
 ports/mimxrt/boards/TEENSY40/mpconfigboard.h  |   1 +
 .../TEENSY40/teensy40_flexspi_nor_config.h    |  47 ++--
 ports/mimxrt/boards/common.ld                 | 262 ++++++++++++++++++
 ports/mimxrt/hal/flexspi_nor_flash.c          | 219 +++++++++++++++
 ports/mimxrt/hal/flexspi_nor_flash.h          |  42 +++
 ports/mimxrt/main.c                           |  33 ++-
 ports/mimxrt/mimxrt_flash.c                   | 221 +++++++++++++++
 ports/mimxrt/modmimxrt.c                      |  39 +++
 ports/mimxrt/modmimxrt.h                      |  34 +++
 ports/mimxrt/modules/_boot.py                 |  15 +
 ports/mimxrt/moduos.c                         | 129 +++++++++
 ports/mimxrt/mpconfigport.h                   |  27 +-
 ports/mimxrt/mphalport.c                      |   9 +
 ports/mimxrt/mphalport.h                      |   5 +
 42 files changed, 1745 insertions(+), 210 deletions(-)
 create mode 100644 ports/mimxrt/boards/MIMXRT1010_EVK/MIMXRT1010_EVK.ld
 create mode 100644 ports/mimxrt/boards/MIMXRT1020_EVK/MIMXRT1020_EVK.ld
 create mode 100644 ports/mimxrt/boards/MIMXRT1050_EVK/MIMXRT1050_EVK.ld
 create mode 100644 ports/mimxrt/boards/MIMXRT1060_EVK/MIMXRT1060_EVK.ld
 create mode 100644 ports/mimxrt/boards/MIMXRT1064_EVK/MIMXRT1064_EVK.ld
 create mode 100644 ports/mimxrt/boards/TEENSY40/TEENSY40.ld
 create mode 100644 ports/mimxrt/boards/common.ld
 create mode 100644 ports/mimxrt/hal/flexspi_nor_flash.c
 create mode 100644 ports/mimxrt/hal/flexspi_nor_flash.h
 create mode 100644 ports/mimxrt/mimxrt_flash.c
 create mode 100644 ports/mimxrt/modmimxrt.c
 create mode 100644 ports/mimxrt/modmimxrt.h
 create mode 100644 ports/mimxrt/modules/_boot.py
 create mode 100644 ports/mimxrt/moduos.c

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index b4f581ccdc..7feab6cd75 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -17,6 +17,7 @@ QSTR_GLOBAL_DEPENDENCIES = $(BOARD_DIR)/mpconfigboard.h
 
 # MicroPython feature configurations
 FROZEN_MANIFEST ?= boards/manifest.py
+MICROPY_VFS_LFS2 ?= 1
 
 # Include py core make definitions
 include $(TOP)/py/py.mk
@@ -24,7 +25,7 @@ include $(TOP)/py/py.mk
 GIT_SUBMODULES = lib/tinyusb lib/nxp_driver
 
 MCU_DIR = lib/nxp_driver/sdk/devices/$(MCU_SERIES)
-LD_FILES = boards/$(MCU_SERIES).ld $(TOP)/$(MCU_DIR)/gcc/$(MCU_SERIES)xxxxx_flexspi_nor.ld
+LD_FILES = boards/$(BOARD)/$(BOARD).ld boards/$(MCU_SERIES).ld boards/common.ld
 
 MAKE_PINS = boards/make-pins.py
 BOARD_PINS = $(BOARD_DIR)/pins.csv
@@ -59,8 +60,10 @@ CFLAGS += -DXIP_EXTERNAL_FLASH=1 \
 	-DXIP_BOOT_HEADER_ENABLE=1 \
 	-DCFG_TUSB_MCU=OPT_MCU_MIMXRT10XX \
 	-D__STARTUP_CLEAR_BSS \
+	-D__STARTUP_INITIALIZE_RAMFUNCTION \
 	-D__START=main \
 	-DCPU_HEADER_H='<$(MCU_SERIES).h>'
+CFLAGS += $(CFLAGS_MOD) $(CFLAGS_EXTRA)
 
 LDFLAGS = $(addprefix -T,$(LD_FILES)) -Map=$@.map --cref --print-memory-usage
 LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
@@ -101,6 +104,8 @@ SRC_TINYUSB_IMX_C += \
 	$(MCU_DIR)/drivers/fsl_common.c \
 	$(MCU_DIR)/drivers/fsl_lpuart.c \
 	$(MCU_DIR)/drivers/fsl_flexram.c \
+	$(MCU_DIR)/drivers/fsl_flexspi.c \
+	$(MCU_DIR)/drivers/fsl_trng.c \
 
 SRC_C = \
 	main.c \
@@ -112,15 +117,20 @@ SRC_C = \
 	$(BOARD_DIR)/flash_config.c \
 	machine_led.c \
 	machine_pin.c \
+	mimxrt_flash.c \
 	modutime.c \
 	modmachine.c \
+	modmimxrt.c \
+	moduos.c \
 	mphalport.c \
+	hal/flexspi_nor_flash.c \
 	lib/mp-readline/readline.c \
 	lib/libc/string0.c \
 	lib/utils/gchelper_native.c \
 	lib/utils/printf.c \
 	lib/utils/pyexec.c \
 	lib/utils/stdout_helpers.c \
+	lib/utils/sys_stdio_mphal.c \
 	$(SRC_TINYUSB_C) \
 	$(SRC_TINYUSB_IMX_C) \
 
@@ -132,15 +142,20 @@ SRC_S = lib/utils/gchelper_m3.s \
 SRC_QSTR += \
 	machine_led.c \
 	machine_pin.c \
+	mimxrt_flash.c \
 	modutime.c \
 	modmachine.c \
+	modmimxrt.c \
+	moduos.c \
 	pin.c \
+	lib/utils/sys_stdio_mphal.c \
 	$(GEN_PINS_SRC) \
 
 OBJ += $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_SS:.S=.o))
+OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o))
 OBJ += $(BUILD)/pins_gen.o
 
 # Workaround for bug in older gcc, warning on "static usbd_device_t _usbd_dev = { 0 };"
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/MIMXRT1010_EVK.ld b/ports/mimxrt/boards/MIMXRT1010_EVK/MIMXRT1010_EVK.ld
new file mode 100644
index 0000000000..83da7ec73c
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/MIMXRT1010_EVK.ld
@@ -0,0 +1 @@
+flash_size = 16M;
\ No newline at end of file
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/evkmimxrt1010_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1010_EVK/evkmimxrt1010_flexspi_nor_config.h
index 8fa31c8320..2cb4535edc 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/evkmimxrt1010_flexspi_nor_config.h
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/evkmimxrt1010_flexspi_nor_config.h
@@ -211,34 +211,19 @@ typedef struct _FlexSPIConfig
 } flexspi_mem_config_t;
 
 /*  */
-#define NOR_CMD_INDEX_READ CMD_INDEX_READ               //!< 0
-#define NOR_CMD_INDEX_READSTATUS CMD_INDEX_READSTATUS   //!< 1
-#define NOR_CMD_INDEX_WRITEENABLE CMD_INDEX_WRITEENABLE //!< 2
-#define NOR_CMD_INDEX_ERASESECTOR 3                     //!< 3
-#define NOR_CMD_INDEX_PAGEPROGRAM CMD_INDEX_WRITE       //!< 4
-#define NOR_CMD_INDEX_CHIPERASE 5                       //!< 5
-#define NOR_CMD_INDEX_DUMMY 6                           //!< 6
-#define NOR_CMD_INDEX_ERASEBLOCK 7                      //!< 7
-
-#define NOR_CMD_LUT_SEQ_IDX_READ CMD_LUT_SEQ_IDX_READ //!< 0  READ LUT sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS \
-    CMD_LUT_SEQ_IDX_READSTATUS //!< 1  Read Status LUT sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI \
-    2 //!< 2  Read status DPI/QPI/OPI sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE \
-    CMD_LUT_SEQ_IDX_WRITEENABLE //!< 3  Write Enable sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE_XPI \
-    4 //!< 4  Write Enable DPI/QPI/OPI sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5 //!< 5  Erase Sector sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_ERASEBLOCK 8  //!< 8 Erase Block sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM \
-    CMD_LUT_SEQ_IDX_WRITE                //!< 9  Program sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11 //!< 11 Chip Erase sequence in lookupTable id stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READ_SFDP 13 //!< 13 Read SFDP sequence in lookupTable id stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_RESTORE_NOCMD \
-    14 //!< 14 Restore 0-4-4/0-8-8 mode sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_EXIT_NOCMD \
-    15 //!< 15 Exit 0-4-4/0-8-8 mode sequence id in lookupTable stored in config blobk
+#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
+#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
+#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
+#define NOR_CMD_LUT_SEQ_IDX_READID 8
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
+#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
+#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
 
 /*
  *  Serial NOR configuration block
@@ -259,6 +244,9 @@ typedef struct _flexspi_nor_config
     uint32_t reserve2[11];          //!< Reserved for future use
 } flexspi_nor_config_t;
 
+#define FLASH_BUSY_STATUS_POL 0
+#define FLASH_BUSY_STATUS_OFFSET 0
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/flash_config.c b/ports/mimxrt/boards/MIMXRT1010_EVK/flash_config.c
index a03ee07865..5e7e5dcf15 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/flash_config.c
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/flash_config.c
@@ -37,9 +37,83 @@ const flexspi_nor_config_t qspiflash_config = {
             .sflashA1Size     = 16u * 1024u * 1024u,
             .lookupTable =
                 {
-                    // Read LUTs
+                    // 0 Read LUTs 0 -> 0
                     FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
                     FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 1 Read status register -> 1
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 2 Fast read quad mode - SDR
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 3 Write Enable -> 3
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 4 Read extend parameters
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 5 Erase Sector -> 5
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 6 Write Status Reg
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 7 Page Program - quad mode (-> 9)
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 8 Read ID
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 9 Page Program - single mode -> 9
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 10 Enter QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 11 Erase Chip
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 12 Exit QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
                 },
         },
     .pageSize           = 256u,
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
index 5a89423b50..3eb3268125 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
@@ -7,3 +7,4 @@
 #define MICROPY_HW_LED1_PIN (pin_GPIO_11)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
+#define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1010_flexspi_nor_config.h"
diff --git a/ports/mimxrt/boards/MIMXRT1011.ld b/ports/mimxrt/boards/MIMXRT1011.ld
index 9db30adee8..d9a4956856 100644
--- a/ports/mimxrt/boards/MIMXRT1011.ld
+++ b/ports/mimxrt/boards/MIMXRT1011.ld
@@ -1,5 +1,25 @@
-/* 24kiB stack. */
-__stack_size__ = 0x4000;
+/* Memory configuration */
+flash_start         = 0x60000000;
+flash_end           = DEFINED(reserved_size) ? ((flash_start) + (flash_size - reserved_size)) : ((flash_start) + (flash_size));
+flash_config_start  = 0x60000400;
+flash_config_size   = 0x00000C00;
+ivt_start           = 0x60001000;
+ivt_size            = 0x00001000;
+interrupts_start    = 0x60002000;
+interrupts_size     = 0x00000400;
+text_start          = 0x60002400;
+text_size           = ((((text_start) + 1M) + (4k - 1)) & ~(4k - 1)) - (text_start); /* reserve 1M for code but align on 4k boundary */
+vfs_start           = (text_start) + (text_size);
+vfs_size            = ((flash_end) - (vfs_start));
+itcm_start          = 0x00000000;
+itcm_size           = 0x00008000;
+dtcm_start          = 0x20000000;
+dtcm_size           = 0x00008000;
+ocrm_start          = 0x20200000;
+ocrm_size           = 0x00010000;
+
+/* 20kiB stack. */
+__stack_size__ = 0x5000;
 _estack = __StackTop;
 _sstack = __StackLimit;
 
@@ -7,5 +27,5 @@ _sstack = __StackLimit;
 __heap_size__ = 0;
 
 /* Use second OCRAM bank for GC heap. */
-_gc_heap_start = ORIGIN(m_data2);
-_gc_heap_end = ORIGIN(m_data2) + LENGTH(m_data2);
+_gc_heap_start = ORIGIN(m_ocrm);
+_gc_heap_end = ORIGIN(m_ocrm) + LENGTH(m_ocrm);
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/MIMXRT1020_EVK.ld b/ports/mimxrt/boards/MIMXRT1020_EVK/MIMXRT1020_EVK.ld
new file mode 100644
index 0000000000..fd1bf32ede
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/MIMXRT1020_EVK.ld
@@ -0,0 +1 @@
+flash_size = 8M;
\ No newline at end of file
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/evkmimxrt1020_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1020_EVK/evkmimxrt1020_flexspi_nor_config.h
index c0c6ea2436..195c0c225e 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/evkmimxrt1020_flexspi_nor_config.h
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/evkmimxrt1020_flexspi_nor_config.h
@@ -212,34 +212,19 @@ typedef struct _FlexSPIConfig
 } flexspi_mem_config_t;
 
 /*  */
-#define NOR_CMD_INDEX_READ CMD_INDEX_READ               //!< 0
-#define NOR_CMD_INDEX_READSTATUS CMD_INDEX_READSTATUS   //!< 1
-#define NOR_CMD_INDEX_WRITEENABLE CMD_INDEX_WRITEENABLE //!< 2
-#define NOR_CMD_INDEX_ERASESECTOR 3                     //!< 3
-#define NOR_CMD_INDEX_PAGEPROGRAM CMD_INDEX_WRITE       //!< 4
-#define NOR_CMD_INDEX_CHIPERASE 5                       //!< 5
-#define NOR_CMD_INDEX_DUMMY 6                           //!< 6
-#define NOR_CMD_INDEX_ERASEBLOCK 7                      //!< 7
-
-#define NOR_CMD_LUT_SEQ_IDX_READ CMD_LUT_SEQ_IDX_READ //!< 0  READ LUT sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS \
-    CMD_LUT_SEQ_IDX_READSTATUS //!< 1  Read Status LUT sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI \
-    2 //!< 2  Read status DPI/QPI/OPI sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE \
-    CMD_LUT_SEQ_IDX_WRITEENABLE //!< 3  Write Enable sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE_XPI \
-    4 //!< 4  Write Enable DPI/QPI/OPI sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5 //!< 5  Erase Sector sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_ERASEBLOCK 8  //!< 8 Erase Block sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM \
-    CMD_LUT_SEQ_IDX_WRITE                //!< 9  Program sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11 //!< 11 Chip Erase sequence in lookupTable id stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READ_SFDP 13 //!< 13 Read SFDP sequence in lookupTable id stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_RESTORE_NOCMD \
-    14 //!< 14 Restore 0-4-4/0-8-8 mode sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_EXIT_NOCMD \
-    15 //!< 15 Exit 0-4-4/0-8-8 mode sequence id in lookupTable stored in config blobk
+#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
+#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
+#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
+#define NOR_CMD_LUT_SEQ_IDX_READID 8
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
+#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
+#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
 
 /*
  *  Serial NOR configuration block
@@ -260,6 +245,9 @@ typedef struct _flexspi_nor_config
     uint32_t reserve2[11];          //!< Reserved for future use
 } flexspi_nor_config_t;
 
+#define FLASH_BUSY_STATUS_POL 0
+#define FLASH_BUSY_STATUS_OFFSET 0
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/flash_config.c b/ports/mimxrt/boards/MIMXRT1020_EVK/flash_config.c
index 56007931a9..5377cc1b25 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/flash_config.c
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/flash_config.c
@@ -32,20 +32,105 @@ const flexspi_nor_config_t qspiflash_config = {
             .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
             .csHoldTime       = 3u,
             .csSetupTime      = 3u,
+            .busyOffset = FLASH_BUSY_STATUS_OFFSET,     // Status bit 0 indicates busy.
+            .busyBitPolarity = FLASH_BUSY_STATUS_POL,   // Busy when the bit is 1.
+            .deviceModeCfgEnable = 1u,
+            .deviceModeType = kDeviceConfigCmdType_QuadEnable,
+            .deviceModeSeq = {
+                .seqId = 4u,
+                .seqNum = 1u,
+            },
+            .deviceModeArg = 0x40,
             // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
+            .deviceType = kFlexSpiDeviceType_SerialNOR,
             .sflashPadType = kSerialFlash_4Pads,
-            .serialClkFreq = kFlexSpiSerialClk_100MHz,
+            .serialClkFreq = kFlexSpiSerialClk_30MHz,
             .sflashA1Size  = 8u * 1024u * 1024u,
             .lookupTable =
                 {
-                    // Read LUTs
+                    // 0 Read LUTs 0 -> 0
                     FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
                     FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 1 Read status register -> 1
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 2 Fast read quad mode - SDR
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 3 Write Enable -> 3
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 4 Read extend parameters
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 5 Erase Sector -> 5
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 6 Write Status Reg
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 7 Page Program - quad mode (-> 9)
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 8 Read ID
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 9 Page Program - single mode -> 9
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 10 Enter QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 11 Erase Chip
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 12 Exit QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
                 },
         },
     .pageSize           = 256u,
     .sectorSize         = 4u * 1024u,
     .blockSize          = 256u * 1024u,
     .isUniformBlockSize = false,
+    .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz,
 };
 #endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
index d8c0f00e27..a025c85bf3 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
@@ -8,3 +8,4 @@
 #define MICROPY_HW_LED1_PIN (pin_GPIO_AD_B0_05)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
+#define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1020_flexspi_nor_config.h"
diff --git a/ports/mimxrt/boards/MIMXRT1021.ld b/ports/mimxrt/boards/MIMXRT1021.ld
index 6b59649fca..de0f259dcc 100644
--- a/ports/mimxrt/boards/MIMXRT1021.ld
+++ b/ports/mimxrt/boards/MIMXRT1021.ld
@@ -1,8 +1,28 @@
+/* Memory configuration */
+flash_start         = 0x60000000;
+flash_end           = DEFINED(reserved_size) ? ((flash_start) + (flash_size - reserved_size)) : ((flash_start) + (flash_size));
+flash_config_start  = flash_start;
+flash_config_size   = 0x00001000;
+ivt_start           = 0x60001000;
+ivt_size            = 0x00001000;
+interrupts_start    = 0x60002000;
+interrupts_size     = 0x00000400;
+text_start          = 0x60002400;
+text_size           = ((((text_start) + 1M) + (4k - 1)) & ~(4k - 1)) - (text_start); /* reserve 1M for code but align on 4k boundary */
+vfs_start           = (text_start) + (text_size);
+vfs_size            = ((flash_end) - (vfs_start));
+itcm_start          = 0x00000000;
+itcm_size           = 0x00010000;
+dtcm_start          = 0x20000000;
+dtcm_size           = 0x00010000;
+ocrm_start          = 0x20200000;
+ocrm_size           = 0x00020000;
+
 /* 24kiB stack. */
 __stack_size__ = 0x6000;
 _estack = __StackTop;
 _sstack = __StackLimit;
 
 /* Use second OCRAM bank for GC heap. */
-_gc_heap_start = ORIGIN(m_data2);
-_gc_heap_end = ORIGIN(m_data2) + LENGTH(m_data2);
+_gc_heap_start = ORIGIN(m_ocrm);
+_gc_heap_end = ORIGIN(m_ocrm) + LENGTH(m_ocrm);
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/MIMXRT1050_EVK.ld b/ports/mimxrt/boards/MIMXRT1050_EVK/MIMXRT1050_EVK.ld
new file mode 100644
index 0000000000..fd1bf32ede
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/MIMXRT1050_EVK.ld
@@ -0,0 +1 @@
+flash_size = 8M;
\ No newline at end of file
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/evkmimxrt1050_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1050_EVK/evkmimxrt1050_flexspi_nor_config.h
index d8e842452e..e038967e17 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/evkmimxrt1050_flexspi_nor_config.h
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/evkmimxrt1050_flexspi_nor_config.h
@@ -209,34 +209,19 @@ typedef struct _FlexSPIConfig
 } flexspi_mem_config_t;
 
 /*  */
-#define NOR_CMD_INDEX_READ        CMD_INDEX_READ        //!< 0
-#define NOR_CMD_INDEX_READSTATUS  CMD_INDEX_READSTATUS  //!< 1
-#define NOR_CMD_INDEX_WRITEENABLE CMD_INDEX_WRITEENABLE //!< 2
-#define NOR_CMD_INDEX_ERASESECTOR 3                     //!< 3
-#define NOR_CMD_INDEX_PAGEPROGRAM CMD_INDEX_WRITE       //!< 4
-#define NOR_CMD_INDEX_CHIPERASE   5                     //!< 5
-#define NOR_CMD_INDEX_DUMMY       6                     //!< 6
-#define NOR_CMD_INDEX_ERASEBLOCK  7                     //!< 7
-
-#define NOR_CMD_LUT_SEQ_IDX_READ CMD_LUT_SEQ_IDX_READ //!< 0  READ LUT sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS \
-    CMD_LUT_SEQ_IDX_READSTATUS //!< 1  Read Status LUT sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI \
-    2 //!< 2  Read status DPI/QPI/OPI sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE \
-    CMD_LUT_SEQ_IDX_WRITEENABLE //!< 3  Write Enable sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE_XPI \
-    4 //!< 4  Write Enable DPI/QPI/OPI sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5 //!< 5  Erase Sector sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_ERASEBLOCK  8 //!< 8 Erase Block sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM \
-    CMD_LUT_SEQ_IDX_WRITE                //!< 9  Program sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11 //!< 11 Chip Erase sequence in lookupTable id stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READ_SFDP 13 //!< 13 Read SFDP sequence in lookupTable id stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_RESTORE_NOCMD \
-    14 //!< 14 Restore 0-4-4/0-8-8 mode sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_EXIT_NOCMD \
-    15 //!< 15 Exit 0-4-4/0-8-8 mode sequence id in lookupTable stored in config blobk
+#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
+#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
+#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
+#define NOR_CMD_LUT_SEQ_IDX_READID 8
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
+#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
+#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
 
 /*
  *  Serial NOR configuration block
@@ -257,6 +242,9 @@ typedef struct _flexspi_nor_config
     uint32_t reserve2[11];          //!< Reserved for future use
 } flexspi_nor_config_t;
 
+#define FLASH_BUSY_STATUS_POL 0
+#define FLASH_BUSY_STATUS_OFFSET 0
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/flash_config.c b/ports/mimxrt/boards/MIMXRT1050_EVK/flash_config.c
index 8203f4811a..2a9303fc98 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/flash_config.c
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/flash_config.c
@@ -41,10 +41,83 @@ const flexspi_nor_config_t qspiflash_config = {
             .dataValidTime = {16u, 16u},
             .lookupTable =
                 {
-                    // Read LUTs
-                    FLEXSPI_LUT_SEQ(CMD_DDR, FLEXSPI_8PAD, 0xA0, RADDR_DDR, FLEXSPI_8PAD, 0x18),
-                    FLEXSPI_LUT_SEQ(CADDR_DDR, FLEXSPI_8PAD, 0x10, DUMMY_DDR, FLEXSPI_8PAD, 0x06),
-                    FLEXSPI_LUT_SEQ(READ_DDR, FLEXSPI_8PAD, 0x04, STOP, FLEXSPI_1PAD, 0x0),
+                    // 0 Read LUTs 0 -> 0
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 1 Read status register -> 1
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 2 Fast read quad mode - SDR
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 3 Write Enable -> 3
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 4 Read extend parameters
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 5 Erase Sector -> 5
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 6 Write Status Reg
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 7 Page Program - quad mode (-> 9)
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 8 Read ID
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 9 Page Program - single mode -> 9
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 10 Enter QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 11 Erase Chip
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 12 Exit QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
                 },
         },
     .pageSize           = 512u,
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
index 2337496d2a..9b7664841e 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
@@ -7,3 +7,4 @@
 #define MICROPY_HW_LED1_PIN (pin_GPIO_AD_B0_09)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
+#define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1050_flexspi_nor_config.h"
diff --git a/ports/mimxrt/boards/MIMXRT1052.ld b/ports/mimxrt/boards/MIMXRT1052.ld
index 836a119e5e..f78773531a 100644
--- a/ports/mimxrt/boards/MIMXRT1052.ld
+++ b/ports/mimxrt/boards/MIMXRT1052.ld
@@ -1,7 +1,28 @@
+/* Memory configuration */
+flash_start         = 0x60000000;
+flash_end           = DEFINED(reserved_size) ? ((flash_start) + (flash_size - reserved_size)) : ((flash_start) + (flash_size));
+flash_config_start  = flash_start;
+flash_config_size   = 0x00001000;
+ivt_start           = 0x60001000;
+ivt_size            = 0x00001000;
+interrupts_start    = 0x60002000;
+interrupts_size     = 0x00000400;
+text_start          = 0x60002400;
+text_size           = ((((text_start) + 1M) + (4k - 1)) & ~(4k - 1)) - (text_start); /* reserve 1M for code but align on 4k boundary */
+vfs_start           = (text_start) + (text_size);
+vfs_size            = ((flash_end) - (vfs_start));
+itcm_start          = 0x00000000;
+itcm_size           = 0x00020000;
+dtcm_start          = 0x20000000;
+dtcm_size           = 0x00020000;
+ocrm_start          = 0x20200000;
+ocrm_size           = 0x00040000;
+
+/* 24kiB stack. */
 __stack_size__ = 0x6000;
 _estack = __StackTop;
 _sstack = __StackLimit;
 
 /* Use second OCRAM bank for GC heap. */
-_gc_heap_start = ORIGIN(m_data2);
-_gc_heap_end = ORIGIN(m_data2) + LENGTH(m_data2);
+_gc_heap_start = ORIGIN(m_ocrm);
+_gc_heap_end = ORIGIN(m_ocrm) + LENGTH(m_ocrm);
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/MIMXRT1060_EVK.ld b/ports/mimxrt/boards/MIMXRT1060_EVK/MIMXRT1060_EVK.ld
new file mode 100644
index 0000000000..fd1bf32ede
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/MIMXRT1060_EVK.ld
@@ -0,0 +1 @@
+flash_size = 8M;
\ No newline at end of file
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/evkmimxrt1060_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1060_EVK/evkmimxrt1060_flexspi_nor_config.h
index 8bb771fd8a..03bdac1f1c 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/evkmimxrt1060_flexspi_nor_config.h
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/evkmimxrt1060_flexspi_nor_config.h
@@ -210,34 +210,19 @@ typedef struct _FlexSPIConfig
 } flexspi_mem_config_t;
 
 /*  */
-#define NOR_CMD_INDEX_READ        CMD_INDEX_READ        //!< 0
-#define NOR_CMD_INDEX_READSTATUS  CMD_INDEX_READSTATUS  //!< 1
-#define NOR_CMD_INDEX_WRITEENABLE CMD_INDEX_WRITEENABLE //!< 2
-#define NOR_CMD_INDEX_ERASESECTOR 3                     //!< 3
-#define NOR_CMD_INDEX_PAGEPROGRAM CMD_INDEX_WRITE       //!< 4
-#define NOR_CMD_INDEX_CHIPERASE   5                     //!< 5
-#define NOR_CMD_INDEX_DUMMY       6                     //!< 6
-#define NOR_CMD_INDEX_ERASEBLOCK  7                     //!< 7
-
-#define NOR_CMD_LUT_SEQ_IDX_READ CMD_LUT_SEQ_IDX_READ //!< 0  READ LUT sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS \
-    CMD_LUT_SEQ_IDX_READSTATUS //!< 1  Read Status LUT sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI \
-    2 //!< 2  Read status DPI/QPI/OPI sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE \
-    CMD_LUT_SEQ_IDX_WRITEENABLE //!< 3  Write Enable sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE_XPI \
-    4 //!< 4  Write Enable DPI/QPI/OPI sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5 //!< 5  Erase Sector sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_ERASEBLOCK  8 //!< 8 Erase Block sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM \
-    CMD_LUT_SEQ_IDX_WRITE                //!< 9  Program sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11 //!< 11 Chip Erase sequence in lookupTable id stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READ_SFDP 13 //!< 13 Read SFDP sequence in lookupTable id stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_RESTORE_NOCMD \
-    14 //!< 14 Restore 0-4-4/0-8-8 mode sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_EXIT_NOCMD \
-    15 //!< 15 Exit 0-4-4/0-8-8 mode sequence id in lookupTable stored in config blobk
+#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
+#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
+#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
+#define NOR_CMD_LUT_SEQ_IDX_READID 8
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
+#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
+#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
 
 /*
  *  Serial NOR configuration block
@@ -258,6 +243,9 @@ typedef struct _flexspi_nor_config
     uint32_t reserve2[11];          //!< Reserved for future use
 } flexspi_nor_config_t;
 
+#define FLASH_BUSY_STATUS_POL 0
+#define FLASH_BUSY_STATUS_OFFSET 0
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/flash_config.c b/ports/mimxrt/boards/MIMXRT1060_EVK/flash_config.c
index 095a922e9e..3fa584b73a 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/flash_config.c
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/flash_config.c
@@ -35,9 +35,83 @@ const flexspi_nor_config_t qspiflash_config = {
             .sflashA1Size     = 8u * 1024u * 1024u,
             .lookupTable =
                 {
-                    // Read LUTs
+                    // 0 Read LUTs 0 -> 0
                     FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
                     FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 1 Read status register -> 1
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 2 Fast read quad mode - SDR
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 3 Write Enable -> 3
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 4 Read extend parameters
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 5 Erase Sector -> 5
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 6 Write Status Reg
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 7 Page Program - quad mode (-> 9)
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 8 Read ID
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 9 Page Program - single mode -> 9
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 10 Enter QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 11 Erase Chip
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 12 Exit QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
                 },
         },
     .pageSize           = 256u,
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
index c9e6d8bf2c..3974f93257 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
@@ -7,3 +7,4 @@
 #define MICROPY_HW_LED1_PIN (pin_GPIO_AD_B0_09)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
+#define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1060_flexspi_nor_config.h"
diff --git a/ports/mimxrt/boards/MIMXRT1062.ld b/ports/mimxrt/boards/MIMXRT1062.ld
index 23520b5624..5ab7e15332 100644
--- a/ports/mimxrt/boards/MIMXRT1062.ld
+++ b/ports/mimxrt/boards/MIMXRT1062.ld
@@ -1,8 +1,28 @@
+/* Memory configuration */
+flash_start         = 0x60000000;
+flash_end           = DEFINED(reserved_size) ? ((flash_start) + (flash_size - reserved_size)) : ((flash_start) + (flash_size));
+flash_config_start  = flash_start;
+flash_config_size   = 0x00001000;
+ivt_start           = 0x60001000;
+ivt_size            = 0x00001000;
+interrupts_start    = 0x60002000;
+interrupts_size     = 0x00000400;
+text_start          = 0x60002400;
+text_size           = ((((text_start) + 1M) + (4k - 1)) & ~(4k - 1)) - (text_start); /* reserve 1M for code but align on 4k boundary */
+vfs_start           = (text_start) + (text_size);
+vfs_size            = ((flash_end) - (vfs_start));
+itcm_start          = 0x00000000;
+itcm_size           = 0x00020000;
+dtcm_start          = 0x20000000;
+dtcm_size           = 0x00020000;
+ocrm_start          = 0x20200000;
+ocrm_size           = 0x000C0000;
+
 /* 32kiB stack. */
 __stack_size__ = 0x8000;
 _estack = __StackTop;
 _sstack = __StackLimit;
 
 /* Use second OCRAM bank for GC heap. */
-_gc_heap_start = ORIGIN(m_data2);
-_gc_heap_end = ORIGIN(m_data2) + LENGTH(m_data2);
+_gc_heap_start = ORIGIN(m_ocrm);
+_gc_heap_end = ORIGIN(m_ocrm) + LENGTH(m_ocrm);
diff --git a/ports/mimxrt/boards/MIMXRT1064.ld b/ports/mimxrt/boards/MIMXRT1064.ld
index bf37c21802..236d984293 100644
--- a/ports/mimxrt/boards/MIMXRT1064.ld
+++ b/ports/mimxrt/boards/MIMXRT1064.ld
@@ -1,8 +1,28 @@
+/* Memory configuration */
+flash_start         = 0x60000000;
+flash_end           = DEFINED(reserved_size) ? ((flash_start) + (flash_size - reserved_size)) : ((flash_start) + (flash_size));
+flash_config_start  = flash_start;
+flash_config_size   = 0x00001000;
+ivt_start           = 0x60001000;
+ivt_size            = 0x00001000;
+interrupts_start    = 0x60002000;
+interrupts_size     = 0x00000400;
+text_start          = 0x60002400;
+text_size           = ((((text_start) + 1M) + (4k - 1)) & ~(4k - 1)) - (text_start); /* reserve 1M for code but align on 4k boundary */
+vfs_start           = (text_start) + (text_size);
+vfs_size            = ((flash_end) - (vfs_start));
+itcm_start          = 0x00000000;
+itcm_size           = 0x00020000;
+dtcm_start          = 0x20000000;
+dtcm_size           = 0x00020000;
+ocrm_start          = 0x20200000;
+ocrm_size           = 0x000C0000;
+
 /* 24kiB stack. */
 __stack_size__ = 0x6000;
 _estack = __StackTop;
 _sstack = __StackLimit;
 
 /* Use second OCRAM bank for GC heap. */
-_gc_heap_start = ORIGIN(m_data2);
-_gc_heap_end = ORIGIN(m_data2) + LENGTH(m_data2);
\ No newline at end of file
+_gc_heap_start = ORIGIN(m_ocrm);
+_gc_heap_end = ORIGIN(m_ocrm) + LENGTH(m_ocrm);
\ No newline at end of file
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/MIMXRT1064_EVK.ld b/ports/mimxrt/boards/MIMXRT1064_EVK/MIMXRT1064_EVK.ld
new file mode 100644
index 0000000000..fd1bf32ede
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/MIMXRT1064_EVK.ld
@@ -0,0 +1 @@
+flash_size = 8M;
\ No newline at end of file
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/evkmimxrt1064_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1064_EVK/evkmimxrt1064_flexspi_nor_config.h
index efdfe583fb..3c433f3be9 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/evkmimxrt1064_flexspi_nor_config.h
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/evkmimxrt1064_flexspi_nor_config.h
@@ -210,35 +210,19 @@ typedef struct _FlexSPIConfig
 } flexspi_mem_config_t;
 
 /*  */
-#define NOR_CMD_INDEX_READ CMD_INDEX_READ               //!< 0
-#define NOR_CMD_INDEX_READSTATUS CMD_INDEX_READSTATUS   //!< 1
-#define NOR_CMD_INDEX_WRITEENABLE CMD_INDEX_WRITEENABLE //!< 2
-#define NOR_CMD_INDEX_ERASESECTOR 3                     //!< 3
-#define NOR_CMD_INDEX_PAGEPROGRAM CMD_INDEX_WRITE       //!< 4
-#define NOR_CMD_INDEX_CHIPERASE 5                       //!< 5
-#define NOR_CMD_INDEX_DUMMY 6                           //!< 6
-#define NOR_CMD_INDEX_ERASEBLOCK 7                      //!< 7
-
-#define NOR_CMD_LUT_SEQ_IDX_READ CMD_LUT_SEQ_IDX_READ //!< 0  READ LUT sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS \
-    CMD_LUT_SEQ_IDX_READSTATUS //!< 1  Read Status LUT sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI \
-    2 //!< 2  Read status DPI/QPI/OPI sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE \
-    CMD_LUT_SEQ_IDX_WRITEENABLE //!< 3  Write Enable sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE_XPI \
-    4 //!< 4  Write Enable DPI/QPI/OPI sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5 //!< 5  Erase Sector sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_ERASEBLOCK 8  //!< 8 Erase Block sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM \
-    CMD_LUT_SEQ_IDX_WRITE                //!< 9  Program sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11 //!< 11 Chip Erase sequence in lookupTable id stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READ_SFDP 13 //!< 13 Read SFDP sequence in lookupTable id stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_RESTORE_NOCMD \
-    14 //!< 14 Restore 0-4-4/0-8-8 mode sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_EXIT_NOCMD \
-    15 //!< 15 Exit 0-4-4/0-8-8 mode sequence id in lookupTable stored in config blobk
-
+#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
+#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
+#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
+#define NOR_CMD_LUT_SEQ_IDX_READID 8
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
+#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
+#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
 /*
  *  Serial NOR configuration block
  */
@@ -258,6 +242,9 @@ typedef struct _flexspi_nor_config
     uint32_t reserve2[11];          //!< Reserved for future use
 } flexspi_nor_config_t;
 
+#define FLASH_BUSY_STATUS_POL 0
+#define FLASH_BUSY_STATUS_OFFSET 0
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/flash_config.c b/ports/mimxrt/boards/MIMXRT1064_EVK/flash_config.c
index bfb1c2d59a..9338c6948a 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/flash_config.c
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/flash_config.c
@@ -36,9 +36,83 @@ const flexspi_nor_config_t qspiflash_config = {
             .sflashA1Size  = 8u * 1024u * 1024u,
             .lookupTable =
                 {
-                    // Read LUTs
+                    // 0 Read LUTs 0 -> 0
                     FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
                     FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 1 Read status register -> 1
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 2 Fast read quad mode - SDR
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 3 Write Enable -> 3
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 4 Read extend parameters
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 5 Erase Sector -> 5
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 6 Write Status Reg
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 7 Page Program - quad mode (-> 9)
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 8 Read ID
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 9 Page Program - single mode -> 9
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 10 Enter QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 11 Erase Chip
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 12 Exit QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
                 },
         },
     .pageSize           = 256u,
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
index 3eddb41021..01e2e10bb5 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
@@ -6,3 +6,4 @@
 #define MICROPY_HW_LED1_PIN (pin_GPIO_AD_B0_09)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
+#define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1064_flexspi_nor_config.h"
diff --git a/ports/mimxrt/boards/TEENSY40/TEENSY40.ld b/ports/mimxrt/boards/TEENSY40/TEENSY40.ld
new file mode 100644
index 0000000000..a3b696db66
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY40/TEENSY40.ld
@@ -0,0 +1,2 @@
+flash_size = 2M;
+reserved_size = 4K;
\ No newline at end of file
diff --git a/ports/mimxrt/boards/TEENSY40/flash_config.c b/ports/mimxrt/boards/TEENSY40/flash_config.c
index 39a6b91088..7a63cf825d 100644
--- a/ports/mimxrt/boards/TEENSY40/flash_config.c
+++ b/ports/mimxrt/boards/TEENSY40/flash_config.c
@@ -32,20 +32,113 @@ const flexspi_nor_config_t qspiflash_config = {
             .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
             .csHoldTime       = 3u,
             .csSetupTime      = 3u,
+
+            .busyOffset = FLASH_BUSY_STATUS_OFFSET,     // Status bit 0 indicates busy.
+            .busyBitPolarity = FLASH_BUSY_STATUS_POL,   // Busy when the bit is 1.
+
+            .deviceModeCfgEnable = 1u,
+            .deviceModeType = kDeviceConfigCmdType_QuadEnable,
+            .deviceModeSeq = {
+                .seqId = 4u,
+                .seqNum = 1u,
+            },
+            .deviceModeArg = 0x0200,
+            .configCmdEnable = 1u,
+            .configModeType[0] = kDeviceConfigCmdType_Generic,
+            .configCmdSeqs[0] = {
+                .seqId = 2u,
+                .seqNum = 1u,
+            },
+            .deviceType = kFlexSpiDeviceType_SerialNOR,
             // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
             .sflashPadType = kSerialFlash_4Pads,
-            .serialClkFreq = kFlexSpiSerialClk_100MHz,
+            .serialClkFreq = kFlexSpiSerialClk_60MHz,
             .sflashA1Size  = 2u * 1024u * 1024u,
             .lookupTable =
                 {
-                    // Read LUTs
+                    // 0 Read LUTs 0 -> 0
                     FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
                     FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 1 Read status register -> 1
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 2 Fast read quad mode - SDR
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 3 Write Enable -> 3
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 4 Read extend parameters
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 5 Erase Sector -> 5
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 6 Write Status Reg
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 7 Page Program - quad mode (-> 9)
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 8 Read ID
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 9 Page Program - single mode -> 9
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 10 Enter QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 11 Erase Chip
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 12 Exit QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
                 },
         },
     .pageSize           = 256u,
     .sectorSize         = 4u * 1024u,
-    .blockSize          = 256u * 1024u,
+    .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz,
+    .blockSize          = 0x00010000,
     .isUniformBlockSize = false,
 };
 #endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
index e3d7c6a129..c6f11b51d1 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
@@ -7,3 +7,4 @@
 #define MICROPY_HW_LED1_PIN (pin_GPIO_B0_03)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
+#define BOARD_FLASH_CONFIG_HEADER_H "teensy40_flexspi_nor_config.h"
diff --git a/ports/mimxrt/boards/TEENSY40/teensy40_flexspi_nor_config.h b/ports/mimxrt/boards/TEENSY40/teensy40_flexspi_nor_config.h
index 2c7bf48b62..445a0baccc 100644
--- a/ports/mimxrt/boards/TEENSY40/teensy40_flexspi_nor_config.h
+++ b/ports/mimxrt/boards/TEENSY40/teensy40_flexspi_nor_config.h
@@ -28,7 +28,7 @@
 /* FLEXSPI Feature related definitions */
 #define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
 
-/* Lookup table related defintions */
+/* Lookup table related definitions */
 #define CMD_INDEX_READ 0
 #define CMD_INDEX_READSTATUS 1
 #define CMD_INDEX_WRITEENABLE 2
@@ -37,6 +37,7 @@
 #define CMD_LUT_SEQ_IDX_READ 0
 #define CMD_LUT_SEQ_IDX_READSTATUS 1
 #define CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define CMD_LUT_SEQ_IDX_ERASE 5
 #define CMD_LUT_SEQ_IDX_WRITE 9
 
 #define CMD_SDR 0x01
@@ -212,34 +213,19 @@ typedef struct _FlexSPIConfig
 } flexspi_mem_config_t;
 
 /*  */
-#define NOR_CMD_INDEX_READ CMD_INDEX_READ               //!< 0
-#define NOR_CMD_INDEX_READSTATUS CMD_INDEX_READSTATUS   //!< 1
-#define NOR_CMD_INDEX_WRITEENABLE CMD_INDEX_WRITEENABLE //!< 2
-#define NOR_CMD_INDEX_ERASESECTOR 3                     //!< 3
-#define NOR_CMD_INDEX_PAGEPROGRAM CMD_INDEX_WRITE       //!< 4
-#define NOR_CMD_INDEX_CHIPERASE 5                       //!< 5
-#define NOR_CMD_INDEX_DUMMY 6                           //!< 6
-#define NOR_CMD_INDEX_ERASEBLOCK 7                      //!< 7
-
-#define NOR_CMD_LUT_SEQ_IDX_READ CMD_LUT_SEQ_IDX_READ //!< 0  READ LUT sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS \
-    CMD_LUT_SEQ_IDX_READSTATUS //!< 1  Read Status LUT sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI \
-    2 //!< 2  Read status DPI/QPI/OPI sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE \
-    CMD_LUT_SEQ_IDX_WRITEENABLE //!< 3  Write Enable sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE_XPI \
-    4 //!< 4  Write Enable DPI/QPI/OPI sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5 //!< 5  Erase Sector sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_ERASEBLOCK 8  //!< 8 Erase Block sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM \
-    CMD_LUT_SEQ_IDX_WRITE                //!< 9  Program sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11 //!< 11 Chip Erase sequence in lookupTable id stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READ_SFDP 13 //!< 13 Read SFDP sequence in lookupTable id stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_RESTORE_NOCMD \
-    14 //!< 14 Restore 0-4-4/0-8-8 mode sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_EXIT_NOCMD \
-    15 //!< 15 Exit 0-4-4/0-8-8 mode sequence id in lookupTable stored in config blobk
+#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
+#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
+#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
+#define NOR_CMD_LUT_SEQ_IDX_READID 8
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
+#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
+#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
 
 /*
  *  Serial NOR configuration block
@@ -260,6 +246,9 @@ typedef struct _flexspi_nor_config
     uint32_t reserve2[11];          //!< Reserved for future use
 } flexspi_nor_config_t;
 
+#define FLASH_BUSY_STATUS_POL 0
+#define FLASH_BUSY_STATUS_OFFSET 0
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/ports/mimxrt/boards/common.ld b/ports/mimxrt/boards/common.ld
new file mode 100644
index 0000000000..e5d91f1191
--- /dev/null
+++ b/ports/mimxrt/boards/common.ld
@@ -0,0 +1,262 @@
+/*
+** ###################################################################
+** Linker script inspired by NXP linker script for MIMXRT10xx
+** 
+** Copyright for original linker script:
+**     Copyright 2016 Freescale Semiconductor, Inc.
+**     Copyright 2016-2018 NXP
+**     SPDX-License-Identifier: BSD-3-Clause
+**
+**     http:                 www.nxp.com
+**     mail:                 support@nxp.com
+**
+** Integrated ideas from CircuitPython:
+** SPDX-License-Identifier: The MIT License (MIT)
+** SPDX-FileCopyrightText: Copyright (c) 2020 Scott Shawcroft (tannewt)
+**
+** Copyright (c) 2021 Philipp Ebensberger
+**
+** ###################################################################
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+HEAP_SIZE  = DEFINED(__heap_size__)  ? __heap_size__  : 0x0400;
+STACK_SIZE = DEFINED(__stack_size__) ? __stack_size__ : 0x0400;
+
+/* Reserved Area
+ * Users can create a reserved area at the end of the flash memory via 
+ * 'reserved_size' variable. The size of the reserved area should be a multiple
+ * of the sector size of the flash memory!
+ */
+reserved_size = DEFINED(reserved_size) ? reserved_size : 0k;
+
+/* Specify the memory areas */
+MEMORY
+{
+  m_flash_config (RX) : ORIGIN = flash_config_start,    LENGTH = flash_config_size
+  m_ivt          (RX) : ORIGIN = ivt_start,             LENGTH = ivt_size
+  m_interrupts   (RX) : ORIGIN = interrupts_start,      LENGTH = interrupts_size
+  m_text         (RX) : ORIGIN = text_start,            LENGTH = text_size
+  m_vfs          (RX) : ORIGIN = vfs_start,             LENGTH = vfs_size
+  /* Teensy uses the last bit of flash for recovery. */
+  m_reserved     (RX) : ORIGIN = (vfs_start + vfs_size), LENGTH = reserved_size  
+  m_itcm         (RX) : ORIGIN = itcm_start,            LENGTH = itcm_size
+  m_dtcm         (RW) : ORIGIN = dtcm_start,            LENGTH = dtcm_size
+  m_ocrm         (RW) : ORIGIN = ocrm_start,            LENGTH = ocrm_size
+}
+
+/* Define output sections */
+SECTIONS
+{
+  __flash_start = flash_start;
+  __vfs_start = ORIGIN(m_vfs);
+  __vfs_end = __vfs_start + LENGTH(m_vfs);  
+  
+  .flash_config :
+  {
+    . = ALIGN(4);
+    __FLASH_BASE = .;
+    KEEP(* (.boot_hdr.conf))     /* flash config section */
+    . = ALIGN(4);
+  } > m_flash_config
+
+  ivt_begin = ORIGIN(m_flash_config) + LENGTH(m_flash_config);
+
+  .ivt : AT(ivt_begin)
+  {
+    . = ALIGN(4);
+    KEEP(* (.boot_hdr.ivt))           /* ivt section */
+    KEEP(* (.boot_hdr.boot_data))     /* boot section */
+    KEEP(* (.boot_hdr.dcd_data))      /* dcd section */
+    . = ALIGN(4);
+  } > m_ivt
+
+  /* The startup code goes first into internal RAM */
+  .interrupts :
+  {
+    __VECTOR_TABLE = .;
+    . = ALIGN(4);
+    KEEP(*(.isr_vector))     /* Startup code */
+    . = ALIGN(4);
+  } > m_interrupts
+
+  __VECTOR_RAM = __VECTOR_TABLE;
+  __RAM_VECTOR_TABLE_SIZE_BYTES = 0x0;
+
+  /* The program code and other data goes into internal RAM */
+  .text :
+  {
+    . = ALIGN(4);
+    *(EXCLUDE_FILE(*fsl_flexspi.o) .text*) /* .text* sections (code) */
+    *(.rodata)               /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)              /* .rodata* sections (constants, strings, etc.) */
+    *(.glue_7)               /* glue arm to thumb code */
+    *(.glue_7t)              /* glue thumb to arm code */
+    *(.eh_frame)
+    KEEP (*(.init))
+    KEEP (*(.fini))
+    . = ALIGN(4);
+  } > m_text
+
+  .ARM.extab :
+  {
+    *(.ARM.extab* .gnu.linkonce.armextab.*)
+  } > m_text
+
+  .ARM :
+  {
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+  } > m_text
+
+ .ctors :
+  {
+    __CTOR_LIST__ = .;
+    /* gcc uses crtbegin.o to find the start of
+       the constructors, so we make sure it is
+       first.  Because this is a wildcard, it
+       doesn't matter if the user does not
+       actually link against crtbegin.o; the
+       linker won't look for a file to match a
+       wildcard.  The wildcard also means that it
+       doesn't matter which directory crtbegin.o
+       is in.  */
+    KEEP (*crtbegin.o(.ctors))
+    KEEP (*crtbegin?.o(.ctors))
+    /* We don't want to include the .ctor section from
+       from the crtend.o file until after the sorted ctors.
+       The .ctor section from the crtend file contains the
+       end of ctors marker and it must be last */
+    KEEP (*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors))
+    KEEP (*(SORT(.ctors.*)))
+    KEEP (*(.ctors))
+    __CTOR_END__ = .;
+  } > m_text
+
+  .dtors :
+  {
+    __DTOR_LIST__ = .;
+    KEEP (*crtbegin.o(.dtors))
+    KEEP (*crtbegin?.o(.dtors))
+    KEEP (*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors))
+    KEEP (*(SORT(.dtors.*)))
+    KEEP (*(.dtors))
+    __DTOR_END__ = .;
+  } > m_text
+
+  .preinit_array :
+  {
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+  } > m_text
+
+  .init_array :
+  {
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+  } > m_text
+
+  .fini_array :
+  {
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+  } > m_text
+  
+  __etext = .;    /* define a global symbol at end of code */
+  __DATA_ROM = .; /* Symbol is used by startup for data initialization */
+
+  .data : AT(__DATA_ROM)
+  {
+    . = ALIGN(4);
+    __DATA_RAM = .;
+    __data_start__ = .;      /* create a global symbol at data start */
+    *(m_usb_dma_init_data)
+    *(.data)                 /* .data sections */
+    *(.data*)                /* .data* sections */
+    KEEP(*(.jcr*))
+    . = ALIGN(4);
+    __data_end__ = .;        /* define a global symbol at data end */
+  } > m_dtcm
+
+  __RAM_FUNCTIONS_ROM = __DATA_ROM + (__data_end__ - __data_start__);
+  .ram_functions : AT(__RAM_FUNCTIONS_ROM)
+  {
+    . = ALIGN(4);
+    __ram_function_start__ = .;
+    *fsl_flexspi.o(.text*)
+    *(.ram_functions*)
+    . = ALIGN(4);
+    __ram_function_end__ = .;
+  } > m_itcm  
+
+  __NDATA_ROM = __DATA_ROM + (__ram_function_end__ - __data_start__);
+  .ncache.init : AT(__NDATA_ROM)
+  {
+    __noncachedata_start__ = .;   /* create a global symbol at ncache data start */
+    *(NonCacheable.init)
+    . = ALIGN(4);
+    __noncachedata_init_end__ = .;   /* create a global symbol at initialized ncache data end */
+  } > m_dtcm
+  . = __noncachedata_init_end__;
+  .ncache :
+  {
+    *(NonCacheable)
+    . = ALIGN(4);
+    __noncachedata_end__ = .;     /* define a global symbol at ncache data end */
+  } > m_dtcm
+
+  __DATA_END = __NDATA_ROM + (__noncachedata_init_end__ - __noncachedata_start__);
+  text_end = ORIGIN(m_text) + LENGTH(m_text);
+  ASSERT(__DATA_END <= text_end, "region m_text overflowed with text and data")
+
+  /* Uninitialized data section */
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    . = ALIGN(4);
+    __START_BSS = .;
+    __bss_start__ = .;
+    *(m_usb_dma_noninit_data)
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+    . = ALIGN(4);
+    __bss_end__ = .;
+    __END_BSS = .;
+  } > m_dtcm
+
+  .heap :
+  {
+    . = ALIGN(8);
+    __end__ = .;
+    PROVIDE(end = .);
+    __HeapBase = .;
+    . += HEAP_SIZE;
+    __HeapLimit = .;
+    __heap_limit = .; /* Add for _sbrk */
+  } > m_dtcm
+
+  .stack :
+  {
+    . = ALIGN(8);
+    . += STACK_SIZE;
+  } > m_dtcm
+
+  /* Initializes stack on the end of block */
+  __StackTop   = ORIGIN(m_dtcm) + LENGTH(m_dtcm);
+  __StackLimit = __StackTop - STACK_SIZE;
+  PROVIDE(__stack = __StackTop);
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+
+  ASSERT(__StackLimit >= __HeapLimit, "region m_dtcm overflowed with stack and heap")
+}
+
diff --git a/ports/mimxrt/hal/flexspi_nor_flash.c b/ports/mimxrt/hal/flexspi_nor_flash.c
new file mode 100644
index 0000000000..a70d234d6e
--- /dev/null
+++ b/ports/mimxrt/hal/flexspi_nor_flash.c
@@ -0,0 +1,219 @@
+/*
+ * Based largely on examples provided by NXP:
+ *
+ * Copyright (c) 2016, Freescale Semiconductor, Inc.
+ * Copyright 2016-2020 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Port-specific extensions and adaptions:
+ *
+ * The MIT License (MIT)
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Copyright (c) 2021 Damien P. George
+ * Copyright (c) 2021 Philipp Ebensberger
+ *
+ * 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 <assert.h>
+#include "fsl_common.h"
+#include "flexspi_nor_flash.h"
+
+void flexspi_nor_reset(FLEXSPI_Type *base) __attribute__((section(".ram_functions")));
+void flexspi_nor_reset(FLEXSPI_Type *base) {
+    // Using content of FLEXSPI_SoftwareReset directly to prevent issues when compiler does not inline function
+    base->MCR0 |= FLEXSPI_MCR0_SWRESET_MASK;
+    while (base->MCR0 & FLEXSPI_MCR0_SWRESET_MASK)
+    {
+    }
+}
+
+status_t flexspi_nor_write_enable(FLEXSPI_Type *base, uint32_t baseAddr) __attribute__((section(".ram_functions")));
+status_t flexspi_nor_write_enable(FLEXSPI_Type *base, uint32_t baseAddr) {
+    flexspi_transfer_t flashXfer;
+    status_t status;
+
+    /* Write neable */
+    flashXfer.deviceAddress = baseAddr;
+    flashXfer.port = kFLEXSPI_PortA1;
+    flashXfer.cmdType = kFLEXSPI_Command;
+    flashXfer.SeqNumber = 1;
+    flashXfer.seqIndex = NOR_CMD_LUT_SEQ_IDX_WRITEENABLE;
+
+    status = FLEXSPI_TransferBlocking(base, &flashXfer);
+
+    return status;
+}
+
+status_t flexspi_nor_wait_bus_busy(FLEXSPI_Type *base) __attribute__((section(".ram_functions"))) ;
+status_t flexspi_nor_wait_bus_busy(FLEXSPI_Type *base) {
+    /* Wait status ready. */
+    bool isBusy;
+    uint32_t readValue;
+    status_t status;
+    flexspi_transfer_t flashXfer;
+
+    flashXfer.deviceAddress = 0;
+    flashXfer.port = kFLEXSPI_PortA1;
+    flashXfer.cmdType = kFLEXSPI_Read;
+    flashXfer.SeqNumber = 1;
+    flashXfer.seqIndex = NOR_CMD_LUT_SEQ_IDX_READSTATUSREG;
+    flashXfer.data = &readValue;
+    flashXfer.dataSize = 1;
+
+    do {
+        status = FLEXSPI_TransferBlocking(base, &flashXfer);
+
+        if (status != kStatus_Success) {
+            return status;
+        }
+        if (FLASH_BUSY_STATUS_POL) {
+            if (readValue & (1U << FLASH_BUSY_STATUS_OFFSET)) {
+                isBusy = false;
+            } else {
+                isBusy = true;
+            }
+        } else {
+            if (readValue & (1U << FLASH_BUSY_STATUS_OFFSET)) {
+                isBusy = true;
+            } else {
+                isBusy = false;
+            }
+        }
+    } while (isBusy);
+
+    return status;
+}
+
+status_t flexspi_nor_enable_quad_mode(FLEXSPI_Type *base) __attribute__((section(".ram_functions"))) ;
+status_t flexspi_nor_enable_quad_mode(FLEXSPI_Type *base) {
+    flexspi_transfer_t flashXfer;
+    status_t status;
+    uint32_t writeValue = 0x40;
+
+    /* Write neable */
+    status = flexspi_nor_write_enable(base, 0);
+
+    if (status != kStatus_Success) {
+        return status;
+    }
+
+    /* Enable quad mode. */
+    flashXfer.deviceAddress = 0;
+    flashXfer.port = kFLEXSPI_PortA1;
+    flashXfer.cmdType = kFLEXSPI_Write;
+    flashXfer.SeqNumber = 1;
+    flashXfer.seqIndex = NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG;
+    flashXfer.data = &writeValue;
+    flashXfer.dataSize = 1;
+
+    status = FLEXSPI_TransferBlocking(base, &flashXfer);
+    if (status != kStatus_Success) {
+        return status;
+    }
+
+    status = flexspi_nor_wait_bus_busy(base);
+
+    return status;
+}
+
+status_t flexspi_nor_flash_erase_sector(FLEXSPI_Type *base, uint32_t address) __attribute__((section(".ram_functions"))) ;
+status_t flexspi_nor_flash_erase_sector(FLEXSPI_Type *base, uint32_t address) {
+    status_t status;
+    flexspi_transfer_t flashXfer;
+
+    /* Write enable */
+    status = flexspi_nor_write_enable(base, address);
+
+    if (status != kStatus_Success) {
+        return status;
+    }
+
+    /* Erase sector */
+    flashXfer.deviceAddress = address;
+    flashXfer.port = kFLEXSPI_PortA1;
+    flashXfer.cmdType = kFLEXSPI_Command;
+    flashXfer.SeqNumber = 1;
+    flashXfer.seqIndex = NOR_CMD_LUT_SEQ_IDX_ERASESECTOR;
+    status = FLEXSPI_TransferBlocking(base, &flashXfer);
+
+    if (status != kStatus_Success) {
+        return status;
+    }
+
+    status = flexspi_nor_wait_bus_busy(base);
+
+    flexspi_nor_reset(base);
+
+    return status;
+}
+
+status_t flexspi_nor_flash_page_program(FLEXSPI_Type *base, uint32_t dstAddr, const uint32_t *src, uint32_t size) __attribute__((section(".ram_functions"))) ;
+status_t flexspi_nor_flash_page_program(FLEXSPI_Type *base, uint32_t dstAddr, const uint32_t *src, uint32_t size) {
+    status_t status;
+    flexspi_transfer_t flashXfer;
+
+    /* Write enable */
+    status = flexspi_nor_write_enable(base, dstAddr);
+
+    if (status != kStatus_Success) {
+        return status;
+    }
+
+    /* Prepare page program command */
+    flashXfer.deviceAddress = dstAddr;
+    flashXfer.port = kFLEXSPI_PortA1;
+    flashXfer.cmdType = kFLEXSPI_Write;
+    flashXfer.SeqNumber = 1;
+    flashXfer.seqIndex = NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD;
+    flashXfer.data = (uint32_t *) src;
+    flashXfer.dataSize = size;
+    status = FLEXSPI_TransferBlocking(base, &flashXfer);
+
+    if (status != kStatus_Success) {
+        return status;
+    }
+
+    status = flexspi_nor_wait_bus_busy(base);
+
+    flexspi_nor_reset(FLEXSPI);
+
+    return status;
+}
+
+status_t flexspi_nor_get_vendor_id(FLEXSPI_Type *base, uint8_t *vendorId) __attribute__((section(".ram_functions"))) ;
+status_t flexspi_nor_get_vendor_id(FLEXSPI_Type *base, uint8_t *vendorId) {
+    uint32_t temp;
+    flexspi_transfer_t flashXfer;
+    flashXfer.deviceAddress = 0;
+    flashXfer.port = kFLEXSPI_PortA1;
+    flashXfer.cmdType = kFLEXSPI_Read;
+    flashXfer.SeqNumber = 1;
+    flashXfer.seqIndex = NOR_CMD_LUT_SEQ_IDX_READID;
+    flashXfer.data = &temp;
+    flashXfer.dataSize = 2;
+
+    status_t status = FLEXSPI_TransferBlocking(base, &flashXfer);
+
+    *vendorId = temp;
+
+    return status;
+}
diff --git a/ports/mimxrt/hal/flexspi_nor_flash.h b/ports/mimxrt/hal/flexspi_nor_flash.h
new file mode 100644
index 0000000000..43cd7efdc7
--- /dev/null
+++ b/ports/mimxrt/hal/flexspi_nor_flash.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ *
+ * 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_MIMXRT_HAL_FLEXSPI_NOR_FLASH_H
+#define MICROPY_INCLUDED_MIMXRT_HAL_FLEXSPI_NOR_FLASH_H
+
+#include "fsl_flexspi.h"
+#include "mpconfigport.h"
+#include BOARD_FLASH_CONFIG_HEADER_H
+
+// Defined in boards flash_config.c
+extern flexspi_nor_config_t qspiflash_config;
+
+status_t flexspi_nor_get_vendor_id(FLEXSPI_Type *base, uint8_t *vendorId);
+status_t flexspi_nor_init(void);
+void flexspi_nor_update_lut(void);
+status_t flexspi_nor_flash_erase_sector(FLEXSPI_Type *base, uint32_t address);
+status_t flexspi_nor_flash_page_program(FLEXSPI_Type *base, uint32_t address, const uint32_t *src, uint32_t size);
+
+#endif // MICROPY_INCLUDED_MIMXRT_HAL_FLEXSPI_NOR_FLASH_H
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index 387c96ef33..76fd7ef76c 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -30,6 +30,7 @@
 #include "py/gc.h"
 #include "py/mperrno.h"
 #include "py/stackctrl.h"
+#include "lib/mp-readline/readline.h"
 #include "lib/utils/gchelper.h"
 #include "lib/utils/pyexec.h"
 #include "ticks.h"
@@ -57,6 +58,24 @@ int main(void) {
         mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_));
         mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_argv), 0);
 
+        // Initialise sub-systems.
+        readline_init0();
+
+        // Execute _boot.py to set up the filesystem.
+        pyexec_frozen_module("_boot.py");
+
+        // Execute user scripts.
+        int ret = pyexec_file_if_exists("boot.py");
+        if (ret & PYEXEC_FORCED_EXIT) {
+            goto soft_reset_exit;
+        }
+        if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {
+            ret = pyexec_file_if_exists("main.py");
+            if (ret & PYEXEC_FORCED_EXIT) {
+                goto soft_reset_exit;
+            }
+        }
+
         for (;;) {
             if (pyexec_mode_kind == PYEXEC_MODE_RAW_REPL) {
                 if (pyexec_raw_repl() != 0) {
@@ -69,6 +88,7 @@ int main(void) {
             }
         }
 
+    soft_reset_exit:
         mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n");
         gc_sweep_all();
         mp_deinit();
@@ -83,19 +103,6 @@ void gc_collect(void) {
     gc_collect_end();
 }
 
-mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
-    mp_raise_OSError(MP_ENOENT);
-}
-
-mp_import_stat_t mp_import_stat(const char *path) {
-    return MP_IMPORT_STAT_NO_EXIST;
-}
-
-mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
-
 void nlr_jump_fail(void *val) {
     for (;;) {
     }
diff --git a/ports/mimxrt/mimxrt_flash.c b/ports/mimxrt/mimxrt_flash.c
new file mode 100644
index 0000000000..6b89bfa532
--- /dev/null
+++ b/ports/mimxrt/mimxrt_flash.c
@@ -0,0 +1,221 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ * Copyright (c) 2021 Philipp Ebensberger
+ *
+ * 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 <string.h>
+
+#include "py/runtime.h"
+#include "extmod/vfs.h"
+#include "modmimxrt.h"
+#include "hal/flexspi_nor_flash.h"
+
+// BOARD_FLASH_SIZE is defined in mpconfigport.h
+#define SECTOR_SIZE_BYTES (qspiflash_config.sectorSize)
+#define PAGE_SIZE_BYTES (qspiflash_config.pageSize)
+
+#ifndef MICROPY_HW_FLASH_STORAGE_BYTES
+#define MICROPY_HW_FLASH_STORAGE_BYTES (((uint32_t)&__vfs_end) - ((uint32_t)&__vfs_start))
+#endif
+
+#ifndef MICROPY_HW_FLASH_STORAGE_BASE
+#define MICROPY_HW_FLASH_STORAGE_BASE (((uint32_t)&__vfs_start) - ((uint32_t)&__flash_start))
+#endif
+
+// Linker symbols
+extern uint8_t __vfs_start;
+extern uint8_t __vfs_end;
+extern uint8_t __flash_start;
+
+extern flexspi_nor_config_t qspiflash_config;
+
+typedef struct _mimxrt_flash_obj_t {
+    mp_obj_base_t base;
+    uint32_t flash_base;
+    uint32_t flash_size;
+} mimxrt_flash_obj_t;
+
+STATIC mimxrt_flash_obj_t mimxrt_flash_obj = {
+    .base = { &mimxrt_flash_type }
+};
+
+// flash_erase_block(erase_addr_bytes)
+// erases the 4k sector starting at adddr
+status_t flash_erase_block(uint32_t erase_addr) __attribute__((section(".ram_functions")));
+status_t flash_erase_block(uint32_t erase_addr) {
+    status_t status;
+    SCB_CleanInvalidateDCache();
+    SCB_DisableDCache();
+    __disable_irq();
+    status = flexspi_nor_flash_erase_sector(FLEXSPI, erase_addr);
+    __enable_irq();
+    SCB_EnableDCache();
+    return status;
+}
+
+// flash_write_block(flash_dest_addr_bytes, data_source, length_bytes)
+// writes length_byte data to the destination address
+// length is a multiple of the page size = 256
+// the vfs driver takes care for erasing the sector if required
+status_t flash_write_block(uint32_t dest_addr, const uint8_t *src, uint32_t length) __attribute__((section(".ram_functions")));
+status_t flash_write_block(uint32_t dest_addr, const uint8_t *src, uint32_t length) {
+    status_t status;
+    SCB_CleanInvalidateDCache();
+    SCB_DisableDCache();
+    // write sector in page size chunks
+    for (int i = 0; i < length; i += PAGE_SIZE_BYTES) {
+        __disable_irq();
+        status = flexspi_nor_flash_page_program(FLEXSPI, dest_addr + i, (uint32_t *)(src + i), PAGE_SIZE_BYTES);
+        __enable_irq();
+        if (status != kStatus_Success) {
+            break;
+        }
+    }
+    SCB_EnableDCache();
+    return status;
+}
+
+STATIC mp_obj_t mimxrt_flash_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    // Check args.
+    mp_arg_check_num(n_args, n_kw, 0, 0, false);
+
+    // Upload the custom flash configuration
+    // This should be performed by the boot ROM but for some reason it is not.
+    FLEXSPI_UpdateLUT(FLEXSPI, 0,
+        qspiflash_config.memConfig.lookupTable,
+        sizeof(qspiflash_config.memConfig.lookupTable) / sizeof(qspiflash_config.memConfig.lookupTable[0]));
+
+    // Configure FLEXSPI IP FIFO access.
+    FLEXSPI->MCR0 &= ~(FLEXSPI_MCR0_ARDFEN_MASK);
+    FLEXSPI->MCR0 &= ~(FLEXSPI_MCR0_ATDFEN_MASK);
+    FLEXSPI->MCR0 |= FLEXSPI_MCR0_ARDFEN(0);
+    FLEXSPI->MCR0 |= FLEXSPI_MCR0_ATDFEN(0);
+
+    // Update information based on linker symbols.
+    mimxrt_flash_obj.flash_base = MICROPY_HW_FLASH_STORAGE_BASE;
+    mimxrt_flash_obj.flash_size = MICROPY_HW_FLASH_STORAGE_BYTES;
+
+    // Return singleton object.
+    return MP_OBJ_FROM_PTR(&mimxrt_flash_obj);
+}
+
+// readblocks(block_num, buf, [offset])
+// read size of buffer number of bytes from block (with offset) into buffer
+STATIC mp_obj_t mimxrt_flash_readblocks(size_t n_args, const mp_obj_t *args) {
+    mimxrt_flash_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_WRITE);
+    // if (n_args == 4) {
+    //     mp_printf(MP_PYTHON_PRINTER, "readblocks: nargs = %d, block = %d, offset = %d, len = %d\n",
+    //         n_args, mp_obj_get_int(args[1]), mp_obj_get_int(args[3]), bufinfo.len);
+    // } else {
+    //     mp_printf(MP_PYTHON_PRINTER, "readblocks: nargs = %d, block = %d, len = %d\n",
+    //         n_args, mp_obj_get_int(args[1]), bufinfo.len);
+    // }
+    // Calculate read offset from block number.
+    uint32_t offset = mp_obj_get_int(args[1]) * SECTOR_SIZE_BYTES;
+    // Add optional offset
+    if (n_args == 4) {
+        offset += mp_obj_get_int(args[3]);
+    }
+    memcpy(bufinfo.buf, (uint8_t *)(FlexSPI_AMBA_BASE + self->flash_base + offset), bufinfo.len);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mimxrt_flash_readblocks_obj, 3, 4, mimxrt_flash_readblocks);
+
+// writeblocks(block_num, buf, [offset])
+// Erase block based on block_num and write buffer size number of bytes from buffer into block. If additional offset
+// parameter is provided only write operation at block start + offset will be performed.
+// This requires a prior erase operation of the block!
+STATIC mp_obj_t mimxrt_flash_writeblocks(size_t n_args, const mp_obj_t *args) {
+    status_t status;
+    mimxrt_flash_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_READ);
+
+    // Calculate read offset from block number.
+    uint32_t offset = mp_obj_get_int(args[1]) * SECTOR_SIZE_BYTES;
+
+    if (n_args == 3) {
+        status = flash_erase_block(self->flash_base + offset);
+
+        if (status != kStatus_Success) {
+            mp_raise_msg_varg(&mp_type_OSError, MP_ERROR_TEXT("flash erase command failed with %d"), status);
+        }
+    } else {
+        // Add optional offset
+        offset += mp_obj_get_int(args[3]);
+    }
+
+    status = flash_write_block(self->flash_base + offset, bufinfo.buf, bufinfo.len);
+
+    if (status != kStatus_Success) {
+        mp_raise_msg_varg(&mp_type_OSError, MP_ERROR_TEXT("flash block write command failed with %d"), status);
+    }
+
+    return MP_OBJ_NEW_SMALL_INT(status != kStatus_Success);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mimxrt_flash_writeblocks_obj, 3, 4, mimxrt_flash_writeblocks);
+
+// ioctl(op, arg)
+STATIC mp_obj_t mimxrt_flash_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_in) {
+    mimxrt_flash_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_int_t cmd = mp_obj_get_int(cmd_in);
+    status_t status;
+    switch (cmd) {
+        case MP_BLOCKDEV_IOCTL_INIT:
+            return MP_OBJ_NEW_SMALL_INT(0);
+        case MP_BLOCKDEV_IOCTL_DEINIT:
+            return MP_OBJ_NEW_SMALL_INT(0);
+        case MP_BLOCKDEV_IOCTL_SYNC:
+            return MP_OBJ_NEW_SMALL_INT(0);
+        case MP_BLOCKDEV_IOCTL_BLOCK_COUNT:
+            return MP_OBJ_NEW_SMALL_INT(self->flash_size / SECTOR_SIZE_BYTES);
+        case MP_BLOCKDEV_IOCTL_BLOCK_SIZE:
+            return MP_OBJ_NEW_SMALL_INT(SECTOR_SIZE_BYTES);
+        case MP_BLOCKDEV_IOCTL_BLOCK_ERASE: {
+            uint32_t offset = mp_obj_get_int(arg_in) * SECTOR_SIZE_BYTES;
+            status = flash_erase_block(self->flash_base + offset);
+            return MP_OBJ_NEW_SMALL_INT(status != kStatus_Success);
+        }
+        default:
+            return mp_const_none;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(mimxrt_flash_ioctl_obj, mimxrt_flash_ioctl);
+
+STATIC const mp_rom_map_elem_t mimxrt_flash_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_readblocks), MP_ROM_PTR(&mimxrt_flash_readblocks_obj) },
+    { MP_ROM_QSTR(MP_QSTR_writeblocks), MP_ROM_PTR(&mimxrt_flash_writeblocks_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&mimxrt_flash_ioctl_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(mimxrt_flash_locals_dict, mimxrt_flash_locals_dict_table);
+
+const mp_obj_type_t mimxrt_flash_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Flash,
+    .make_new = mimxrt_flash_make_new,
+    .locals_dict = (mp_obj_dict_t *)&mimxrt_flash_locals_dict,
+};
diff --git a/ports/mimxrt/modmimxrt.c b/ports/mimxrt/modmimxrt.c
new file mode 100644
index 0000000000..addd4ba4d2
--- /dev/null
+++ b/ports/mimxrt/modmimxrt.c
@@ -0,0 +1,39 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * 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/runtime.h"
+#include "modmimxrt.h"
+
+STATIC const mp_rom_map_elem_t mimxrt_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_mimxrt) },
+    { MP_ROM_QSTR(MP_QSTR_Flash),               MP_ROM_PTR(&mimxrt_flash_type) },
+};
+STATIC MP_DEFINE_CONST_DICT(mimxrt_module_globals, mimxrt_module_globals_table);
+
+const mp_obj_module_t mp_module_mimxrt = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&mimxrt_module_globals,
+};
diff --git a/ports/mimxrt/modmimxrt.h b/ports/mimxrt/modmimxrt.h
new file mode 100644
index 0000000000..e047716691
--- /dev/null
+++ b/ports/mimxrt/modmimxrt.h
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * 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_MIMXRT_MODMIMXRT_H
+#define MICROPY_INCLUDED_MIMXRT_MODMIMXRT_H
+
+#include "py/obj.h"
+
+extern const mp_obj_type_t mimxrt_flash_type;
+extern const mp_obj_module_t mp_module_mimxrt;
+
+#endif // MICROPY_INCLUDED_MIMXRT_MODMIMXRT_H
diff --git a/ports/mimxrt/modules/_boot.py b/ports/mimxrt/modules/_boot.py
new file mode 100644
index 0000000000..892d004735
--- /dev/null
+++ b/ports/mimxrt/modules/_boot.py
@@ -0,0 +1,15 @@
+# _boot.py
+# Try to mount the filesystem, and format the flash if it doesn't exist.
+# Note: the flash requires the programming size to be aligned to 256 bytes.
+
+import os
+import mimxrt
+
+bdev = mimxrt.Flash()
+
+try:
+    vfs = os.VfsLfs2(bdev, progsize=256)
+except:
+    os.VfsLfs2.mkfs(bdev, progsize=256)
+    vfs = os.VfsLfs2(bdev, progsize=256)
+os.mount(vfs, "/")
diff --git a/ports/mimxrt/moduos.c b/ports/mimxrt/moduos.c
new file mode 100644
index 0000000000..fe914ce610
--- /dev/null
+++ b/ports/mimxrt/moduos.c
@@ -0,0 +1,129 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Damien P. George
+ *
+ * use of the TRNG by
+ * Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2019 Artur Pacholec
+ *
+ * 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/objstr.h"
+#include "py/runtime.h"
+#include "extmod/vfs.h"
+#include "extmod/vfs_lfs.h"
+#include "genhdr/mpversion.h"
+#include "fsl_trng.h"
+
+STATIC const qstr os_uname_info_fields[] = {
+    MP_QSTR_sysname, MP_QSTR_nodename,
+    MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
+};
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, MICROPY_PY_SYS_PLATFORM);
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, MICROPY_PY_SYS_PLATFORM);
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING);
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME);
+
+STATIC MP_DEFINE_ATTRTUPLE(
+    os_uname_info_obj,
+    os_uname_info_fields,
+    5,
+    (mp_obj_t)&os_uname_info_sysname_obj,
+    (mp_obj_t)&os_uname_info_nodename_obj,
+    (mp_obj_t)&os_uname_info_release_obj,
+    (mp_obj_t)&os_uname_info_version_obj,
+    (mp_obj_t)&os_uname_info_machine_obj
+    );
+
+STATIC mp_obj_t os_uname(void) {
+    return (mp_obj_t)&os_uname_info_obj;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_uname_obj, os_uname);
+
+STATIC mp_obj_t os_urandom(mp_obj_t num) {
+    mp_int_t n = mp_obj_get_int(num);
+    static bool initialized = false;
+    vstr_t vstr;
+    vstr_init_len(&vstr, n);
+
+    if (!initialized) {
+        trng_config_t trngConfig;
+
+        TRNG_GetDefaultConfig(&trngConfig);
+        trngConfig.sampleMode = kTRNG_SampleModeVonNeumann;
+
+        TRNG_Init(TRNG, &trngConfig);
+        initialized = true;
+    }
+    TRNG_GetRandomData(TRNG, vstr.buf, n);
+
+    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
+
+STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
+
+    { MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&os_uname_obj) },
+    { MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&os_urandom_obj) },
+
+    #if MICROPY_VFS
+    { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&mp_vfs_chdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&mp_vfs_getcwd_obj) },
+    { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&mp_vfs_listdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mp_vfs_mkdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&mp_vfs_remove_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&mp_vfs_rename_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&mp_vfs_rmdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&mp_vfs_stat_obj) },
+    { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&mp_vfs_statvfs_obj) },
+    #endif
+
+    // The following are MicroPython extensions.
+
+    #if MICROPY_PY_OS_DUPTERM
+    { MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&mp_uos_dupterm_obj) },
+    #endif
+
+    #if MICROPY_VFS
+    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mp_vfs_ilistdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&mp_vfs_mount_obj) },
+    { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&mp_vfs_umount_obj) },
+    #if MICROPY_VFS_FAT
+    { MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) },
+    #endif
+    #if MICROPY_VFS_LFS1
+    { MP_ROM_QSTR(MP_QSTR_VfsLfs1), MP_ROM_PTR(&mp_type_vfs_lfs1) },
+    #endif
+    #if MICROPY_VFS_LFS2
+    { MP_ROM_QSTR(MP_QSTR_VfsLfs2), MP_ROM_PTR(&mp_type_vfs_lfs2) },
+    #endif
+    #endif
+};
+STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
+
+const mp_obj_module_t mp_module_uos = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&os_module_globals,
+};
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 63ee5ea5cc..db1944a9b8 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -34,20 +34,26 @@
 #define MICROPY_GC_ALLOC_THRESHOLD          (0)
 #define MICROPY_ALLOC_PARSE_CHUNK_INIT      (32)
 #define MICROPY_ALLOC_PATH_MAX              (256)
-#define MICROPY_QSTR_BYTES_IN_HASH          (1)
 
 // Compiler configuration
 #define MICROPY_COMP_CONST                  (0)
 
 // Python internal features
+#define MICROPY_READER_VFS                  (1)
 #define MICROPY_ENABLE_GC                   (1)
+#define MICROPY_ENABLE_FINALISER            (1)
+#define MICROPY_STACK_CHECK                 (1)
+#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF  (1)
 #define MICROPY_KBD_EXCEPTION               (1)
 #define MICROPY_HELPER_REPL                 (1)
 #define MICROPY_REPL_AUTO_INDENT            (1)
 #define MICROPY_LONGINT_IMPL                (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_ENABLE_SOURCE_LINE          (1)
-#define MICROPY_ERROR_REPORTING             (MICROPY_ERROR_REPORTING_TERSE)
+#define MICROPY_STREAMS_NON_BLOCK           (1)
+#define MICROPY_MODULE_BUILTIN_INIT         (1)
+#define MICROPY_MODULE_WEAK_LINKS           (1)
 #define MICROPY_CAN_OVERRIDE_BUILTINS       (1)
+#define MICROPY_VFS                         (1)
 #define MICROPY_MODULE_FROZEN_MPY           (1)
 #define MICROPY_QSTR_EXTRA_POOL             mp_qstr_frozen_const_pool
 
@@ -68,22 +74,39 @@
 #define MICROPY_PY_MICROPYTHON_MEM_INFO     (1)
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN       (1)
 #define MICROPY_PY_COLLECTIONS              (0)
+#define MICROPY_PY_IO_IOBASE                (1)
+#define MICROPY_PY_IO_FILEIO                (1)
 #define MICROPY_PY_SYS_MAXSIZE              (1)
+#define MICROPY_PY_SYS_PLATFORM             "mimxrt"
+#define MICROPY_PY_SYS_STDFILES             (1)
+#define MICROPY_PY_SYS_STDIO_BUFFER         (1)
 
 // Extended modules
 #define MICROPY_PY_UTIME_MP_HAL             (1)
 #define MICROPY_PY_MACHINE                  (1)
 
+// Use VfsLfs2's types for fileio/textio
+#define mp_type_fileio mp_type_vfs_lfs2_fileio
+#define mp_type_textio mp_type_vfs_lfs2_textio
+
+// Use VFS's functions for import stat and builtin open
+#define mp_import_stat mp_vfs_import_stat
+#define mp_builtin_open_obj mp_vfs_open_obj
+
 // Hooks to add builtins
 
 #define MICROPY_PORT_BUILTINS \
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
 
 extern const struct _mp_obj_module_t mp_module_machine;
+extern const struct _mp_obj_module_t mp_module_mimxrt;
+extern const struct _mp_obj_module_t mp_module_uos;
 extern const struct _mp_obj_module_t mp_module_utime;
 
 #define MICROPY_PORT_BUILTIN_MODULES \
     { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&mp_module_machine) }, \
+    { MP_ROM_QSTR(MP_QSTR_mimxrt), (mp_obj_t)&mp_module_mimxrt }, \
+    { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
     { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
 
 #define MICROPY_PORT_ROOT_POINTERS \
diff --git a/ports/mimxrt/mphalport.c b/ports/mimxrt/mphalport.c
index 02a61a4f2a..faecafbbcd 100644
--- a/ports/mimxrt/mphalport.c
+++ b/ports/mimxrt/mphalport.c
@@ -26,6 +26,7 @@
  */
 
 #include "py/runtime.h"
+#include "py/stream.h"
 #include "py/mphal.h"
 #include "ticks.h"
 #include "tusb.h"
@@ -47,6 +48,14 @@ void mp_hal_set_interrupt_char(int c) {
 
 #endif
 
+uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
+    uintptr_t ret = 0;
+    if (tud_cdc_connected() && tud_cdc_available()) {
+        ret |= MP_STREAM_POLL_RD;
+    }
+    return ret;
+}
+
 int mp_hal_stdin_rx_chr(void) {
     for (;;) {
         // TODO
diff --git a/ports/mimxrt/mphalport.h b/ports/mimxrt/mphalport.h
index 78b390b4eb..fd664346dd 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -73,4 +73,9 @@ static inline mp_uint_t mp_hal_ticks_cpu(void) {
     return 0;
 }
 
+static inline uint64_t mp_hal_time_ns(void) {
+    // TODO: Implement this function.
+    return 0UL;
+}
+
 #endif // MICROPY_INCLUDED_MIMXRT_MPHALPORT_H

From 745b4319a21cfebefead76c7fcacd0b619d48063 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 17 May 2021 12:31:11 +0200
Subject: [PATCH 178/349] mimxrt/boards/TEENSY40: Re-create the flash FS after
 deploy.

This is required since the Teensy Halfkay loader attempts to erase all of
the flash but fails to do so, at least in my tests.  Formatting brings it
back to a known state.
---
 ports/mimxrt/Makefile                         |  2 ++
 ports/mimxrt/boards/TEENSY40/format.py        | 11 +++++++++++
 ports/mimxrt/boards/TEENSY40/mpconfigboard.mk |  2 ++
 3 files changed, 15 insertions(+)
 create mode 100644 ports/mimxrt/boards/TEENSY40/format.py

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 7feab6cd75..956291b322 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -2,6 +2,8 @@ BOARD ?= TEENSY40
 BOARD_DIR ?= boards/$(BOARD)
 BUILD ?= build-$(BOARD)
 
+PORT ?= /dev/ttyACM0
+
 CROSS_COMPILE ?= arm-none-eabi-
 
 ifeq ($(wildcard $(BOARD_DIR)/.),)
diff --git a/ports/mimxrt/boards/TEENSY40/format.py b/ports/mimxrt/boards/TEENSY40/format.py
new file mode 100644
index 0000000000..75e5aa95ca
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY40/format.py
@@ -0,0 +1,11 @@
+# format.py
+# Re-create the file system
+
+import os
+import mimxrt
+
+bdev = mimxrt.Flash()
+
+os.VfsLfs2.mkfs(bdev, progsize=256)
+vfs = os.VfsLfs2(bdev, progsize=256)
+os.mount(vfs, "/")
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
index 6b939a3afd..79365d0da8 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
@@ -3,3 +3,5 @@ MCU_VARIANT = MIMXRT1062DVJ6A
 
 deploy: $(BUILD)/firmware.hex
 	teensy_loader_cli --mcu=imxrt1062 -v -w $<
+	sleep 1
+	$(PYTHON) $(TOP)/tools/pyboard.py --device $(PORT) $(BOARD_DIR)/format.py

From 934505ac33b60066398f75a45af3896b9672a661 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 2 Jun 2021 00:02:21 +1000
Subject: [PATCH 179/349] tools/ci.sh: Build mpy-cross as part of
 ci_mimxrt_build.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index 23e529e5e1..22b43d4513 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -146,6 +146,7 @@ function ci_mimxrt_setup {
 }
 
 function ci_mimxrt_build {
+    make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/mimxrt submodules
     make ${MAKEOPTS} -C ports/mimxrt BOARD=MIMXRT1020_EVK
     make ${MAKEOPTS} -C ports/mimxrt BOARD=TEENSY40

From 4c407c790fd8c9efb89f91ab4805fc459970a833 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 18 May 2021 17:27:00 +0200
Subject: [PATCH 180/349] mimxrt: Add the Timer class to the machine module.

It supports three hardware timer channels based on the PIT timers of the
MIMXRT MCU.  The timer id's are 0, 1 and 2.  On soft reboot all active
timers will be stopped via finalisers.
---
 ports/mimxrt/Makefile        |   3 +
 ports/mimxrt/board_init.c    |   4 +
 ports/mimxrt/machine_timer.c | 210 +++++++++++++++++++++++++++++++++++
 ports/mimxrt/modmachine.c    |   2 +
 ports/mimxrt/modmachine.h    |  36 ++++++
 ports/mimxrt/mpconfigport.h  |   7 +-
 6 files changed, 261 insertions(+), 1 deletion(-)
 create mode 100644 ports/mimxrt/machine_timer.c
 create mode 100644 ports/mimxrt/modmachine.h

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 956291b322..21eab51fe7 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -107,6 +107,7 @@ SRC_TINYUSB_IMX_C += \
 	$(MCU_DIR)/drivers/fsl_lpuart.c \
 	$(MCU_DIR)/drivers/fsl_flexram.c \
 	$(MCU_DIR)/drivers/fsl_flexspi.c \
+	$(MCU_DIR)/drivers/fsl_pit.c \
 	$(MCU_DIR)/drivers/fsl_trng.c \
 
 SRC_C = \
@@ -119,6 +120,7 @@ SRC_C = \
 	$(BOARD_DIR)/flash_config.c \
 	machine_led.c \
 	machine_pin.c \
+	machine_timer.c \
 	mimxrt_flash.c \
 	modutime.c \
 	modmachine.c \
@@ -144,6 +146,7 @@ SRC_S = lib/utils/gchelper_m3.s \
 SRC_QSTR += \
 	machine_led.c \
 	machine_pin.c \
+	machine_timer.c \
 	mimxrt_flash.c \
 	modutime.c \
 	modmachine.c \
diff --git a/ports/mimxrt/board_init.c b/ports/mimxrt/board_init.c
index 0336cdf686..01f6848ea6 100644
--- a/ports/mimxrt/board_init.c
+++ b/ports/mimxrt/board_init.c
@@ -38,6 +38,7 @@
 #include "fsl_lpuart.h"
 
 #include "clock_config.h"
+#include "modmachine.h"
 
 volatile uint32_t systick_ms = 0;
 
@@ -78,6 +79,9 @@ void board_init(void) {
     // USB1
     //  CLOCK_EnableUsbhs1PhyPllClock(kCLOCK_Usbphy480M, 480000000U);
     //  CLOCK_EnableUsbhs1Clock(kCLOCK_Usb480M, 480000000U);
+
+    // PIT
+    machine_timer_init_PIT();
 }
 
 void USB_OTG1_IRQHandler(void) {
diff --git a/ports/mimxrt/machine_timer.c b/ports/mimxrt/machine_timer.c
new file mode 100644
index 0000000000..466860583a
--- /dev/null
+++ b/ports/mimxrt/machine_timer.c
@@ -0,0 +1,210 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ * Copyright (c) 2021 Robert Hammelrath
+ *
+ * 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/runtime.h"
+#include "py/mperrno.h"
+#include "py/mphal.h"
+#include "fsl_pit.h"
+#include "modmachine.h"
+
+#define ALARM_ID_INVALID (-1)
+#define TIMER_MODE_ONE_SHOT (0)
+#define TIMER_MODE_PERIODIC (1)
+#define TIMER_MIN_PERIOD 1
+
+#define alarm_callback PIT_IRQHandler
+#define PIT_SOURCE_CLOCK CLOCK_GetFreq(kCLOCK_OscClk)
+#define PIT_IRQ_ID PIT_IRQn
+
+typedef struct _machine_timer_obj_t {
+    mp_obj_base_t base;
+    int8_t id;
+    int8_t channel;
+    uint32_t mode;
+    uint32_t tick_hz;
+    uint32_t delta_us; // for periodic mode
+    mp_obj_t callback;
+} machine_timer_obj_t;
+
+static const int8_t channel_no[MICROPY_HW_PIT_NUM_CHANNELS] = {0, 2, 3}; // no channel 1
+static pit_config_t pit_config;
+
+// This is the interrupt handler
+// To tell which channel fired one has to poll the flags
+void alarm_callback(void) {
+    for (uint8_t index = 0; index < MICROPY_HW_PIT_NUM_CHANNELS; index++) {
+        uint32_t flag;
+        machine_timer_obj_t *self = MP_STATE_PORT(timer_table)[index];
+        if (self != NULL) {
+            flag = PIT_GetStatusFlags(PIT, self->channel);
+            if (flag & kPIT_TimerFlag) { // channel fired
+                PIT_ClearStatusFlags(PIT, self->channel, kPIT_TimerFlag);
+                __DSB();
+
+                mp_sched_schedule(self->callback, MP_OBJ_FROM_PTR(self));
+
+                if (self->mode == TIMER_MODE_ONE_SHOT) {
+                    PIT_StopTimer(PIT, self->channel);
+                }
+            }
+        }
+    }
+}
+
+STATIC void machine_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    qstr mode = self->mode == TIMER_MODE_ONE_SHOT ? MP_QSTR_ONE_SHOT : MP_QSTR_PERIODIC;
+    mp_printf(print, "Timer(channel=%d, mode=%q, period=%d, tick_hz=%d)",
+        self->id, mode, self->delta_us / self->tick_hz, self->tick_hz);
+}
+
+STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_mode, ARG_callback, ARG_period, ARG_tick_hz, ARG_freq, };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_mode,         MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = TIMER_MODE_PERIODIC} },
+        { MP_QSTR_callback,     MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_period,       MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0xffffffff} },
+        { MP_QSTR_tick_hz,      MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1000} },
+        { MP_QSTR_freq,         MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+    };
+
+    // Parse args
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    MP_STATE_PORT(timer_table)[self->id] = self;  // Insert into the table
+
+    self->mode = args[ARG_mode].u_int;
+    if (args[ARG_freq].u_obj != mp_const_none) {
+        // Frequency specified in Hz
+        #if MICROPY_PY_BUILTINS_FLOAT
+        self->delta_us = (uint32_t)(MICROPY_FLOAT_CONST(1000000.0) / mp_obj_get_float(args[ARG_freq].u_obj));
+        #else
+        self->delta_us = 1000000 / mp_obj_get_int(args[ARG_freq].u_obj);
+        #endif
+    } else {
+        // Period specified
+        self->tick_hz = args[ARG_tick_hz].u_int;
+        self->delta_us = (uint64_t)args[ARG_period].u_int * 1000000 / self->tick_hz;
+    }
+    if (self->delta_us < TIMER_MIN_PERIOD) {
+        self->delta_us = TIMER_MIN_PERIOD;
+    }
+
+    self->callback = args[ARG_callback].u_obj;
+
+    // Set timer period for channel id
+    PIT_SetTimerPeriod(PIT, self->channel, USEC_TO_COUNT(self->delta_us, PIT_SOURCE_CLOCK));
+
+    // Enable timer interrupts for the channel
+    PIT_EnableInterrupts(PIT, self->channel, kPIT_TimerInterruptEnable);
+
+    // Enable at the NVIC
+    EnableIRQ(PIT_IRQ_ID);
+
+    // Start channel 0
+    PIT_StartTimer(PIT, self->channel);
+
+    return mp_const_none;
+}
+
+STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    machine_timer_obj_t *self = m_new_obj_with_finaliser(machine_timer_obj_t);
+    self->base.type = &machine_timer_type;
+    self->id = ALARM_ID_INVALID;
+
+    // Get timer id in the range of 0..2
+    mp_int_t id = 0;
+    if (n_args > 0) {
+        id = mp_obj_get_int(args[0]);
+        --n_args;
+        ++args;
+    }
+    if (id < 0 || id >= MICROPY_HW_PIT_NUM_CHANNELS) {
+        mp_raise_ValueError(MP_ERROR_TEXT("Timer does not exist"));
+    }
+
+    // Set initial values
+    self->id = id;
+    self->channel = channel_no[id];
+
+    if (n_args > 0 || n_kw > 0) {
+        // Start the timer
+        mp_map_t kw_args;
+        mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+        machine_timer_init_helper(self, n_args, args, &kw_args);
+    }
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC mp_obj_t machine_timer_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    machine_timer_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    PIT_StopTimer(PIT, self->channel);
+    return machine_timer_init_helper(self, n_args - 1, args + 1, kw_args);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_timer_init_obj, 1, machine_timer_init);
+
+STATIC mp_obj_t machine_timer_deinit(mp_obj_t self_in) {
+    machine_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    PIT_StopTimer(PIT, self->channel);
+    MP_STATE_PORT(timer_table)[self->id] = NULL;
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_deinit_obj, machine_timer_deinit);
+
+// Initialize clock an first config
+void machine_timer_init_PIT(void) {
+    // PIT timer
+    // Enable clock gate for GPIO1
+    CLOCK_EnableClock(kCLOCK_Gpio1); // ?
+    // Set PERCLK_CLK source to OSC_CLK
+    CLOCK_SetMux(kCLOCK_PerclkMux, 1U);
+    // Set PERCLK_CLK divider to 1
+    CLOCK_SetDiv(kCLOCK_PerclkDiv, 0U);
+
+    PIT_GetDefaultConfig(&pit_config);
+    PIT_Init(PIT, &pit_config);
+}
+
+STATIC const mp_rom_map_elem_t machine_timer_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&machine_timer_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_timer_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_timer_deinit_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_ONE_SHOT), MP_ROM_INT(TIMER_MODE_ONE_SHOT) },
+    { MP_ROM_QSTR(MP_QSTR_PERIODIC), MP_ROM_INT(TIMER_MODE_PERIODIC) },
+};
+STATIC MP_DEFINE_CONST_DICT(machine_timer_locals_dict, machine_timer_locals_dict_table);
+
+const mp_obj_type_t machine_timer_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Timer,
+    .print = machine_timer_print,
+    .make_new = machine_timer_make_new,
+    .locals_dict = (mp_obj_dict_t *)&machine_timer_locals_dict,
+};
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index 1bb6b6a352..75fe1cd20f 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -29,6 +29,7 @@
 #include "extmod/machine_mem.h"
 #include "led.h"
 #include "pin.h"
+#include "modmachine.h"
 
 #include CPU_HEADER_H
 
@@ -54,6 +55,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_LED),                 MP_ROM_PTR(&machine_led_type) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
+    { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
 
diff --git a/ports/mimxrt/modmachine.h b/ports/mimxrt/modmachine.h
new file mode 100644
index 0000000000..8741e20587
--- /dev/null
+++ b/ports/mimxrt/modmachine.h
@@ -0,0 +1,36 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ * Copyright (c) 2021 Robert Hammelrath
+ *
+ * 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_MIMXRT_MODMACHINE_H
+#define MICROPY_INCLUDED_MIMXRT_MODMACHINE_H
+
+#include "py/obj.h"
+
+extern const mp_obj_type_t machine_timer_type;
+
+void machine_timer_init_PIT(void);
+
+#endif // MICROPY_INCLUDED_MIMXRT_MODMACHINE_H
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index db1944a9b8..e02de87bad 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -53,6 +53,8 @@
 #define MICROPY_MODULE_BUILTIN_INIT         (1)
 #define MICROPY_MODULE_WEAK_LINKS           (1)
 #define MICROPY_CAN_OVERRIDE_BUILTINS       (1)
+#define MICROPY_ENABLE_SCHEDULER            (1)
+#define MICROPY_SCHEDULER_DEPTH             (8)
 #define MICROPY_VFS                         (1)
 #define MICROPY_MODULE_FROZEN_MPY           (1)
 #define MICROPY_QSTR_EXTRA_POOL             mp_qstr_frozen_const_pool
@@ -109,8 +111,11 @@ extern const struct _mp_obj_module_t mp_module_utime;
     { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
     { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
 
+#define MICROPY_HW_PIT_NUM_CHANNELS 3
+
 #define MICROPY_PORT_ROOT_POINTERS \
-    const char *readline_hist[8];
+    const char *readline_hist[8]; \
+    struct _machine_timer_obj_t *timer_table[MICROPY_HW_PIT_NUM_CHANNELS];
 
 #define MP_STATE_PORT MP_STATE_VM
 

From e09a771ab22752982c45007105d6cb98b987c3f1 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Mon, 24 May 2021 22:32:57 +0200
Subject: [PATCH 181/349] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/
---
 locale/ID.po             |  8 ++++----
 locale/cs.po             |  8 ++++----
 locale/de_DE.po          |  8 ++++----
 locale/el.po             |  8 ++++----
 locale/en_GB.po          |  8 ++++----
 locale/es.po             | 11 +++++++----
 locale/fil.po            |  8 ++++----
 locale/fr.po             |  8 ++++----
 locale/hi.po             |  8 ++++----
 locale/it_IT.po          |  8 ++++----
 locale/ja.po             |  8 ++++----
 locale/ko.po             |  8 ++++----
 locale/nl.po             |  8 ++++----
 locale/pl.po             |  8 ++++----
 locale/pt_BR.po          | 11 +++++++----
 locale/sv.po             | 11 +++++++----
 locale/zh_Latn_pinyin.po |  8 ++++----
 17 files changed, 77 insertions(+), 68 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index be0217bf96..f0e702b7f0 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -1695,6 +1695,10 @@ msgstr ""
 msgid "Only edge detection is available on this hardware"
 msgstr ""
 
+#: shared-bindings/ipaddress/__init__.c
+msgid "Only int or string supported for ip"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 #, c-format
 msgid ""
@@ -1718,10 +1722,6 @@ msgstr ""
 msgid "Only one color can be transparent at a time"
 msgstr ""
 
-#: shared-bindings/ipaddress/__init__.c
-msgid "Only raw int or string supported for ip"
-msgstr ""
-
 #: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
 msgid "Operation or feature not supported"
 msgstr ""
diff --git a/locale/cs.po b/locale/cs.po
index de6f46f646..aebc210b81 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -1675,6 +1675,10 @@ msgstr ""
 msgid "Only edge detection is available on this hardware"
 msgstr ""
 
+#: shared-bindings/ipaddress/__init__.c
+msgid "Only int or string supported for ip"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 #, c-format
 msgid ""
@@ -1696,10 +1700,6 @@ msgstr ""
 msgid "Only one color can be transparent at a time"
 msgstr ""
 
-#: shared-bindings/ipaddress/__init__.c
-msgid "Only raw int or string supported for ip"
-msgstr ""
-
 #: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
 msgid "Operation or feature not supported"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index aff8c71509..12a9112722 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -1697,6 +1697,10 @@ msgstr ""
 msgid "Only edge detection is available on this hardware"
 msgstr ""
 
+#: shared-bindings/ipaddress/__init__.c
+msgid "Only int or string supported for ip"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 #, c-format
 msgid ""
@@ -1720,10 +1724,6 @@ msgstr ""
 msgid "Only one color can be transparent at a time"
 msgstr ""
 
-#: shared-bindings/ipaddress/__init__.c
-msgid "Only raw int or string supported for ip"
-msgstr ""
-
 #: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
 msgid "Operation or feature not supported"
 msgstr ""
diff --git a/locale/el.po b/locale/el.po
index f933431230..3430bb0078 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -1672,6 +1672,10 @@ msgstr ""
 msgid "Only edge detection is available on this hardware"
 msgstr ""
 
+#: shared-bindings/ipaddress/__init__.c
+msgid "Only int or string supported for ip"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 #, c-format
 msgid ""
@@ -1693,10 +1697,6 @@ msgstr ""
 msgid "Only one color can be transparent at a time"
 msgstr ""
 
-#: shared-bindings/ipaddress/__init__.c
-msgid "Only raw int or string supported for ip"
-msgstr ""
-
 #: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
 msgid "Operation or feature not supported"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 0e28dad664..0b9eb660c3 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -1689,6 +1689,10 @@ msgstr ""
 msgid "Only edge detection is available on this hardware"
 msgstr ""
 
+#: shared-bindings/ipaddress/__init__.c
+msgid "Only int or string supported for ip"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 #, c-format
 msgid ""
@@ -1712,10 +1716,6 @@ msgstr "Only one alarm.time alarm can be set."
 msgid "Only one color can be transparent at a time"
 msgstr "Only one colour can be transparent at a time"
 
-#: shared-bindings/ipaddress/__init__.c
-msgid "Only raw int or string supported for ip"
-msgstr ""
-
 #: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
 msgid "Operation or feature not supported"
 msgstr "Operation or feature not supported"
diff --git a/locale/es.po b/locale/es.po
index 7f0fe6f404..e3afeae954 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -1713,6 +1713,10 @@ msgstr ""
 msgid "Only edge detection is available on this hardware"
 msgstr "Este hardware solo tiene capacidad para detección de borde"
 
+#: shared-bindings/ipaddress/__init__.c
+msgid "Only int or string supported for ip"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 #, c-format
 msgid ""
@@ -1736,10 +1740,6 @@ msgstr "Solamente una alarm.time puede ser configurada."
 msgid "Only one color can be transparent at a time"
 msgstr "Solo un color puede ser transparente a la vez"
 
-#: shared-bindings/ipaddress/__init__.c
-msgid "Only raw int or string supported for ip"
-msgstr "Para ip solo puede con un entero o una cadena"
-
 #: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
 msgid "Operation or feature not supported"
 msgstr "Operación no característica no soportada"
@@ -4448,6 +4448,9 @@ msgstr "zi debe ser de tipo flotante"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi debe ser una forma (n_section,2)"
 
+#~ msgid "Only raw int or string supported for ip"
+#~ msgstr "Para ip solo puede con un entero o una cadena"
+
 #~ msgid "Only raw int supported for ip"
 #~ msgstr "Solo se aceptan enteros crudos para ip"
 
diff --git a/locale/fil.po b/locale/fil.po
index f9d4beada0..ca689b783e 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -1690,6 +1690,10 @@ msgstr ""
 msgid "Only edge detection is available on this hardware"
 msgstr ""
 
+#: shared-bindings/ipaddress/__init__.c
+msgid "Only int or string supported for ip"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 #, c-format
 msgid ""
@@ -1711,10 +1715,6 @@ msgstr ""
 msgid "Only one color can be transparent at a time"
 msgstr ""
 
-#: shared-bindings/ipaddress/__init__.c
-msgid "Only raw int or string supported for ip"
-msgstr ""
-
 #: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
 msgid "Operation or feature not supported"
 msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index c70841c30a..a55d920693 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -1721,6 +1721,10 @@ msgstr ""
 msgid "Only edge detection is available on this hardware"
 msgstr ""
 
+#: shared-bindings/ipaddress/__init__.c
+msgid "Only int or string supported for ip"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 #, c-format
 msgid ""
@@ -1744,10 +1748,6 @@ msgstr "Seulement une alarme alarm.time peut être réglée."
 msgid "Only one color can be transparent at a time"
 msgstr "Une seule couleur peut être transparente à la fois"
 
-#: shared-bindings/ipaddress/__init__.c
-msgid "Only raw int or string supported for ip"
-msgstr ""
-
 #: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
 msgid "Operation or feature not supported"
 msgstr "Opération ou fonction non supportée"
diff --git a/locale/hi.po b/locale/hi.po
index 7dd917e051..ecb7d2d8cc 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -1672,6 +1672,10 @@ msgstr ""
 msgid "Only edge detection is available on this hardware"
 msgstr ""
 
+#: shared-bindings/ipaddress/__init__.c
+msgid "Only int or string supported for ip"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 #, c-format
 msgid ""
@@ -1693,10 +1697,6 @@ msgstr ""
 msgid "Only one color can be transparent at a time"
 msgstr ""
 
-#: shared-bindings/ipaddress/__init__.c
-msgid "Only raw int or string supported for ip"
-msgstr ""
-
 #: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
 msgid "Operation or feature not supported"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 1cfd7b4063..4b58d8d02e 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -1704,6 +1704,10 @@ msgstr ""
 msgid "Only edge detection is available on this hardware"
 msgstr ""
 
+#: shared-bindings/ipaddress/__init__.c
+msgid "Only int or string supported for ip"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 #, c-format
 msgid ""
@@ -1725,10 +1729,6 @@ msgstr ""
 msgid "Only one color can be transparent at a time"
 msgstr ""
 
-#: shared-bindings/ipaddress/__init__.c
-msgid "Only raw int or string supported for ip"
-msgstr ""
-
 #: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
 msgid "Operation or feature not supported"
 msgstr ""
diff --git a/locale/ja.po b/locale/ja.po
index 0470193ef3..aa9b79ea5b 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -1685,6 +1685,10 @@ msgstr ""
 msgid "Only edge detection is available on this hardware"
 msgstr ""
 
+#: shared-bindings/ipaddress/__init__.c
+msgid "Only int or string supported for ip"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 #, c-format
 msgid ""
@@ -1706,10 +1710,6 @@ msgstr ""
 msgid "Only one color can be transparent at a time"
 msgstr ""
 
-#: shared-bindings/ipaddress/__init__.c
-msgid "Only raw int or string supported for ip"
-msgstr ""
-
 #: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
 msgid "Operation or feature not supported"
 msgstr ""
diff --git a/locale/ko.po b/locale/ko.po
index f2091b7fa7..82d4928e9f 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -1675,6 +1675,10 @@ msgstr ""
 msgid "Only edge detection is available on this hardware"
 msgstr ""
 
+#: shared-bindings/ipaddress/__init__.c
+msgid "Only int or string supported for ip"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 #, c-format
 msgid ""
@@ -1696,10 +1700,6 @@ msgstr ""
 msgid "Only one color can be transparent at a time"
 msgstr ""
 
-#: shared-bindings/ipaddress/__init__.c
-msgid "Only raw int or string supported for ip"
-msgstr ""
-
 #: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
 msgid "Operation or feature not supported"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index df9dc35e11..8ba8094d45 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -1688,6 +1688,10 @@ msgstr ""
 msgid "Only edge detection is available on this hardware"
 msgstr ""
 
+#: shared-bindings/ipaddress/__init__.c
+msgid "Only int or string supported for ip"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 #, c-format
 msgid ""
@@ -1711,10 +1715,6 @@ msgstr "Slechts één alarm.time alarm kan worden ingesteld."
 msgid "Only one color can be transparent at a time"
 msgstr "Er kan maar één kleur per keer transparant zijn"
 
-#: shared-bindings/ipaddress/__init__.c
-msgid "Only raw int or string supported for ip"
-msgstr ""
-
 #: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
 msgid "Operation or feature not supported"
 msgstr ""
diff --git a/locale/pl.po b/locale/pl.po
index f23aff57e0..5497efcba3 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -1683,6 +1683,10 @@ msgstr "Wspierane są tylko nieskompresowane pliki BMP: wielkość nagłówka %d
 msgid "Only edge detection is available on this hardware"
 msgstr ""
 
+#: shared-bindings/ipaddress/__init__.c
+msgid "Only int or string supported for ip"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 #, c-format
 msgid ""
@@ -1704,10 +1708,6 @@ msgstr ""
 msgid "Only one color can be transparent at a time"
 msgstr "W danym momencie przezroczysty może być tylko jeden kolor"
 
-#: shared-bindings/ipaddress/__init__.c
-msgid "Only raw int or string supported for ip"
-msgstr ""
-
 #: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
 msgid "Operation or feature not supported"
 msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 5f1fb323c7..e233ef3479 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -1711,6 +1711,10 @@ msgstr ""
 msgid "Only edge detection is available on this hardware"
 msgstr "Apenas a detecção de borda está disponível neste hardware"
 
+#: shared-bindings/ipaddress/__init__.c
+msgid "Only int or string supported for ip"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 #, c-format
 msgid ""
@@ -1734,10 +1738,6 @@ msgstr "Apenas um alarme alarm.time pode ser definido."
 msgid "Only one color can be transparent at a time"
 msgstr "Apenas uma cor pode ser transparente de cada vez"
 
-#: shared-bindings/ipaddress/__init__.c
-msgid "Only raw int or string supported for ip"
-msgstr "Apenas int ou string bruto é compatível para o ip"
-
 #: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
 msgid "Operation or feature not supported"
 msgstr "A operação ou o recurso não é suportado"
@@ -4458,6 +4458,9 @@ msgstr "zi deve ser de um tipo float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi deve estar na forma (n_section, 2)"
 
+#~ msgid "Only raw int or string supported for ip"
+#~ msgstr "Apenas int ou string bruto é compatível para o ip"
+
 #~ msgid "Only raw int supported for ip"
 #~ msgstr "Apenas o int bruto é compatível para o ip"
 
diff --git a/locale/sv.po b/locale/sv.po
index fade5b27a0..a228a6cf11 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -1695,6 +1695,10 @@ msgstr ""
 msgid "Only edge detection is available on this hardware"
 msgstr "Endast kantdetektering är tillgänglig för denna hårdvara"
 
+#: shared-bindings/ipaddress/__init__.c
+msgid "Only int or string supported for ip"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 #, c-format
 msgid ""
@@ -1718,10 +1722,6 @@ msgstr "Endast ett alarm.time kan ställas in."
 msgid "Only one color can be transparent at a time"
 msgstr "Bara en färg kan vara genomskinlig i taget"
 
-#: shared-bindings/ipaddress/__init__.c
-msgid "Only raw int or string supported for ip"
-msgstr "Enbart int eller string stöds för ip"
-
 #: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
 msgid "Operation or feature not supported"
 msgstr "Operation eller funktion stöds inte"
@@ -4417,6 +4417,9 @@ msgstr "zi måste vara av typ float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi måste vara i formen (n_section, 2)"
 
+#~ msgid "Only raw int or string supported for ip"
+#~ msgstr "Enbart int eller string stöds för ip"
+
 #~ msgid "Only raw int supported for ip"
 #~ msgstr "Endast raw int stöds för ip"
 
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 39a40c077d..1ed603ae85 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -1698,6 +1698,10 @@ msgstr ""
 msgid "Only edge detection is available on this hardware"
 msgstr "cǐ yìng jiàn shàng jǐn tí gòng biān yuán jiǎn cè"
 
+#: shared-bindings/ipaddress/__init__.c
+msgid "Only int or string supported for ip"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 #, c-format
 msgid ""
@@ -1721,10 +1725,6 @@ msgstr "zhǐ néng shè zhì yí gè bào jǐng."
 msgid "Only one color can be transparent at a time"
 msgstr "Yīcì zhǐ néng yǒuyī zhǒng yánsè shì tòumíng de"
 
-#: shared-bindings/ipaddress/__init__.c
-msgid "Only raw int or string supported for ip"
-msgstr ""
-
 #: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
 msgid "Operation or feature not supported"
 msgstr "bù zhī chí cāo zuò huò gōng néng"

From b8132c5c07e19b1b2227a9f0e6c564eef9cbc9a5 Mon Sep 17 00:00:00 2001
From: Jose David M <jquintana202020@gmail.com>
Date: Mon, 24 May 2021 20:53:55 +0000
Subject: [PATCH 182/349] Translated using Weblate (Spanish)

Currently translated at 100.0% (993 of 993 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/es/
---
 locale/es.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/locale/es.po b/locale/es.po
index e3afeae954..fb4c3f5e96 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2021-05-22 17:58+0000\n"
-"Last-Translator: Alvaro Figueroa <alvaro@greencore.co.cr>\n"
+"PO-Revision-Date: 2021-05-24 21:25+0000\n"
+"Last-Translator: Jose David M <jquintana202020@gmail.com>\n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -1715,7 +1715,7 @@ msgstr "Este hardware solo tiene capacidad para detección de borde"
 
 #: shared-bindings/ipaddress/__init__.c
 msgid "Only int or string supported for ip"
-msgstr ""
+msgstr "Solamente int or string son permitados para una ip"
 
 #: shared-module/displayio/OnDiskBitmap.c
 #, c-format

From 3b11e6f194d758f10dd7b9fb52d29554182d2c75 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl <jonny@bergdahl.it>
Date: Mon, 24 May 2021 20:44:15 +0000
Subject: [PATCH 183/349] Translated using Weblate (Swedish)

Currently translated at 100.0% (993 of 993 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/sv/
---
 locale/sv.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locale/sv.po b/locale/sv.po
index a228a6cf11..f38f7240af 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2021-05-22 17:58+0000\n"
+"PO-Revision-Date: 2021-05-24 21:25+0000\n"
 "Last-Translator: Jonny Bergdahl <jonny@bergdahl.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: sv\n"
@@ -1697,7 +1697,7 @@ msgstr "Endast kantdetektering är tillgänglig för denna hårdvara"
 
 #: shared-bindings/ipaddress/__init__.c
 msgid "Only int or string supported for ip"
-msgstr ""
+msgstr "Endast int eller string stöds för ip"
 
 #: shared-module/displayio/OnDiskBitmap.c
 #, c-format

From dd3e129802783db3697724e627cf2327eaba2be4 Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura <wellingtonuemura@gmail.com>
Date: Tue, 25 May 2021 12:30:27 +0000
Subject: [PATCH 184/349] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (993 of 993 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/pt_BR/
---
 locale/pt_BR.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index e233ef3479..14baa40edf 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2021-05-22 17:58+0000\n"
+"PO-Revision-Date: 2021-05-25 17:41+0000\n"
 "Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -1713,7 +1713,7 @@ msgstr "Apenas a detecção de borda está disponível neste hardware"
 
 #: shared-bindings/ipaddress/__init__.c
 msgid "Only int or string supported for ip"
-msgstr ""
+msgstr "Apenas int ou string é suportado para ip"
 
 #: shared-module/displayio/OnDiskBitmap.c
 #, c-format

From a7ce8439207540c4e219a581bd0190e5b34cb73c Mon Sep 17 00:00:00 2001
From: hexthat <hexthat@gmail.com>
Date: Mon, 24 May 2021 22:05:13 +0000
Subject: [PATCH 185/349] Translated using Weblate (Chinese (Pinyin))

Currently translated at 100.0% (993 of 993 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/zh_Latn/
---
 locale/zh_Latn_pinyin.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 1ed603ae85..0f54ddec98 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: circuitpython-cn\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2021-05-21 17:47+0000\n"
+"PO-Revision-Date: 2021-05-25 17:41+0000\n"
 "Last-Translator: hexthat <hexthat@gmail.com>\n"
 "Language-Team: Chinese Hanyu Pinyin\n"
 "Language: zh_Latn_pinyin\n"
@@ -1700,7 +1700,7 @@ msgstr "cǐ yìng jiàn shàng jǐn tí gòng biān yuán jiǎn cè"
 
 #: shared-bindings/ipaddress/__init__.c
 msgid "Only int or string supported for ip"
-msgstr ""
+msgstr "jǐn zhī chí IP de zhěng shù huò zì fú chuàn"
 
 #: shared-module/displayio/OnDiskBitmap.c
 #, c-format

From 51fc9027eb9c1f5365450f86b72ebc02e6180204 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Wed, 26 May 2021 16:01:17 -0400
Subject: [PATCH 186/349] Remove non-product Adafruit boards

---
 .github/workflows/build.yml                   |   3 -
 ports/atmel-samd/boards/pirkey_m0/board.c     |  37 ------
 .../boards/pirkey_m0/mpconfigboard.h          |  58 ----------
 .../boards/pirkey_m0/mpconfigboard.mk         |  28 -----
 ports/atmel-samd/boards/pirkey_m0/pins.c      |  11 --
 .../atmel-samd/boards/pybadge_airlift/board.c | 105 ------------------
 .../boards/pybadge_airlift/mpconfigboard.h    |  26 -----
 .../boards/pybadge_airlift/mpconfigboard.mk   |  17 ---
 .../atmel-samd/boards/pybadge_airlift/pins.c  |  75 -------------
 .../atmel-samd/boards/pygamer_advance/board.c | 105 ------------------
 .../boards/pygamer_advance/mpconfigboard.h    |  28 -----
 .../boards/pygamer_advance/mpconfigboard.mk   |  17 ---
 .../atmel-samd/boards/pygamer_advance/pins.c  |  77 -------------
 13 files changed, 587 deletions(-)
 delete mode 100644 ports/atmel-samd/boards/pirkey_m0/board.c
 delete mode 100644 ports/atmel-samd/boards/pirkey_m0/mpconfigboard.h
 delete mode 100644 ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk
 delete mode 100644 ports/atmel-samd/boards/pirkey_m0/pins.c
 delete mode 100644 ports/atmel-samd/boards/pybadge_airlift/board.c
 delete mode 100644 ports/atmel-samd/boards/pybadge_airlift/mpconfigboard.h
 delete mode 100644 ports/atmel-samd/boards/pybadge_airlift/mpconfigboard.mk
 delete mode 100644 ports/atmel-samd/boards/pybadge_airlift/pins.c
 delete mode 100644 ports/atmel-samd/boards/pygamer_advance/board.c
 delete mode 100644 ports/atmel-samd/boards/pygamer_advance/mpconfigboard.h
 delete mode 100644 ports/atmel-samd/boards/pygamer_advance/mpconfigboard.mk
 delete mode 100644 ports/atmel-samd/boards/pygamer_advance/pins.c

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 165bb43e23..0b23f4538e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -295,16 +295,13 @@ jobs:
         - "pimoroni_picolipo_4mb"
         - "pimoroni_picosystem"
         - "pimoroni_tiny2040"
-        - "pirkey_m0"
         - "pitaya_go"
         - "pyb_nano_v2"
         - "pybadge"
-        - "pybadge_airlift"
         - "pyboard_v11"
         - "pycubed"
         - "pycubed_mram"
         - "pygamer"
-        - "pygamer_advance"
         - "pyportal"
         - "pyportal_titano"
         - "pyruler"
diff --git a/ports/atmel-samd/boards/pirkey_m0/board.c b/ports/atmel-samd/boards/pirkey_m0/board.c
deleted file mode 100644
index 84960e73cf..0000000000
--- a/ports/atmel-samd/boards/pirkey_m0/board.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2017 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 "supervisor/board.h"
-
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
diff --git a/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.h b/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.h
deleted file mode 100644
index 866e21991b..0000000000
--- a/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#define MICROPY_HW_BOARD_NAME "Adafruit pIRKey M0"
-#define MICROPY_HW_MCU_NAME "samd21e18"
-
-#define MICROPY_HW_APA102_MOSI   (&pin_PA00)
-#define MICROPY_HW_APA102_SCK    (&pin_PA01)
-
-#define MICROPY_PORT_A        (PORT_PA00 | PORT_PA01 | PORT_PA24 | PORT_PA25)
-#define MICROPY_PORT_B        (0)
-#define MICROPY_PORT_C        (0)
-
-#define IGNORE_PIN_PA02     1
-#define IGNORE_PIN_PA03     1
-#define IGNORE_PIN_PA04     1
-#define IGNORE_PIN_PA05     1
-#define IGNORE_PIN_PA06     1
-#define IGNORE_PIN_PA07     1
-#define IGNORE_PIN_PA08     1
-#define IGNORE_PIN_PA09     1
-#define IGNORE_PIN_PA10     1
-#define IGNORE_PIN_PA11     1
-#define IGNORE_PIN_PA12     1
-#define IGNORE_PIN_PA13     1
-#define IGNORE_PIN_PA14     1
-#define IGNORE_PIN_PA15     1
-#define IGNORE_PIN_PA16     1
-#define IGNORE_PIN_PA17     1
-#define IGNORE_PIN_PA18     1
-#define IGNORE_PIN_PA19     1
-#define IGNORE_PIN_PA20     1
-#define IGNORE_PIN_PA21     1
-#define IGNORE_PIN_PA22     1
-#define IGNORE_PIN_PA24     1
-#define IGNORE_PIN_PA25     1
-#define IGNORE_PIN_PA27     1
-#define IGNORE_PIN_PA30     1
-#define IGNORE_PIN_PA31     1
-#define IGNORE_PIN_PB00     1
-#define IGNORE_PIN_PB01     1
-#define IGNORE_PIN_PB02     1
-#define IGNORE_PIN_PB03     1
-#define IGNORE_PIN_PB04     1
-#define IGNORE_PIN_PB05     1
-#define IGNORE_PIN_PB06     1
-#define IGNORE_PIN_PB07     1
-#define IGNORE_PIN_PB08     1
-#define IGNORE_PIN_PB09     1
-#define IGNORE_PIN_PB10     1
-#define IGNORE_PIN_PB11     1
-#define IGNORE_PIN_PB12     1
-#define IGNORE_PIN_PB13     1
-#define IGNORE_PIN_PB14     1
-#define IGNORE_PIN_PB15     1
-#define IGNORE_PIN_PB16     1
-#define IGNORE_PIN_PB17     1
-#define IGNORE_PIN_PB22     1
-#define IGNORE_PIN_PB23     1
-#define IGNORE_PIN_PB30     1
-#define IGNORE_PIN_PB31     1
diff --git a/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk b/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk
deleted file mode 100644
index ebbd1b601b..0000000000
--- a/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-USB_VID = 0x239A
-USB_PID = 0x8028
-USB_PRODUCT = "pIRKey M0"
-USB_MANUFACTURER = "Adafruit Industries LLC"
-
-CHIP_VARIANT = SAMD21E18A
-CHIP_FAMILY = samd21
-
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = NONE
-CIRCUITPY_FULL_BUILD = 0
-
-# A number of modules are removed for pIRKey to make room for frozen libraries.
-# Many I/O functions are not available.
-# math is very large and is also removed.
-CIRCUITPY_ANALOGIO = 0
-CIRCUITPY_MATH = 0
-CIRCUITPY_NEOPIXEL_WRITE = 0
-CIRCUITPY_PULSEIO = 1
-CIRCUITPY_ROTARYIO = 0
-CIRCUITPY_RTC = 0
-CIRCUITPY_USB_MIDI = 1
-CIRCUITPY_TOUCHIO = 0
-
-# Include these Python libraries in firmware.
-# FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_IRRemote
diff --git a/ports/atmel-samd/boards/pirkey_m0/pins.c b/ports/atmel-samd/boards/pirkey_m0/pins.c
deleted file mode 100644
index 74e135827e..0000000000
--- a/ports/atmel-samd/boards/pirkey_m0/pins.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "shared-bindings/board/__init__.h"
-
-STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_REMOTEIN),   MP_ROM_PTR(&pin_PA28) },
-
-    { MP_ROM_QSTR(MP_QSTR_APA102_MOSI), MP_ROM_PTR(&pin_PA00) },
-    { MP_ROM_QSTR(MP_QSTR_DOTSTAR_DATA), MP_ROM_PTR(&pin_PA00) },
-    { MP_ROM_QSTR(MP_QSTR_APA102_SCK),  MP_ROM_PTR(&pin_PA01) },
-    { MP_ROM_QSTR(MP_QSTR_DOTSTAR_CLOCK),  MP_ROM_PTR(&pin_PA01) },
-};
-MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
diff --git a/ports/atmel-samd/boards/pybadge_airlift/board.c b/ports/atmel-samd/boards/pybadge_airlift/board.c
deleted file mode 100644
index fe3549a64a..0000000000
--- a/ports/atmel-samd/boards/pybadge_airlift/board.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2017 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 "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "hal/include/hal_gpio.h"
-#include "shared-bindings/busio/SPI.h"
-#include "shared-bindings/displayio/FourWire.h"
-#include "shared-module/displayio/__init__.h"
-#include "shared-module/displayio/mipi_constants.h"
-#include "supervisor/shared/board.h"
-
-displayio_fourwire_obj_t board_display_obj;
-
-#define DELAY 0x80
-
-uint8_t display_init_sequence[] = {
-    0x01, 0 | DELAY, 150, // SWRESET
-    0x11, 0 | DELAY, 255, // SLPOUT
-    0x36, 1, 0x08,        // _MADCTL bottom to top refresh in vsync aligned order.
-    0x3a, 1, 0x55,        // COLMOD - 16bit color
-    0x21, 0 | DELAY, 10,  // _INVON
-    0x13, 0 | DELAY, 10,  // _NORON
-    0x29, 0 | DELAY, 255, // _DISPON
-};
-
-void board_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_PB13, &pin_PB15, NULL);
-    common_hal_busio_spi_never_reset(spi);
-
-    displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
-    bus->base.type = &displayio_fourwire_type;
-    common_hal_displayio_fourwire_construct(bus,
-        spi,
-        &pin_PB05, // TFT_DC Command or data
-        &pin_PB06, // TFT_CS Chip select
-        &pin_PB07, // TFT_RST Reset
-        60000000, // Baudrate
-        0, // Polarity
-        0); // Phase
-
-    displayio_display_obj_t *display = &displays[0].display;
-    display->base.type = &displayio_display_type;
-    common_hal_displayio_display_construct(display,
-        bus,
-        320, // Width (after rotation)
-        240, // Height (after rotation)
-        0, // column start
-        0, // row start
-        90, // rotation
-        16, // Color depth
-        false, // grayscale
-        false, // pixels in byte share row. Only used for depth < 8
-        1, // bytes per cell. Only valid for depths < 8
-        false, // reverse_pixels_in_byte. Only valid for depths < 8
-        true, // reverse_pixels_in_word
-        MIPI_COMMAND_SET_COLUMN_ADDRESS, // Set column command
-        MIPI_COMMAND_SET_PAGE_ADDRESS, // Set row command
-        MIPI_COMMAND_WRITE_MEMORY_START, // Write memory command
-        0x37, // set vertical scroll command
-        display_init_sequence,
-        sizeof(display_init_sequence),
-        &pin_PA01,  // backlight pin
-        NO_BRIGHTNESS_COMMAND,
-        1.0f, // brightness (ignored)
-        true, // auto_brightness
-        false, // single_byte_bounds
-        false, // data_as_commands
-        true, // auto_refresh
-        60, // native_frames_per_second
-        true, // backlight_on_high
-        false); // SH1107_addressing
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-    board_reset_user_neopixels(&pin_PA15, 5);
-}
diff --git a/ports/atmel-samd/boards/pybadge_airlift/mpconfigboard.h b/ports/atmel-samd/boards/pybadge_airlift/mpconfigboard.h
deleted file mode 100644
index 921669d8cb..0000000000
--- a/ports/atmel-samd/boards/pybadge_airlift/mpconfigboard.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#define MICROPY_HW_BOARD_NAME "Adafruit Pybadge Airlift"
-#define MICROPY_HW_MCU_NAME "samd51j20"
-
-#define CIRCUITPY_MCU_FAMILY samd51
-
-// This is for Rev B
-#define MICROPY_HW_LED_STATUS   (&pin_PA23)
-
-// These are pins not to reset.
-// QSPI Data pins
-#define MICROPY_PORT_A (PORT_PA08 | PORT_PA09 | PORT_PA10 | PORT_PA11)
-// DotStar pins, QSPI CS, and QSPI SCK
-#define MICROPY_PORT_B (PORT_PB10 | PORT_PB11)
-#define MICROPY_PORT_C (0)
-#define MICROPY_PORT_D (0)
-
-#define DEFAULT_I2C_BUS_SCL (&pin_PA13)
-#define DEFAULT_I2C_BUS_SDA (&pin_PA12)
-
-#define DEFAULT_SPI_BUS_SCK (&pin_PA17)
-#define DEFAULT_SPI_BUS_MOSI (&pin_PB23)
-#define DEFAULT_SPI_BUS_MISO (&pin_PB22)
-
-// USB is always used internally so skip the pin objects for it.
-#define IGNORE_PIN_PA24     1
-#define IGNORE_PIN_PA25     1
diff --git a/ports/atmel-samd/boards/pybadge_airlift/mpconfigboard.mk b/ports/atmel-samd/boards/pybadge_airlift/mpconfigboard.mk
deleted file mode 100644
index a88e5e5e5b..0000000000
--- a/ports/atmel-samd/boards/pybadge_airlift/mpconfigboard.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-USB_VID = 0x239A
-USB_PID = 0x8043
-USB_PRODUCT = "PyBadge AirLift"
-USB_MANUFACTURER = "Adafruit Industries LLC"
-
-CHIP_VARIANT = SAMD51J20A
-CHIP_FAMILY = samd51
-
-QSPI_FLASH_FILESYSTEM = 1
-EXTERNAL_FLASH_DEVICES = GD25Q16C
-LONGINT_IMPL = MPZ
-
-CIRCUITPY_GAMEPAD = 1
-CIRCUITPY_GAMEPADSHIFT = 1
-CIRCUITPY_STAGE = 1
-
-FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/pybadge
diff --git a/ports/atmel-samd/boards/pybadge_airlift/pins.c b/ports/atmel-samd/boards/pybadge_airlift/pins.c
deleted file mode 100644
index 1fbe63e8eb..0000000000
--- a/ports/atmel-samd/boards/pybadge_airlift/pins.c
+++ /dev/null
@@ -1,75 +0,0 @@
-#include "shared-bindings/board/__init__.h"
-
-#include "supervisor/board.h"
-#include "shared-module/displayio/__init__.h"
-
-STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
-    {MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PA05)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PB08)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PB09)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PA04)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PA06)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_PB01)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_PB04)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_PB03)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_A9), MP_ROM_PTR(&pin_PB02)},
-
-    {MP_OBJ_NEW_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PB17)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PB16)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_PB03)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_PB02)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_PA14)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PA16)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA18)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_PB14)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_PA15)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PA19)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA20)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_PA21)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA22)},
-
-    {MP_OBJ_NEW_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_PA23)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA23)},
-
-    // I2C
-    {MP_OBJ_NEW_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA12)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA13)},
-
-    // SPI
-    {MP_OBJ_NEW_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA17)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PB22)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PB23)},
-
-    // Special named pins
-    {MP_OBJ_NEW_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA15)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_LIGHT), MP_ROM_PTR(&pin_PB04)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_ACCELEROMETER_INTERRUPT), MP_ROM_PTR(&pin_PB14)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_PA02)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_SPEAKER_ENABLE), MP_ROM_PTR(&pin_PA27)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_BUTTON_LATCH), MP_ROM_PTR(&pin_PB00)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_BUTTON_OUT), MP_ROM_PTR(&pin_PB30)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_BUTTON_CLOCK), MP_ROM_PTR(&pin_PB31)},
-
-    // ESP control
-    {MP_OBJ_NEW_QSTR(MP_QSTR_ESP_CS), MP_ROM_PTR(&pin_PA14)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_ESP_GPIO0), MP_ROM_PTR(&pin_PA31)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_ESP_BUSY), MP_ROM_PTR(&pin_PA00)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_ESP_RESET), MP_ROM_PTR(&pin_PB12)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_ESP_TX), MP_ROM_PTR(&pin_PB16)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_ESP_RX), MP_ROM_PTR(&pin_PB17)},
-
-    // TFT control pins
-    {MP_OBJ_NEW_QSTR(MP_QSTR_TFT_LITE), MP_ROM_PTR(&pin_PA01)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_TFT_MOSI), MP_ROM_PTR(&pin_PB15)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_TFT_SCK), MP_ROM_PTR(&pin_PB13)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_TFT_RST), MP_ROM_PTR(&pin_PB07)},
-    {MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_PB06)},
-    {MP_ROM_QSTR(MP_QSTR_TFT_DC), MP_ROM_PTR(&pin_PB05)},
-
-    {MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj)},
-    {MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj)},
-
-    {MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)}
-};
-MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
diff --git a/ports/atmel-samd/boards/pygamer_advance/board.c b/ports/atmel-samd/boards/pygamer_advance/board.c
deleted file mode 100644
index 0711c4298a..0000000000
--- a/ports/atmel-samd/boards/pygamer_advance/board.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2019 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 "supervisor/board.h"
-#include "mpconfigboard.h"
-#include "hal/include/hal_gpio.h"
-#include "shared-bindings/busio/SPI.h"
-#include "shared-bindings/displayio/FourWire.h"
-#include "shared-module/displayio/__init__.h"
-#include "shared-module/displayio/mipi_constants.h"
-#include "supervisor/shared/board.h"
-
-displayio_fourwire_obj_t board_display_obj;
-
-#define DELAY 0x80
-
-uint8_t display_init_sequence[] = {
-    0x01, 0 | DELAY, 150, // SWRESET
-    0x11, 0 | DELAY, 255, // SLPOUT
-    0x36, 1, 0x00,        // _MADCTL bottom to top refresh in vsync aligned order.
-    0x3a, 1, 0x55, // COLMOD - 16bit color
-    0x21, 0 | DELAY, 10,                 // _INVON
-    0x13, 0 | DELAY, 10,                 // _NORON
-    0x29, 0 | DELAY, 255,                // _DISPON
-};
-
-void board_init(void) {
-    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_PB13, &pin_PB12, NULL);
-    common_hal_busio_spi_never_reset(spi);
-
-    displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
-    bus->base.type = &displayio_fourwire_type;
-    common_hal_displayio_fourwire_construct(bus,
-        spi,
-        &pin_PA00, // TFT_DC Command or data
-        &pin_PB15, // TFT_CS Chip select
-        &pin_PB05, // TFT_RST Reset
-        60000000, // Baudrate
-        0, // Polarity
-        0); // Phase
-
-    displayio_display_obj_t *display = &displays[0].display;
-    display->base.type = &displayio_display_type;
-    common_hal_displayio_display_construct(display,
-        bus,
-        320, // Width (after rotation)
-        240, // Height (after rotation)
-        0, // column start
-        0, // row start
-        90, // rotation
-        16, // Color depth
-        false, // Grayscale
-        false, // pixels in a byte share a row. Only valid for depths < 8
-        1, // bytes per cell. Only valid for depths < 8
-        false, // reverse_pixels_in_byte. Only valid for depths < 8
-        true, // reverse_pixels_in_word
-        MIPI_COMMAND_SET_COLUMN_ADDRESS, // Set column command
-        MIPI_COMMAND_SET_PAGE_ADDRESS, // Set row command
-        MIPI_COMMAND_WRITE_MEMORY_START, // Write memory command
-        0x37, // set vertical scroll command
-        display_init_sequence,
-        sizeof(display_init_sequence),
-        &pin_PA01,  // backlight pin
-        NO_BRIGHTNESS_COMMAND,
-        1.0f, // brightness (ignored)
-        true, // auto_brightness
-        false, // single_byte_bounds
-        false, // data_as_commands
-        true, // auto_refresh
-        60, // native_frames_per_second
-        true, // backlight_on_high
-        false); // SH1107_addressing
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-    board_reset_user_neopixels(&pin_PA15, 5);
-}
diff --git a/ports/atmel-samd/boards/pygamer_advance/mpconfigboard.h b/ports/atmel-samd/boards/pygamer_advance/mpconfigboard.h
deleted file mode 100644
index fbe946b72f..0000000000
--- a/ports/atmel-samd/boards/pygamer_advance/mpconfigboard.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#define MICROPY_HW_BOARD_NAME "Adafruit PyGamer"
-#define MICROPY_HW_MCU_NAME "samd51j20"
-
-#define CIRCUITPY_MCU_FAMILY samd51
-
-#define MICROPY_HW_LED_STATUS   (&pin_PA23)
-
-// These are pins not to reset.
-// QSPI Data pins
-#define MICROPY_PORT_A (PORT_PA08 | PORT_PA09 | PORT_PA10 | PORT_PA11)
-// DotStar pins, QSPI CS, and QSPI SCK
-#define MICROPY_PORT_B (PORT_PB10 | PORT_PB11)
-#define MICROPY_PORT_C (0)
-#define MICROPY_PORT_D (0)
-
-#define DEFAULT_I2C_BUS_SCL (&pin_PA13)
-#define DEFAULT_I2C_BUS_SDA (&pin_PA12)
-
-#define DEFAULT_SPI_BUS_SCK (&pin_PA17)
-#define DEFAULT_SPI_BUS_MOSI (&pin_PB23)
-#define DEFAULT_SPI_BUS_MISO (&pin_PB22)
-
-#define DEFAULT_UART_BUS_RX (&pin_PB17)
-#define DEFAULT_UART_BUS_TX (&pin_PB16)
-
-// USB is always used internally so skip the pin objects for it.
-#define IGNORE_PIN_PA24     1
-#define IGNORE_PIN_PA25     1
diff --git a/ports/atmel-samd/boards/pygamer_advance/mpconfigboard.mk b/ports/atmel-samd/boards/pygamer_advance/mpconfigboard.mk
deleted file mode 100644
index a58e016542..0000000000
--- a/ports/atmel-samd/boards/pygamer_advance/mpconfigboard.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-USB_VID = 0x239A
-USB_PID = 0x803E
-USB_PRODUCT = "PyGamer Advance"
-USB_MANUFACTURER = "Adafruit Industries LLC"
-
-CHIP_VARIANT = SAMD51J20A
-CHIP_FAMILY = samd51
-
-QSPI_FLASH_FILESYSTEM = 1
-EXTERNAL_FLASH_DEVICES = GD25Q64C
-LONGINT_IMPL = MPZ
-
-CIRCUITPY_GAMEPAD = 1
-CIRCUITPY_GAMEPADSHIFT = 1
-CIRCUITPY_STAGE = 1
-
-FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/pybadge
diff --git a/ports/atmel-samd/boards/pygamer_advance/pins.c b/ports/atmel-samd/boards/pygamer_advance/pins.c
deleted file mode 100644
index 57a38e6947..0000000000
--- a/ports/atmel-samd/boards/pygamer_advance/pins.c
+++ /dev/null
@@ -1,77 +0,0 @@
-#include "shared-bindings/board/__init__.h"
-
-#include "supervisor/board.h"
-#include "shared-module/displayio/__init__.h"
-
-STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
-    { MP_OBJ_NEW_QSTR(MP_QSTR_A0),  MP_ROM_PTR(&pin_PA02) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_A1),  MP_ROM_PTR(&pin_PA05) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_A2),  MP_ROM_PTR(&pin_PB08) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_A3),  MP_ROM_PTR(&pin_PB09) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_A4),  MP_ROM_PTR(&pin_PA04) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_A5),  MP_ROM_PTR(&pin_PA06) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_A6),  MP_ROM_PTR(&pin_PB01) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_A7),  MP_ROM_PTR(&pin_PB04) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_A8),  MP_ROM_PTR(&pin_PB03) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_A9),  MP_ROM_PTR(&pin_PB02) },
-
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D0),  MP_ROM_PTR(&pin_PB17) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D1),  MP_ROM_PTR(&pin_PB16) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D2),  MP_ROM_PTR(&pin_PB03) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D3),  MP_ROM_PTR(&pin_PB02) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D4),  MP_ROM_PTR(&pin_PA14) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D5),  MP_ROM_PTR(&pin_PA16) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D6),  MP_ROM_PTR(&pin_PA18) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D7),  MP_ROM_PTR(&pin_PB14) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D8),  MP_ROM_PTR(&pin_PA15) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D9),  MP_ROM_PTR(&pin_PA19) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D10),  MP_ROM_PTR(&pin_PA20) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D11),  MP_ROM_PTR(&pin_PA21) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D12),  MP_ROM_PTR(&pin_PA22) },
-
-    { MP_OBJ_NEW_QSTR(MP_QSTR_LED),  MP_ROM_PTR(&pin_PA23) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D13),  MP_ROM_PTR(&pin_PA23) },
-
-    // UART
-    { MP_OBJ_NEW_QSTR(MP_QSTR_RX),  MP_ROM_PTR(&pin_PB17) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_TX),  MP_ROM_PTR(&pin_PB16) },
-
-    // I2C
-    { MP_OBJ_NEW_QSTR(MP_QSTR_SDA),  MP_ROM_PTR(&pin_PA12) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_SCL),  MP_ROM_PTR(&pin_PA13) },
-
-    // SPI
-    { MP_OBJ_NEW_QSTR(MP_QSTR_SCK),  MP_ROM_PTR(&pin_PA17) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_MISO),  MP_ROM_PTR(&pin_PB22) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_MOSI),  MP_ROM_PTR(&pin_PB23) },
-
-    // SDCS, dup of D4
-    { MP_OBJ_NEW_QSTR(MP_QSTR_SD_CS),  MP_ROM_PTR(&pin_PA14) },
-
-    // Special named pins
-    { MP_OBJ_NEW_QSTR(MP_QSTR_NEOPIXEL),  MP_ROM_PTR(&pin_PA15) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_LIGHT),  MP_ROM_PTR(&pin_PB04) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_ACCELEROMETER_INTERRUPT),  MP_ROM_PTR(&pin_PB14) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_SPEAKER),  MP_ROM_PTR(&pin_PA02) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_SPEAKER_ENABLE),  MP_ROM_PTR(&pin_PA27) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_BUTTON_LATCH),  MP_ROM_PTR(&pin_PB00) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_BUTTON_OUT),  MP_ROM_PTR(&pin_PB30) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_BUTTON_CLOCK),  MP_ROM_PTR(&pin_PB31) },
-
-    // TFT control pins
-    { MP_OBJ_NEW_QSTR(MP_QSTR_TFT_LITE),  MP_ROM_PTR(&pin_PA01) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_TFT_MOSI),  MP_ROM_PTR(&pin_PB12) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_TFT_SCK),  MP_ROM_PTR(&pin_PB13) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_TFT_RST),  MP_ROM_PTR(&pin_PB05) },
-    { MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_PB15) },
-    { MP_ROM_QSTR(MP_QSTR_TFT_DC), MP_ROM_PTR(&pin_PA00) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_JOYSTICK_X),  MP_ROM_PTR(&pin_PB07) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_JOYSTICK_Y),  MP_ROM_PTR(&pin_PB06) },
-
-    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
-    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
-    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
-
-    { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)}
-};
-MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

From 050b5f4cf098ca97bf44f4c0611ab3a873ba1e20 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Thu, 27 May 2021 21:29:38 -0400
Subject: [PATCH 187/349] fix check of usb_hid.Device out_report_length

---
 locale/circuitpython.pot         |  6 +++++-
 shared-bindings/usb_hid/Device.c | 17 +++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index eb75d2da6f..fbb6402051 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -87,6 +87,10 @@ msgstr ""
 msgid "%q list must be a list"
 msgstr ""
 
+#: shared-bindings/usb_hid/Device.c
+msgid "%q must be 0-255"
+msgstr ""
+
 #: shared-bindings/usb_hid/Device.c
 msgid "%q must be 1-255"
 msgstr ""
@@ -104,7 +108,7 @@ msgid "%q must be >= 1"
 msgstr ""
 
 #: shared-bindings/usb_hid/Device.c
-msgid "%q must be None or 1-255"
+msgid "%q must be None or between 1 and len(report_descriptor)-1"
 msgstr ""
 
 #: shared-module/vectorio/Polygon.c
diff --git a/shared-bindings/usb_hid/Device.c b/shared-bindings/usb_hid/Device.c
index 38556e5c13..64803f8e13 100644
--- a/shared-bindings/usb_hid/Device.c
+++ b/shared-bindings/usb_hid/Device.c
@@ -69,16 +69,16 @@ STATIC mp_obj_t usb_hid_device_make_new(const mp_obj_type_t *type, size_t n_args
         { MP_QSTR_usage_page, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT },
         { MP_QSTR_usage, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT },
         { MP_QSTR_in_report_length, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT },
-        { MP_QSTR_out_report_length, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_int = 0 } },
+        { MP_QSTR_out_report_length, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0 } },
         { MP_QSTR_report_id_index, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = mp_const_none } },
     };
 
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(args[ARG_report_descriptor].u_obj, &bufinfo, MP_BUFFER_READ);
-    mp_obj_t descriptor = mp_obj_new_bytearray(bufinfo.len, bufinfo.buf);
+    mp_buffer_info_t descriptor_bufinfo;
+    mp_get_buffer_raise(args[ARG_report_descriptor].u_obj, &descriptor_bufinfo, MP_BUFFER_READ);
+    mp_obj_t descriptor = mp_obj_new_bytearray(descriptor_bufinfo.len, descriptor_bufinfo.buf);
 
     const mp_int_t usage_page_arg = args[ARG_usage_page].u_int;
     if (usage_page_arg <= 0 || usage_page_arg > 255) {
@@ -99,8 +99,8 @@ STATIC mp_obj_t usb_hid_device_make_new(const mp_obj_type_t *type, size_t n_args
     const uint8_t in_report_length = in_report_length_arg;
 
     const mp_int_t out_report_length_arg = args[ARG_out_report_length].u_int;
-    if (out_report_length_arg <= 0 || out_report_length_arg > 255) {
-        mp_raise_ValueError_varg(translate("%q must be 1-255"), MP_QSTR_out_report_length);
+    if (out_report_length_arg < 0 || out_report_length_arg > 255) {
+        mp_raise_ValueError_varg(translate("%q must be 0-255"), MP_QSTR_out_report_length);
     }
     const uint8_t out_report_length = out_report_length_arg;
 
@@ -108,8 +108,9 @@ STATIC mp_obj_t usb_hid_device_make_new(const mp_obj_type_t *type, size_t n_args
     uint8_t report_id_index = 0;
     if (report_id_index_arg != mp_const_none) {
         const mp_int_t report_id_index_int = mp_obj_int_get_checked(report_id_index_arg);
-        if (report_id_index_int <= 0 || report_id_index_int > 255) {
-            mp_raise_ValueError_varg(translate("%q must be None or 1-255"), MP_QSTR_report_id_index);
+        if (report_id_index_int <= 0 || (uint32_t)report_id_index_int >= descriptor_bufinfo.len) {
+            mp_raise_ValueError_varg(translate("%q must be None or between 1 and len(report_descriptor)-1"),
+                MP_QSTR_report_id_index);
         }
         report_id_index = report_id_index_int;
     }

From 5226d6e1ee7282bf40a45708b98067446b157bce Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 1 Jun 2021 18:23:13 +0200
Subject: [PATCH 188/349] mimxrt: Remove __WFE() from MICROPY_EVENT_POLL_HOOK.

The device is unreliable with the WFE included.  This needs further
investigation.
---
 ports/mimxrt/mpconfigport.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index e02de87bad..98e01abe13 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -125,7 +125,6 @@ extern const struct _mp_obj_module_t mp_module_utime;
     do { \
         extern void mp_handle_pending(bool); \
         mp_handle_pending(true); \
-        __WFE(); \
     } while (0);
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))

From cdd95ce73705ec8dc5249a7e22092a8ce374576d Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 1 Jun 2021 20:49:22 +0200
Subject: [PATCH 189/349] mimxrt/machine_timer: Reuse any existing timer
 objects.

So there is a 1-1 mapping of hardware timer to Python object.
---
 ports/mimxrt/machine_timer.c | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/ports/mimxrt/machine_timer.c b/ports/mimxrt/machine_timer.c
index 466860583a..260873ae65 100644
--- a/ports/mimxrt/machine_timer.c
+++ b/ports/mimxrt/machine_timer.c
@@ -31,7 +31,6 @@
 #include "fsl_pit.h"
 #include "modmachine.h"
 
-#define ALARM_ID_INVALID (-1)
 #define TIMER_MODE_ONE_SHOT (0)
 #define TIMER_MODE_PERIODIC (1)
 #define TIMER_MIN_PERIOD 1
@@ -96,8 +95,6 @@ STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_ar
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    MP_STATE_PORT(timer_table)[self->id] = self;  // Insert into the table
-
     self->mode = args[ARG_mode].u_int;
     if (args[ARG_freq].u_obj != mp_const_none) {
         // Frequency specified in Hz
@@ -133,9 +130,7 @@ STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_ar
 }
 
 STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    machine_timer_obj_t *self = m_new_obj_with_finaliser(machine_timer_obj_t);
-    self->base.type = &machine_timer_type;
-    self->id = ALARM_ID_INVALID;
+    machine_timer_obj_t *self;
 
     // Get timer id in the range of 0..2
     mp_int_t id = 0;
@@ -148,6 +143,16 @@ STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args,
         mp_raise_ValueError(MP_ERROR_TEXT("Timer does not exist"));
     }
 
+    // check, if a timer exists at that channel and stop it first
+    if (MP_STATE_PORT(timer_table)[id] != NULL) {
+        PIT_StopTimer(PIT, channel_no[id]);
+        self = MP_STATE_PORT(timer_table)[id];
+    } else {
+        self = m_new_obj_with_finaliser(machine_timer_obj_t);
+        self->base.type = &machine_timer_type;
+        MP_STATE_PORT(timer_table)[id] = self;
+    }
+
     // Set initial values
     self->id = id;
     self->channel = channel_no[id];
@@ -162,6 +167,14 @@ STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args,
     return MP_OBJ_FROM_PTR(self);
 }
 
+STATIC mp_obj_t machine_timer___del__(mp_obj_t self_in) {
+    machine_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    PIT_StopTimer(PIT, self->channel);
+    MP_STATE_PORT(timer_table)[self->id] = NULL;
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_timer___del___obj, machine_timer___del__);
+
 STATIC mp_obj_t machine_timer_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     machine_timer_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     PIT_StopTimer(PIT, self->channel);
@@ -172,7 +185,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_timer_init_obj, 1, machine_timer_init)
 STATIC mp_obj_t machine_timer_deinit(mp_obj_t self_in) {
     machine_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
     PIT_StopTimer(PIT, self->channel);
-    MP_STATE_PORT(timer_table)[self->id] = NULL;
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_deinit_obj, machine_timer_deinit);
@@ -192,7 +204,7 @@ void machine_timer_init_PIT(void) {
 }
 
 STATIC const mp_rom_map_elem_t machine_timer_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&machine_timer_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&machine_timer___del___obj) },
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_timer_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_timer_deinit_obj) },
 

From d79105d7c0f68e65ff175b752d9895241e355c08 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 2 Jun 2021 09:00:05 +0200
Subject: [PATCH 190/349] mimxrt/machine_timer: Leave the Timer clock source at
 IPG clock.

Setting it to OSC_CLK interferes the utime module's functionality.  This is
still an area demanding an understanding.
---
 ports/mimxrt/machine_timer.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ports/mimxrt/machine_timer.c b/ports/mimxrt/machine_timer.c
index 260873ae65..334a020c15 100644
--- a/ports/mimxrt/machine_timer.c
+++ b/ports/mimxrt/machine_timer.c
@@ -36,7 +36,7 @@
 #define TIMER_MIN_PERIOD 1
 
 #define alarm_callback PIT_IRQHandler
-#define PIT_SOURCE_CLOCK CLOCK_GetFreq(kCLOCK_OscClk)
+#define PIT_SOURCE_CLOCK CLOCK_GetIpgFreq()
 #define PIT_IRQ_ID PIT_IRQn
 
 typedef struct _machine_timer_obj_t {
@@ -194,8 +194,6 @@ void machine_timer_init_PIT(void) {
     // PIT timer
     // Enable clock gate for GPIO1
     CLOCK_EnableClock(kCLOCK_Gpio1); // ?
-    // Set PERCLK_CLK source to OSC_CLK
-    CLOCK_SetMux(kCLOCK_PerclkMux, 1U);
     // Set PERCLK_CLK divider to 1
     CLOCK_SetDiv(kCLOCK_PerclkDiv, 0U);
 

From 2f365d234e9e985710a174c05091054c011e37d7 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 20 May 2021 16:16:25 +0200
Subject: [PATCH 191/349] mimxrt/machine_rtc: Add the RTC class to the machine
 module.

Initial version, using the LP RTC clock.  It provides setting the date and
time with rtc.init() or rtc.datetime(), and reading the date and time with
rtc.datetime() or rtc.now().  The method weekday() reports the weekday of
the current date.  It starts with 0 for Monday.

The tuple order for datetime() and now() matches the CPython sequence:
(year, month, day, hour, minute, second, microsecond, TZ).  TZ is ignored
and reported as None.  Microsecond is provided at a best effort.

If a battery is not supplied, the default boot date/time is 1970/1/1 0:0:0.
With a battery, the clock continues to run even when the board is not
powered.  The clock is quite precise.  If not, using rtc.calibration() may
help.
---
 ports/mimxrt/Makefile      |   3 +
 ports/mimxrt/machine_rtc.c | 156 +++++++++++++++++++++++++++++++++++++
 ports/mimxrt/modmachine.c  |   1 +
 ports/mimxrt/modmachine.h  |   1 +
 4 files changed, 161 insertions(+)
 create mode 100644 ports/mimxrt/machine_rtc.c

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 21eab51fe7..732485edd9 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -108,6 +108,7 @@ SRC_TINYUSB_IMX_C += \
 	$(MCU_DIR)/drivers/fsl_flexram.c \
 	$(MCU_DIR)/drivers/fsl_flexspi.c \
 	$(MCU_DIR)/drivers/fsl_pit.c \
+	$(MCU_DIR)/drivers/fsl_snvs_lp.c \
 	$(MCU_DIR)/drivers/fsl_trng.c \
 
 SRC_C = \
@@ -120,6 +121,7 @@ SRC_C = \
 	$(BOARD_DIR)/flash_config.c \
 	machine_led.c \
 	machine_pin.c \
+	machine_rtc.c \
 	machine_timer.c \
 	mimxrt_flash.c \
 	modutime.c \
@@ -146,6 +148,7 @@ SRC_S = lib/utils/gchelper_m3.s \
 SRC_QSTR += \
 	machine_led.c \
 	machine_pin.c \
+	machine_rtc.c \
 	machine_timer.c \
 	mimxrt_flash.c \
 	modutime.c \
diff --git a/ports/mimxrt/machine_rtc.c b/ports/mimxrt/machine_rtc.c
new file mode 100644
index 0000000000..949d0b51f8
--- /dev/null
+++ b/ports/mimxrt/machine_rtc.c
@@ -0,0 +1,156 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ * Copyright (c) 2021 "Robert Hammelrath" <robert@hammelrath.com>
+ *
+ * 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/runtime.h"
+#include "modmachine.h"
+#include "ticks.h"
+#include "fsl_snvs_lp.h"
+
+typedef struct _machine_rtc_obj_t {
+    mp_obj_base_t base;
+    mp_obj_t callback;
+} machine_rtc_obj_t;
+
+// Singleton RTC object.
+STATIC const machine_rtc_obj_t machine_rtc_obj = {{&machine_rtc_type}};
+
+// Calculate the weekday from the date.
+// The result is zero based with 0 = Sunday.
+// by Michael Keith and Tom Craver, 1990.
+static int calc_weekday(int y, int m, int d) {
+    return (d += m < 3 ? y-- : y - 2, 23 * m / 9 + d + 4 + y / 4 - y / 100 + y / 400) % 7;
+}
+
+STATIC mp_obj_t machine_rtc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    // Check arguments.
+    mp_arg_check_num(n_args, n_kw, 0, 0, false);
+
+    // Start up the RTC if needed.
+    SNVS_LP_SRTC_StartTimer(SNVS);
+
+    // Return constant object.
+    return (mp_obj_t)&machine_rtc_obj;
+}
+
+STATIC mp_obj_t machine_rtc_datetime_helper(size_t n_args, const mp_obj_t *args) {
+    if (n_args == 1) {
+        // Get date and time.
+        snvs_lp_srtc_datetime_t srtc_date;
+        SNVS_LP_SRTC_GetDatetime(SNVS, &srtc_date);
+
+        mp_obj_t tuple[8] = {
+            mp_obj_new_int(srtc_date.year),
+            mp_obj_new_int(srtc_date.month),
+            mp_obj_new_int(srtc_date.day),
+            mp_obj_new_int(srtc_date.hour),
+            mp_obj_new_int(srtc_date.minute),
+            mp_obj_new_int(srtc_date.second),
+            mp_obj_new_int(ticks_us64() % 1000000),
+            mp_const_none,
+        };
+        return mp_obj_new_tuple(8, tuple);
+    } else {
+        // Set date and time.
+        mp_obj_t *items;
+        mp_int_t year;
+        mp_obj_get_array_fixed_n(args[1], 8, &items);
+
+        snvs_lp_srtc_datetime_t srtc_date;
+        year = mp_obj_get_int(items[0]);
+        srtc_date.year = year >= 100 ? year : year + 2000; // allow 21 for 2021
+        srtc_date.month = mp_obj_get_int(items[1]);
+        srtc_date.day = mp_obj_get_int(items[2]);
+        srtc_date.hour = mp_obj_get_int(items[3]);
+        srtc_date.minute = mp_obj_get_int(items[4]);
+        srtc_date.second = mp_obj_get_int(items[5]);
+        if (SNVS_LP_SRTC_SetDatetime(SNVS, &srtc_date) != kStatus_Success) {
+            mp_raise_ValueError(NULL);
+        }
+
+        return mp_const_none;
+    }
+}
+
+STATIC mp_obj_t machine_rtc_datetime(mp_uint_t n_args, const mp_obj_t *args) {
+    return machine_rtc_datetime_helper(n_args, args);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_rtc_datetime_obj, 1, 2, machine_rtc_datetime);
+
+STATIC mp_obj_t machine_rtc_now(mp_obj_t self_in) {
+    return machine_rtc_datetime_helper(1, &self_in);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_rtc_now_obj, machine_rtc_now);
+
+STATIC mp_obj_t machine_rtc_init(mp_obj_t self_in, mp_obj_t date) {
+    mp_obj_t args[2] = {self_in, date};
+    machine_rtc_datetime_helper(2, args);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_rtc_init_obj, machine_rtc_init);
+
+STATIC mp_obj_t machine_rtc_weekday(mp_obj_t self_in) {
+    (void)self_in; // unused
+    int day;
+    snvs_lp_srtc_datetime_t srtc_date;
+    SNVS_LP_SRTC_GetDatetime(SNVS, &srtc_date);
+    day = calc_weekday(srtc_date.year, srtc_date.month, srtc_date.day);
+    return MP_OBJ_NEW_SMALL_INT((day + 6) % 7);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_rtc_weekday_obj, machine_rtc_weekday);
+
+// calibration(cal)
+// When the argument is a number in the range [-16 to 15], set the calibration value.
+STATIC mp_obj_t machine_rtc_calibration(mp_obj_t self_in, mp_obj_t cal_in) {
+    mp_int_t cal = 0;
+    snvs_lp_srtc_config_t snvsSrtcConfig;
+    cal = mp_obj_get_int(cal_in);
+    if (cal < -16 || cal > 15) {
+        mp_raise_ValueError(MP_ERROR_TEXT("value out of range -16 to 15"));
+    } else {
+        snvsSrtcConfig.srtcCalEnable = true;
+        snvsSrtcConfig.srtcCalValue = cal & 0x1f; // 5 bit 2's complement
+        SNVS_LP_SRTC_Init(SNVS, &snvsSrtcConfig);
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_rtc_calibration_obj, machine_rtc_calibration);
+
+STATIC const mp_rom_map_elem_t machine_rtc_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_rtc_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_datetime), MP_ROM_PTR(&machine_rtc_datetime_obj) },
+    { MP_ROM_QSTR(MP_QSTR_now), MP_ROM_PTR(&machine_rtc_now_obj) },
+    { MP_ROM_QSTR(MP_QSTR_weekday), MP_ROM_PTR(&machine_rtc_weekday_obj) },
+    { MP_ROM_QSTR(MP_QSTR_calibration), MP_ROM_PTR(&machine_rtc_calibration_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(machine_rtc_locals_dict, machine_rtc_locals_dict_table);
+
+const mp_obj_type_t machine_rtc_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_RTC,
+    .make_new = machine_rtc_make_new,
+    .locals_dict = (mp_obj_t)&machine_rtc_locals_dict,
+};
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index 75fe1cd20f..ff4ca7cf9f 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -56,6 +56,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     #endif
     { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
     { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
+    { MP_ROM_QSTR(MP_QSTR_RTC),                 MP_ROM_PTR(&machine_rtc_type) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
 
diff --git a/ports/mimxrt/modmachine.h b/ports/mimxrt/modmachine.h
index 8741e20587..d165c00e6d 100644
--- a/ports/mimxrt/modmachine.h
+++ b/ports/mimxrt/modmachine.h
@@ -30,6 +30,7 @@
 #include "py/obj.h"
 
 extern const mp_obj_type_t machine_timer_type;
+extern const mp_obj_type_t machine_rtc_type;
 
 void machine_timer_init_PIT(void);
 

From a40e1473dc5a399d2586da32c3abb96413b5463c Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 26 May 2021 11:29:34 +0200
Subject: [PATCH 192/349] mimxrt: Add floating point support.

Since not all boards support double fp, all board specific .mk files are
affected too.
---
 ports/mimxrt/Makefile                         | 109 ++++++++++++++++++
 .../boards/MIMXRT1010_EVK/mpconfigboard.mk    |   2 +
 .../boards/MIMXRT1020_EVK/mpconfigboard.mk    |   2 +
 .../boards/MIMXRT1050_EVK/mpconfigboard.mk    |   2 +
 .../boards/MIMXRT1060_EVK/mpconfigboard.mk    |   2 +
 .../boards/MIMXRT1064_EVK/mpconfigboard.mk    |   2 +
 ports/mimxrt/boards/TEENSY40/mpconfigboard.mk |   2 +
 7 files changed, 121 insertions(+)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 732485edd9..141bc2c49b 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -67,6 +67,21 @@ CFLAGS += -DXIP_EXTERNAL_FLASH=1 \
 	-DCPU_HEADER_H='<$(MCU_SERIES).h>'
 CFLAGS += $(CFLAGS_MOD) $(CFLAGS_EXTRA)
 
+# Configure floating point support
+ifeq ($(MICROPY_FLOAT_IMPL),double)
+CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_DOUBLE
+else
+ifeq ($(MICROPY_FLOAT_IMPL),none)
+CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_NONE
+else
+CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT
+CFLAGS += -fsingle-precision-constant
+endif
+endif
+
+SUPPORTS_HARDWARE_FP_SINGLE = 0
+SUPPORTS_HARDWARE_FP_DOUBLE = 0
+
 LDFLAGS = $(addprefix -T,$(LD_FILES)) -Map=$@.map --cref --print-memory-usage
 LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 
@@ -140,6 +155,99 @@ SRC_C = \
 	$(SRC_TINYUSB_C) \
 	$(SRC_TINYUSB_IMX_C) \
 
+ifeq ($(MICROPY_FLOAT_IMPL),double)
+LIBM_SRC_C += $(addprefix lib/libm_dbl/,\
+	__cos.c \
+	__expo2.c \
+	__fpclassify.c \
+	__rem_pio2.c \
+	__rem_pio2_large.c \
+	__signbit.c \
+	__sin.c \
+	__tan.c \
+	acos.c \
+	acosh.c \
+	asin.c \
+	asinh.c \
+	atan.c \
+	atan2.c \
+	atanh.c \
+	ceil.c \
+	cos.c \
+	cosh.c \
+	copysign.c \
+	erf.c \
+	exp.c \
+	expm1.c \
+	floor.c \
+	fmod.c \
+	frexp.c \
+	ldexp.c \
+	lgamma.c \
+	log.c \
+	log10.c \
+	log1p.c \
+	modf.c \
+	nearbyint.c \
+	pow.c \
+	rint.c \
+	round.c \
+	scalbn.c \
+	sin.c \
+	sinh.c \
+	tan.c \
+	tanh.c \
+	tgamma.c \
+	trunc.c \
+	)
+ifeq ($(SUPPORTS_HARDWARE_FP_DOUBLE),1)
+LIBM_SRC_C += lib/libm_dbl/thumb_vfp_sqrt.c
+else
+LIBM_SRC_C += lib/libm_dbl/sqrt.c
+endif
+else
+LIBM_SRC_C += $(addprefix lib/libm/,\
+	math.c \
+	acoshf.c \
+	asinfacosf.c \
+	asinhf.c \
+	atan2f.c \
+	atanf.c \
+	atanhf.c \
+	ef_rem_pio2.c \
+	erf_lgamma.c \
+	fmodf.c \
+	kf_cos.c \
+	kf_rem_pio2.c \
+	kf_sin.c \
+	kf_tan.c \
+	log1pf.c \
+	nearbyintf.c \
+	roundf.c \
+	sf_cos.c \
+	sf_erf.c \
+	sf_frexp.c \
+	sf_ldexp.c \
+	sf_modf.c \
+	sf_sin.c \
+	sf_tan.c \
+	wf_lgamma.c \
+	wf_tgamma.c \
+	)
+ifeq ($(SUPPORTS_HARDWARE_FP_SINGLE),1)
+LIBM_SRC_C += lib/libm/thumb_vfp_sqrtf.c
+else
+LIBM_SRC_C += lib/libm/ef_sqrt.c
+endif
+endif
+
+LIBM_O = $(addprefix $(BUILD)/, $(LIBM_SRC_C:.c=.o))
+
+# Too many warnings in libm_dbl, disable for now.
+ifeq ($(MICROPY_FLOAT_IMPL),double)
+$(LIBM_O): CFLAGS := $(filter-out -Wdouble-promotion -Wfloat-conversion, $(CFLAGS))
+endif
+
 SRC_SS = $(MCU_DIR)/gcc/startup_$(MCU_SERIES).S
 
 SRC_S = lib/utils/gchelper_m3.s \
@@ -160,6 +268,7 @@ SRC_QSTR += \
 	$(GEN_PINS_SRC) \
 
 OBJ += $(PY_O)
+OBJ += $(LIBM_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_SS:.S=.o))
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
index c5b5055324..ca8efcd5bf 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
@@ -1,6 +1,8 @@
 MCU_SERIES = MIMXRT1011
 MCU_VARIANT = MIMXRT1011DAE5A
 
+MICROPY_FLOAT_IMPL = single
+
 JLINK_PATH = /media/RT1010-EVK/
 JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
 
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
index 0f5bb967af..b0bbd705cb 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
@@ -1,6 +1,8 @@
 MCU_SERIES = MIMXRT1021
 MCU_VARIANT = MIMXRT1021DAG5A
 
+MICROPY_FLOAT_IMPL = double
+
 JLINK_PATH ?= /media/RT1020-EVK/
 JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
 
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
index 61cca4d63f..e338ec6cf8 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
@@ -1,6 +1,8 @@
 MCU_SERIES = MIMXRT1052
 MCU_VARIANT = MIMXRT1052DVL6B
 
+MICROPY_FLOAT_IMPL = double
+
 JLINK_PATH ?= /media/RT1050-EVK/
 
 deploy: $(BUILD)/firmware.bin
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
index 32f87046b8..b7ea5fcbe1 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
@@ -1,6 +1,8 @@
 MCU_SERIES = MIMXRT1062
 MCU_VARIANT = MIMXRT1062DVJ6A
 
+MICROPY_FLOAT_IMPL = double
+
 JLINK_PATH ?= /media/RT1060-EVK/
 JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
 
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
index 7009889191..bd4c496416 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
@@ -1,6 +1,8 @@
 MCU_SERIES = MIMXRT1064
 MCU_VARIANT = MIMXRT1064DVL6A
 
+MICROPY_FLOAT_IMPL = double
+
 JLINK_PATH ?= /media/RT1064-EVK/
 
 CFLAGS += -DBOARD_FLASH_SIZE=0x400000
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
index 79365d0da8..0f818af42c 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
@@ -1,6 +1,8 @@
 MCU_SERIES = MIMXRT1062
 MCU_VARIANT = MIMXRT1062DVJ6A
 
+MICROPY_FLOAT_IMPL = double
+
 deploy: $(BUILD)/firmware.hex
 	teensy_loader_cli --mcu=imxrt1062 -v -w $<
 	sleep 1

From bbdc98f72e019ef1370add51a3ad9ec991bfbc40 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 26 May 2021 13:19:38 +0200
Subject: [PATCH 193/349] mimxrt: Enable many Python and some extmod features.

Besides Python features this includes the extmod modules which make use of
the Pin module, especially machine.softSPI, machine.SoftI2C and onewire.
---
 ports/mimxrt/Makefile                |  3 ++
 ports/mimxrt/boards/manifest.py      |  2 +
 ports/mimxrt/hal/flexspi_nor_flash.h |  2 +-
 ports/mimxrt/machine_pin.c           |  8 +--
 ports/mimxrt/main.c                  |  2 +-
 ports/mimxrt/modmachine.c            |  9 +++-
 ports/mimxrt/mpconfigport.h          | 79 ++++++++++++++++++++++++----
 ports/mimxrt/mphalport.h             |  3 ++
 8 files changed, 91 insertions(+), 17 deletions(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 141bc2c49b..de7b9fd3ee 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -152,6 +152,8 @@ SRC_C = \
 	lib/utils/pyexec.c \
 	lib/utils/stdout_helpers.c \
 	lib/utils/sys_stdio_mphal.c \
+	drivers/bus/softspi.c \
+	extmod/modonewire.c \
 	$(SRC_TINYUSB_C) \
 	$(SRC_TINYUSB_IMX_C) \
 
@@ -265,6 +267,7 @@ SRC_QSTR += \
 	moduos.c \
 	pin.c \
 	lib/utils/sys_stdio_mphal.c \
+	extmod/modonewire.c \
 	$(GEN_PINS_SRC) \
 
 OBJ += $(PY_O)
diff --git a/ports/mimxrt/boards/manifest.py b/ports/mimxrt/boards/manifest.py
index c80309cf67..9df589f126 100644
--- a/ports/mimxrt/boards/manifest.py
+++ b/ports/mimxrt/boards/manifest.py
@@ -1 +1,3 @@
 freeze("$(PORT_DIR)/modules")
+freeze("$(MPY_DIR)/drivers/onewire")
+include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
diff --git a/ports/mimxrt/hal/flexspi_nor_flash.h b/ports/mimxrt/hal/flexspi_nor_flash.h
index 43cd7efdc7..a9a9bbe700 100644
--- a/ports/mimxrt/hal/flexspi_nor_flash.h
+++ b/ports/mimxrt/hal/flexspi_nor_flash.h
@@ -27,7 +27,7 @@
 #define MICROPY_INCLUDED_MIMXRT_HAL_FLEXSPI_NOR_FLASH_H
 
 #include "fsl_flexspi.h"
-#include "mpconfigport.h"
+#include "mpconfigboard.h"
 #include BOARD_FLASH_CONFIG_HEADER_H
 
 // Defined in boards flash_config.c
diff --git a/ports/mimxrt/machine_pin.c b/ports/mimxrt/machine_pin.c
index f63778cbe5..ebe95059bf 100644
--- a/ports/mimxrt/machine_pin.c
+++ b/ports/mimxrt/machine_pin.c
@@ -39,7 +39,7 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
 // Class Methods
 STATIC void machine_pin_obj_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind);
 STATIC mp_obj_t machine_pin_obj_call(mp_obj_t self_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args);
-STATIC mp_obj_t machine_pin_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args);
+mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args);
 
 // Instance Methods
 STATIC mp_obj_t machine_pin_off(mp_obj_t self_in);
@@ -191,7 +191,7 @@ STATIC void machine_pin_obj_print(const mp_print_t *print, mp_obj_t o, mp_print_
 }
 
 // pin(id, mode, pull, ...)
-STATIC mp_obj_t machine_pin_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
 
     const machine_pin_obj_t *pin = pin_find(args[0]);
@@ -273,7 +273,7 @@ const mp_obj_type_t machine_pin_type = {
     .name = MP_QSTR_Pin,
     .print = machine_pin_obj_print,
     .call = machine_pin_obj_call,
-    .make_new = machine_pin_obj_make_new,
+    .make_new = mp_pin_make_new,
     .locals_dict = (mp_obj_dict_t *)&machine_pin_locals_dict,
 };
 
@@ -282,6 +282,6 @@ const mp_obj_type_t machine_pin_af_type = {
     {&mp_type_type},
     .name = MP_QSTR_PinAF,
     .print = machine_pin_obj_print,
-    .make_new = machine_pin_obj_make_new,
+    .make_new = mp_pin_make_new,
     .locals_dict = (mp_obj_dict_t *)&machine_pin_locals_dict,
 };
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index 76fd7ef76c..74c8a7014b 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -128,7 +128,7 @@ const char mimxrt_help_text[] =
     "  machine.Pin(pin, m, [p]) -- get a pin and configure it for IO mode m, pull mode p\n"
     "    methods: init(..), value([v]), high(), low())\n"
     "\n"
-    "Pin IO modes are: Pin.IN, Pin.OUT\n"
+    "Pin IO modes are: Pin.IN, Pin.OUT, Pin.OPEN_DRAIN\n"
     "Pin pull modes are: Pin.PULL_UP, Pin.PULL_UP_47K, Pin.PULL_UP_22K, Pin.PULL_DOWN, Pin.PULL_HOLD\n"
     "\n"
     "Useful control commands:\n"
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index ff4ca7cf9f..96cae3a828 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -27,9 +27,13 @@
 
 #include "py/runtime.h"
 #include "extmod/machine_mem.h"
+#include "extmod/machine_i2c.h"
+#include "extmod/machine_signal.h"
+#include "extmod/machine_spi.h"
 #include "led.h"
 #include "pin.h"
 #include "modmachine.h"
+#include "fsl_clock.h"
 
 #include CPU_HEADER_H
 
@@ -40,7 +44,7 @@ STATIC mp_obj_t machine_reset(void) {
 MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
 
 STATIC mp_obj_t machine_freq(void) {
-    return MP_OBJ_NEW_SMALL_INT(0);
+    return MP_OBJ_NEW_SMALL_INT(CLOCK_GetFreq(kCLOCK_CpuClk));
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_freq_obj, machine_freq);
 
@@ -57,6 +61,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
     { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
     { MP_ROM_QSTR(MP_QSTR_RTC),                 MP_ROM_PTR(&machine_rtc_type) },
+    { MP_ROM_QSTR(MP_QSTR_Signal),              MP_ROM_PTR(&machine_signal_type) },
+    { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
+    { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
 
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 98e01abe13..0af87264a5 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -28,6 +28,7 @@
 
 // Board specific definitions
 #include "mpconfigboard.h"
+#include "fsl_common.h"
 
 // Memory allocation policies
 #define MICROPY_GC_STACK_ENTRY_TYPE         uint16_t
@@ -35,6 +36,11 @@
 #define MICROPY_ALLOC_PARSE_CHUNK_INIT      (32)
 #define MICROPY_ALLOC_PATH_MAX              (256)
 
+// MicroPython emitters
+#define MICROPY_PERSISTENT_CODE_LOAD        (1)
+#define MICROPY_EMIT_THUMB                  (1)
+#define MICROPY_EMIT_INLINE_THUMB           (1)
+
 // Compiler configuration
 #define MICROPY_COMP_CONST                  (0)
 
@@ -60,32 +66,64 @@
 #define MICROPY_QSTR_EXTRA_POOL             mp_qstr_frozen_const_pool
 
 // Control over Python builtins
-#define MICROPY_PY_BUILTINS_STR_COUNT       (0)
+#define MICROPY_PY_FUNCTION_ATTRS           (1)
+#define MICROPY_PY_DESCRIPTORS              (1)
+#define MICROPY_PY_DELATTR_SETATTR          (1)
+#define MICROPY_PY_BUILTINS_STR_UNICODE     (1)
+#define MICROPY_PY_BUILTINS_STR_CENTER      (1)
+#define MICROPY_PY_BUILTINS_STR_PARTITION   (1)
+#define MICROPY_PY_BUILTINS_STR_SPLITLINES  (1)
 #define MICROPY_PY_BUILTINS_MEMORYVIEW      (1)
-#define MICROPY_PY_BUILTINS_SET             (1)
-#define MICROPY_PY_BUILTINS_FROZENSET       (0)
-#define MICROPY_PY_BUILTINS_PROPERTY        (0)
-#define MICROPY_PY_BUILTINS_ENUMERATE       (0)
-#define MICROPY_PY_BUILTINS_FILTER          (0)
-#define MICROPY_PY_BUILTINS_REVERSED        (1)
-#define MICROPY_PY_BUILTINS_MIN_MAX         (0)
+#define MICROPY_PY_BUILTINS_SLICE_ATTRS     (1)
+#define MICROPY_PY_BUILTINS_SLICE_INDICES   (1)
+#define MICROPY_PY_BUILTINS_FROZENSET       (1)
+#define MICROPY_PY_BUILTINS_ROUND_INT       (1)
+#define MICROPY_PY_ALL_SPECIAL_METHODS      (1)
+#define MICROPY_PY_REVERSE_SPECIAL_METHODS  (1)
+#define MICROPY_PY_BUILTINS_COMPILE         (1)
+#define MICROPY_PY_BUILTINS_INPUT           (1)
+#define MICROPY_PY_BUILTINS_POW3            (1)
 #define MICROPY_PY_BUILTINS_HELP            (1)
 #define MICROPY_PY_BUILTINS_HELP_MODULES    (1)
 #define MICROPY_PY_BUILTINS_HELP_TEXT       mimxrt_help_text
-#define MICROPY_PY___FILE__                 (0)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO     (1)
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN       (1)
-#define MICROPY_PY_COLLECTIONS              (0)
+#define MICROPY_PY_COLLECTIONS_DEQUE        (1)
+#define MICROPY_PY_COLLECTIONS_ORDEREDDICT  (1)
+#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS   (1)
+#define MICROPY_PY_MATH_FACTORIAL           (1)
+#define MICROPY_PY_MATH_ISCLOSE             (1)
+#define MICROPY_PY_CMATH                    (1)
 #define MICROPY_PY_IO_IOBASE                (1)
 #define MICROPY_PY_IO_FILEIO                (1)
 #define MICROPY_PY_SYS_MAXSIZE              (1)
 #define MICROPY_PY_SYS_PLATFORM             "mimxrt"
 #define MICROPY_PY_SYS_STDFILES             (1)
 #define MICROPY_PY_SYS_STDIO_BUFFER         (1)
+#define MICROPY_PY_UERRNO                   (1)
 
 // Extended modules
+#define MICROPY_EPOCH_IS_1970               (1)
+#define MICROPY_PY_UASYNCIO                 (1)
+#define MICROPY_PY_UCTYPES                  (1)
+#define MICROPY_PY_UZLIB                    (1)
+#define MICROPY_PY_UJSON                    (1)
+#define MICROPY_PY_URE                      (1)
+#define MICROPY_PY_URE_MATCH_GROUPS         (1)
+#define MICROPY_PY_URE_MATCH_SPAN_START_END (1)
+#define MICROPY_PY_URE_SUB                  (1)
+#define MICROPY_PY_UHASHLIB                 (1)
+#define MICROPY_PY_UBINASCII                (1)
+#define MICROPY_PY_UBINASCII_CRC32          (1)
 #define MICROPY_PY_UTIME_MP_HAL             (1)
+#define MICROPY_PY_URANDOM                  (1)
+#define MICROPY_PY_URANDOM_EXTRA_FUNCS      (1)
+#define MICROPY_PY_USELECT                  (1)
 #define MICROPY_PY_MACHINE                  (1)
+#define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
+#define MICROPY_PY_MACHINE_I2C              (1)
+#define MICROPY_PY_MACHINE_SPI              (1)
+#define MICROPY_PY_FRAMEBUF                 (1)
 
 // Use VfsLfs2's types for fileio/textio
 #define mp_type_fileio mp_type_vfs_lfs2_fileio
@@ -97,11 +135,24 @@
 
 // Hooks to add builtins
 
+__attribute__((always_inline)) static inline void enable_irq(uint32_t state) {
+    __set_PRIMASK(state);
+}
+
+__attribute__((always_inline)) static inline uint32_t disable_irq(void) {
+    uint32_t state = __get_PRIMASK();
+    return state;
+}
+
+#define MICROPY_BEGIN_ATOMIC_SECTION()     disable_irq()
+#define MICROPY_END_ATOMIC_SECTION(state)  enable_irq(state)
+
 #define MICROPY_PORT_BUILTINS \
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
 
 extern const struct _mp_obj_module_t mp_module_machine;
 extern const struct _mp_obj_module_t mp_module_mimxrt;
+extern const struct _mp_obj_module_t mp_module_onewire;
 extern const struct _mp_obj_module_t mp_module_uos;
 extern const struct _mp_obj_module_t mp_module_utime;
 
@@ -110,6 +161,7 @@ extern const struct _mp_obj_module_t mp_module_utime;
     { MP_ROM_QSTR(MP_QSTR_mimxrt), (mp_obj_t)&mp_module_mimxrt }, \
     { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
     { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
+    { MP_ROM_QSTR(MP_QSTR__onewire), MP_ROM_PTR(&mp_module_onewire) }, \
 
 #define MICROPY_HW_PIT_NUM_CHANNELS 3
 
@@ -129,10 +181,17 @@ extern const struct _mp_obj_module_t mp_module_utime;
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
 
+#define MP_HAL_CLEAN_DCACHE(addr, size) \
+    (SCB_CleanDCache_by_Addr((uint32_t *)((uint32_t)addr & ~0x1f), \
+    ((uint32_t)((uint8_t *)addr + size + 0x1f) & ~0x1f) - ((uint32_t)addr & ~0x1f)))
+
 #define MP_SSIZE_MAX (0x7fffffff)
 typedef int mp_int_t; // must be pointer size
 typedef unsigned mp_uint_t; // must be pointer size
 typedef long mp_off_t;
 
+// Need an implementation of the log2 function which is not a macro.
+#define MP_NEED_LOG2 (1)
+
 // Need to provide a declaration/definition of alloca()
 #include <alloca.h>
diff --git a/ports/mimxrt/mphalport.h b/ports/mimxrt/mphalport.h
index fd664346dd..0db11836f8 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -48,6 +48,9 @@
 #define mp_hal_pin_od_low(p)    mp_hal_pin_low(p)
 #define mp_hal_pin_od_high(p)   mp_hal_pin_high(p)
 
+#define mp_hal_quiet_timing_enter() MICROPY_BEGIN_ATOMIC_SECTION()
+#define mp_hal_quiet_timing_exit(irq_state) MICROPY_END_ATOMIC_SECTION(irq_state)
+
 void mp_hal_set_interrupt_char(int c);
 
 static inline mp_uint_t mp_hal_ticks_ms(void) {

From b8c65b174f95c1fa1117d4f307a1c5a450607e33 Mon Sep 17 00:00:00 2001
From: Philipp Ebensberger <philipp.ebensberger@3bricks-software.de>
Date: Sat, 24 Apr 2021 21:34:07 +0200
Subject: [PATCH 194/349] mimxrt/machine_adc: Add the ADC class to the machine
 module.

This adds the machine.ADC class with the read_u16() method.  make-pins.py
and supporting files are updated to generate ADC information.
---
 ports/mimxrt/Makefile               |   7 +-
 ports/mimxrt/board_init.c           |   3 +
 ports/mimxrt/boards/make-pins.py    |  54 +++++++++--
 ports/mimxrt/boards/mimxrt_prefix.c |  12 ++-
 ports/mimxrt/machine_adc.c          | 145 ++++++++++++++++++++++++++++
 ports/mimxrt/modmachine.c           |   1 +
 ports/mimxrt/modmachine.h           |   2 +
 ports/mimxrt/pin.h                  |  11 ++-
 8 files changed, 223 insertions(+), 12 deletions(-)
 create mode 100644 ports/mimxrt/machine_adc.c

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index de7b9fd3ee..cacbcc1a37 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -111,10 +111,11 @@ SRC_TINYUSB_C += \
 	lib/tinyusb/src/class/vendor/vendor_device.c \
 	lib/tinyusb/src/portable/nxp/transdimension/dcd_transdimension.c
 
-SRC_TINYUSB_IMX_C += \
+SRC_HAL_IMX_C += \
 	$(MCU_DIR)/system_$(MCU_SERIES).c \
 	$(MCU_DIR)/xip/fsl_flexspi_nor_boot.c \
 	$(MCU_DIR)/project_template/clock_config.c \
+	$(MCU_DIR)/drivers/fsl_adc.c \
 	$(MCU_DIR)/drivers/fsl_clock.c \
 	$(MCU_DIR)/drivers/fsl_gpio.c \
 	$(MCU_DIR)/drivers/fsl_gpt.c \
@@ -134,6 +135,7 @@ SRC_C = \
 	tusb_port.c \
 	board_init.c \
 	$(BOARD_DIR)/flash_config.c \
+	machine_adc.c \
 	machine_led.c \
 	machine_pin.c \
 	machine_rtc.c \
@@ -155,7 +157,7 @@ SRC_C = \
 	drivers/bus/softspi.c \
 	extmod/modonewire.c \
 	$(SRC_TINYUSB_C) \
-	$(SRC_TINYUSB_IMX_C) \
+	$(SRC_HAL_IMX_C) \
 
 ifeq ($(MICROPY_FLOAT_IMPL),double)
 LIBM_SRC_C += $(addprefix lib/libm_dbl/,\
@@ -256,6 +258,7 @@ SRC_S = lib/utils/gchelper_m3.s \
 
 # List of sources for qstr extraction
 SRC_QSTR += \
+	machine_adc.c \
 	machine_led.c \
 	machine_pin.c \
 	machine_rtc.c \
diff --git a/ports/mimxrt/board_init.c b/ports/mimxrt/board_init.c
index 01f6848ea6..65024ff3e2 100644
--- a/ports/mimxrt/board_init.c
+++ b/ports/mimxrt/board_init.c
@@ -80,6 +80,9 @@ void board_init(void) {
     //  CLOCK_EnableUsbhs1PhyPllClock(kCLOCK_Usbphy480M, 480000000U);
     //  CLOCK_EnableUsbhs1Clock(kCLOCK_Usb480M, 480000000U);
 
+    // ADC
+    machine_adc_init();
+
     // PIT
     machine_timer_init_PIT();
 }
diff --git a/ports/mimxrt/boards/make-pins.py b/ports/mimxrt/boards/make-pins.py
index 5e5b81e31e..e9e32a5047 100644
--- a/ports/mimxrt/boards/make-pins.py
+++ b/ports/mimxrt/boards/make-pins.py
@@ -6,9 +6,11 @@ from __future__ import print_function
 import argparse
 import sys
 import csv
+import re
 
 SUPPORTED_AFS = {"GPIO"}
 MAX_AF = 10  # AF0 .. AF9
+ADC_COL = 11
 
 
 def parse_pad(pad_str):
@@ -38,7 +40,7 @@ class Pin(object):
         self.gpio = gpio
         self.pin = pin
         self.alt_fn = []
-        self.adc_channel = 0
+        self.adc_fns = []
         self.board_pin = False
 
     def set_is_board_pin(self):
@@ -48,7 +50,13 @@ class Pin(object):
         return self.board_pin
 
     def parse_adc(self, adc_str):
-        pass
+        adc_regex = r"ADC(?P<instance>\d*)_IN(?P<channel>\d*)"
+
+        matches = re.finditer(adc_regex, adc_str, re.MULTILINE)
+        for match in matches:
+            self.adc_fns.append(
+                AdcFunction(instance=match.group("instance"), channel=match.group("channel"))
+            )
 
     def parse_af(self, af_idx, af_strs_in):
         pass
@@ -69,14 +77,34 @@ class Pin(object):
         else:
             raise ValueError("Pin '{}' has no alternative functions".format(self.name))
 
+    def print_pin_adc(self):
+        if self.adc_fns:
+            print(
+                "static const machine_pin_adc_obj_t pin_{0}_adc[{1}] = {{".format(
+                    self.name, len(self.adc_fns)
+                )
+            )
+            for adc_fn in self.adc_fns:
+                adc_fn.print()
+            print("};")
+
     def print(self):
         if self.alt_fn:
             self.print_pin_af()
-            print(
-                "const machine_pin_obj_t pin_{0} = PIN({0}, {1}, {2}, pin_{3});\n".format(
-                    self.name, self.gpio, int(self.pin), self.name + "_af"
+            self.print_pin_adc()
+
+            if self.adc_fns:
+                print(
+                    "const machine_pin_obj_t pin_{0} = PIN({0}, {1}, {2}, pin_{0}_af, {3}, pin_{0}_adc);\n".format(
+                        self.name, self.gpio, int(self.pin), len(self.adc_fns)
+                    )
+                )
+            else:
+                print(
+                    "const machine_pin_obj_t pin_{0} = PIN({0}, {1}, {2}, pin_{0}_af, {3}, NULL);\n".format(
+                        self.name, self.gpio, int(self.pin), len(self.adc_fns)
+                    )
                 )
-            )
         else:
             raise ValueError("Pin '{}' has no alternative functions".format(self.name))
 
@@ -84,6 +112,18 @@ class Pin(object):
         pass
 
 
+class AdcFunction(object):
+    """Holds the information associated with a pins ADC function."""
+
+    def __init__(self, instance, channel):
+        self.instance = instance
+        self.channel = channel
+
+    def print(self):
+        """Prints the C representation of this AF."""
+        print(f"    PIN_ADC(ADC{self.instance}, {self.channel}),")
+
+
 class AlternateFunction(object):
     """Holds the information associated with a pins alternate function."""
 
@@ -149,6 +189,8 @@ class Pins(object):
                     if af and af_supported(af):
                         pin.add_af(AlternateFunction(af_idx, af))
 
+                pin.parse_adc(row[ADC_COL])
+
                 self.cpu_pins.append(pin)
 
     @staticmethod
diff --git a/ports/mimxrt/boards/mimxrt_prefix.c b/ports/mimxrt/boards/mimxrt_prefix.c
index 59e338976e..96ba6a0d5e 100644
--- a/ports/mimxrt/boards/mimxrt_prefix.c
+++ b/ports/mimxrt/boards/mimxrt_prefix.c
@@ -13,7 +13,13 @@
         .pad_config = (uint32_t)(_pad_config), \
     } \
 
-#define PIN(_name, _gpio, _pin, _af_list) \
+#define PIN_ADC(_instance, _channel) \
+    { \
+        .instance = (_instance), \
+        .channel = (_channel) \
+    } \
+
+#define PIN(_name, _gpio, _pin, _af_list, _adc_list_len, _adc_list) \
     { \
         .base = { &machine_pin_type }, \
         .name = MP_QSTR_##_name, \
@@ -21,6 +27,8 @@
         .pin = (uint32_t)(_pin), \
         .muxRegister = (uint32_t)&(IOMUXC->SW_MUX_CTL_PAD[kIOMUXC_SW_MUX_CTL_PAD_##_name]), \
         .configRegister = (uint32_t)&(IOMUXC->SW_PAD_CTL_PAD[kIOMUXC_SW_PAD_CTL_PAD_##_name]), \
-        .af_list_len = (size_t)(sizeof((_af_list)) / sizeof(machine_pin_af_obj_t)), \
+        .af_list_len = (uint8_t)(sizeof((_af_list)) / sizeof(machine_pin_af_obj_t)), \
+        .adc_list_len = (_adc_list_len), \
         .af_list = (_af_list), \
+        .adc_list = (_adc_list), \
     } \
diff --git a/ports/mimxrt/machine_adc.c b/ports/mimxrt/machine_adc.c
new file mode 100644
index 0000000000..8bf5e7b9a8
--- /dev/null
+++ b/ports/mimxrt/machine_adc.c
@@ -0,0 +1,145 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Philipp Ebensberger
+ *
+ * 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 <stdint.h>
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "py/mphal.h"
+
+#include "fsl_adc.h"
+#include "fsl_gpio.h"
+#include "fsl_iomuxc.h"
+
+#include "modmachine.h"
+
+typedef struct _machine_adc_obj_t {
+    mp_obj_base_t base;
+    ADC_Type *adc;
+    uint8_t channel;
+    uint8_t channel_group;
+    uint16_t resolution;
+} machine_adc_obj_t;
+
+STATIC ADC_Type *const adc_bases[] = ADC_BASE_PTRS;
+
+STATIC void adc_obj_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
+    (void)kind;
+    machine_adc_obj_t *self = MP_OBJ_TO_PTR(o);
+
+    // Get ADC adc id
+    for (int i = 1; i < sizeof(adc_bases) / sizeof(ADC_Type *); ++i) {
+        if (adc_bases[i] == self->adc) {
+            mp_printf(print, "ADC(%u, channel=%u)", i, self->channel);
+            break;
+        }
+    }
+}
+
+STATIC mp_obj_t adc_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 1, 1, false);
+
+    // Unpack and check parameter
+    const machine_pin_obj_t *pin = pin_find(args[0]);
+
+    if (pin->adc_list_len == 0) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Pin(%q) does not have ADC capabilities"), pin->name);
+    }
+
+    // Extract arguments
+    ADC_Type *adc_instance = pin->adc_list[0].instance;  // NOTE: we only use the first ADC assignment - multiple assignments are not supported for now
+    uint8_t channel = pin->adc_list[0].channel;
+
+    // Configure ADC peripheral channel
+    adc_channel_config_t channel_config = {
+        .channelNumber = (uint32_t)channel,
+        .enableInterruptOnConversionCompleted = false,
+    };
+    ADC_SetChannelConfig(adc_instance, 0UL, &channel_config);  // NOTE: we always choose channel group '0' since we only perform software triggered conversion
+
+    // Create ADC Instance
+    machine_adc_obj_t *o = m_new_obj(machine_adc_obj_t);
+    o->base.type = &machine_adc_type;
+    o->adc = adc_instance;
+    o->channel = (uint8_t)channel;
+    o->channel_group = 0;
+    o->resolution = 4096;  // NOTE: currently only 12bit resolution supported
+
+    return MP_OBJ_FROM_PTR(o);
+}
+
+// read_u16()
+STATIC mp_obj_t machine_adc_read_u16(mp_obj_t self_in) {
+    machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    // Initiate conversion
+    adc_channel_config_t channel_config = {
+        .channelNumber = self->channel,
+        .enableInterruptOnConversionCompleted = false,
+    };
+    ADC_SetChannelConfig(self->adc, (uint32_t)self->channel_group, &channel_config);
+
+    // Wait for conversion to finish
+    while (!ADC_GetChannelStatusFlags(self->adc, (uint32_t)self->channel_group)) {
+        // do nothing
+    }
+
+    // Measure input voltage
+    uint32_t value = ADC_GetChannelConversionValue(self->adc, (uint32_t)self->channel_group);
+    return MP_OBJ_NEW_SMALL_INT(value * 65535 / self->resolution);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_adc_read_u16_obj, machine_adc_read_u16);
+
+STATIC const mp_rom_map_elem_t adc_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_read_u16), MP_ROM_PTR(&machine_adc_read_u16_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(adc_locals_dict, adc_locals_dict_table);
+
+const mp_obj_type_t machine_adc_type = {
+    {&mp_type_type},
+    .name = MP_QSTR_ADC,
+    .print = adc_obj_print,
+    .make_new = adc_obj_make_new,
+    .locals_dict = (mp_obj_dict_t *)&adc_locals_dict,
+};
+
+void machine_adc_init(void) {
+    for (int i = 1; i < sizeof(adc_bases) / sizeof(ADC_Type *); ++i) {
+        ADC_Type *adc_instance = adc_bases[i];
+
+        // Configure ADC perpheral
+        adc_config_t config;
+        ADC_GetDefaultConfig(&config);
+        ADC_Init(adc_instance, &config);
+
+        // Perform calibration
+        status_t calib_state = ADC_DoAutoCalibration(adc_instance);
+
+        if (calib_state == kStatus_Fail) {
+            mp_printf(&mp_plat_print, "Calibration for ADC Instance %d failed", i);
+        }
+    }
+}
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index 96cae3a828..dfee91992d 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -59,6 +59,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_LED),                 MP_ROM_PTR(&machine_led_type) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
+    { MP_ROM_QSTR(MP_QSTR_ADC),                 MP_ROM_PTR(&machine_adc_type) },
     { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
     { MP_ROM_QSTR(MP_QSTR_RTC),                 MP_ROM_PTR(&machine_rtc_type) },
     { MP_ROM_QSTR(MP_QSTR_Signal),              MP_ROM_PTR(&machine_signal_type) },
diff --git a/ports/mimxrt/modmachine.h b/ports/mimxrt/modmachine.h
index d165c00e6d..a7b577fa79 100644
--- a/ports/mimxrt/modmachine.h
+++ b/ports/mimxrt/modmachine.h
@@ -29,9 +29,11 @@
 
 #include "py/obj.h"
 
+extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_timer_type;
 extern const mp_obj_type_t machine_rtc_type;
 
+void machine_adc_init(void);
 void machine_timer_init_PIT(void);
 
 #endif // MICROPY_INCLUDED_MIMXRT_MODMACHINE_H
diff --git a/ports/mimxrt/pin.h b/ports/mimxrt/pin.h
index 6afedd1f59..7a05d2d64d 100644
--- a/ports/mimxrt/pin.h
+++ b/ports/mimxrt/pin.h
@@ -100,6 +100,11 @@ typedef struct {
     uint32_t pad_config;  // pad configuration for alternate function
 } machine_pin_af_obj_t;
 
+typedef struct {
+    ADC_Type *instance;
+    uint8_t channel;
+} machine_pin_adc_obj_t;
+
 typedef struct {
     mp_obj_base_t base;
     qstr name;  // pad name
@@ -107,8 +112,10 @@ typedef struct {
     uint32_t pin;  // pin number
     uint32_t muxRegister;
     uint32_t configRegister;
-    size_t af_list_len;  // length of available alternate functions list
-    const machine_pin_af_obj_t *af_list;  // pointer tolist with alternate functions
+    uint8_t af_list_len;  // length of available alternate functions list
+    uint8_t adc_list_len; // length of available ADC options list
+    const machine_pin_af_obj_t *af_list;  // pointer to list with alternate functions
+    const machine_pin_adc_obj_t *adc_list; // pointer to list with ADC options
 } machine_pin_obj_t;
 
 // ------------------------------------------------------------------------------------------------------------------ //

From 53fea8598e86285e25194735cfc0c2f31cef57a1 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 1 Jun 2021 20:15:55 +0200
Subject: [PATCH 195/349] mimxrt/boards: Add board configuration files for
 Teensy 4.1.

These are at the moment more or less identical to the Teensy 4.0 files,
except for the pins.csv file and the flash size.
---
 ports/mimxrt/boards/TEENSY41/TEENSY41.ld      |   2 +
 ports/mimxrt/boards/TEENSY41/flash_config.c   | 144 ++++++++++
 ports/mimxrt/boards/TEENSY41/mpconfigboard.h  |  10 +
 ports/mimxrt/boards/TEENSY41/mpconfigboard.mk |   7 +
 ports/mimxrt/boards/TEENSY41/pins.csv         |  83 ++++++
 .../TEENSY41/teensy41_flexspi_nor_config.h    | 259 ++++++++++++++++++
 6 files changed, 505 insertions(+)
 create mode 100755 ports/mimxrt/boards/TEENSY41/TEENSY41.ld
 create mode 100755 ports/mimxrt/boards/TEENSY41/flash_config.c
 create mode 100755 ports/mimxrt/boards/TEENSY41/mpconfigboard.h
 create mode 100755 ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
 create mode 100755 ports/mimxrt/boards/TEENSY41/pins.csv
 create mode 100755 ports/mimxrt/boards/TEENSY41/teensy41_flexspi_nor_config.h

diff --git a/ports/mimxrt/boards/TEENSY41/TEENSY41.ld b/ports/mimxrt/boards/TEENSY41/TEENSY41.ld
new file mode 100755
index 0000000000..7f3cfc302a
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY41/TEENSY41.ld
@@ -0,0 +1,2 @@
+flash_size = 8M;
+reserved_size = 4K;
diff --git a/ports/mimxrt/boards/TEENSY41/flash_config.c b/ports/mimxrt/boards/TEENSY41/flash_config.c
new file mode 100755
index 0000000000..f5066216d1
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY41/flash_config.c
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2018 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+// Based on tinyusb/hw/bsp/teensy_40/teensy40_flexspi_nor_config.c
+
+#include "teensy41_flexspi_nor_config.h"
+
+/* Component ID definition, used by tools. */
+#ifndef FSL_COMPONENT_ID
+#define FSL_COMPONENT_ID "platform.drivers.xip_board"
+#endif
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
+#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
+__attribute__((section(".boot_hdr.conf")))
+#elif defined(__ICCARM__)
+#pragma location = ".boot_hdr.conf"
+#endif
+
+const flexspi_nor_config_t qspiflash_config = {
+    .memConfig =
+        {
+            .tag              = FLEXSPI_CFG_BLK_TAG,
+            .version          = FLEXSPI_CFG_BLK_VERSION,
+            .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
+            .csHoldTime       = 3u,
+            .csSetupTime      = 3u,
+
+            .busyOffset = FLASH_BUSY_STATUS_OFFSET,     // Status bit 0 indicates busy.
+            .busyBitPolarity = FLASH_BUSY_STATUS_POL,   // Busy when the bit is 1.
+
+            .deviceModeCfgEnable = 1u,
+            .deviceModeType = kDeviceConfigCmdType_QuadEnable,
+            .deviceModeSeq = {
+                .seqId = 4u,
+                .seqNum = 1u,
+            },
+            .deviceModeArg = 0x0200,
+            .configCmdEnable = 1u,
+            .configModeType[0] = kDeviceConfigCmdType_Generic,
+            .configCmdSeqs[0] = {
+                .seqId = 2u,
+                .seqNum = 1u,
+            },
+            .deviceType = kFlexSpiDeviceType_SerialNOR,
+            // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
+            .sflashPadType = kSerialFlash_4Pads,
+            .serialClkFreq = kFlexSpiSerialClk_60MHz,
+            .sflashA1Size  = 8u * 1024u * 1024u,
+            .lookupTable =
+                {
+                    // 0 Read LUTs 0 -> 0
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 1 Read status register -> 1
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 2 Fast read quad mode - SDR
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 3 Write Enable -> 3
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 4 Read extend parameters
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 5 Erase Sector -> 5
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 6 Write Status Reg
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 7 Page Program - quad mode (-> 9)
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 8 Read ID
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 9 Page Program - single mode -> 9
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 10 Enter QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 11 Erase Chip
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 12 Exit QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                },
+        },
+    .pageSize           = 256u,
+    .sectorSize         = 4u * 1024u,
+    .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz,
+    .blockSize          = 0x00010000,
+    .isUniformBlockSize = false,
+};
+#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
new file mode 100755
index 0000000000..6acfa11cdb
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
@@ -0,0 +1,10 @@
+#define MICROPY_HW_BOARD_NAME "Teensy 4.1"
+#define MICROPY_HW_MCU_NAME   "MIMXRT1062DVJ6A"
+
+#define BOARD_FLASH_SIZE (8 * 1024 * 1024)
+
+// Teensy 4.1 has 1 board LED
+#define MICROPY_HW_LED1_PIN (pin_GPIO_B0_03)
+#define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
+#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
+#define BOARD_FLASH_CONFIG_HEADER_H "teensy41_flexspi_nor_config.h"
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
new file mode 100755
index 0000000000..beab16c086
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
@@ -0,0 +1,7 @@
+MCU_SERIES = MIMXRT1062
+MCU_VARIANT = MIMXRT1062DVJ6A
+
+MICROPY_FLOAT_IMPL = double
+
+deploy: $(BUILD)/firmware.hex
+	teensy_loader_cli --mcu=imxrt1062 -v -w $<
diff --git a/ports/mimxrt/boards/TEENSY41/pins.csv b/ports/mimxrt/boards/TEENSY41/pins.csv
new file mode 100755
index 0000000000..88b91f2540
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY41/pins.csv
@@ -0,0 +1,83 @@
+D0,GPIO_AD_B0_03
+D1,GPIO_AD_B0_02
+D2,GPIO_EMC_04
+D3,GPIO_EMC_05
+D4,GPIO_EMC_06
+D5,GPIO_EMC_08
+D6,GPIO_B0_10
+D7,GPIO_B1_01
+D8,GPIO_B1_00
+D9,GPIO_B0_11
+D10,GPIO_B0_00
+D11,GPIO_B0_02
+D12,GPIO_B0_01
+D13,GPIO_B0_03
+D14,GPIO_AD_B1_02
+D15,GPIO_AD_B1_03
+D16,GPIO_AD_B1_07
+D17,GPIO_AD_B1_06
+D18,GPIO_AD_B1_01
+D19,GPIO_AD_B1_00
+D20,GPIO_AD_B1_10
+D21,GPIO_AD_B1_11
+D22,GPIO_AD_B1_08
+D23,GPIO_AD_B1_09
+D24,GPIO_AD_B0_12
+D25,GPIO_AD_B0_13
+D26,GPIO_AD_B1_14
+D27,GPIO_AD_B1_15
+D28,GPIO_EMC_32
+D29,GPIO_EMC_31
+D30,GPIO_EMC_37
+D31,GPIO_EMC_36
+D32,GPIO_B0_12
+D33,GPIO_EMC_07
+D34,GPIO_B1_13
+D35,GPIO_B1_12
+D36,GPIO_B1_02
+D37,GPIO_B1_03
+D38,GPIO_AD_B1_12
+D39,GPIO_AD_B1_13
+D40,GPIO_AD_B1_04
+D41,GPIO_AD_B1_05
+D42,GPIO_SD_B0_03
+D43,GPIO_SD_B0_02
+D44,GPIO_SD_B0_01
+D45,GPIO_SD_B0_00
+D46,GPIO_SD_B0_05
+D47,GPIO_SD_B0_04
+D48,GPIO_EMC_24
+D49,GPIO_EMC_27
+D50,GPIO_EMC_28
+D51,GPIO_EMC_22
+D52,GPIO_EMC_26
+D53,GPIO_EMC_25
+D54,GPIO_EMC_29
+DAT1,GPIO_SD_B0_03
+DAT0,GPIO_SD_B0_02
+CLK,GPIO_SD_B0_01
+CMD,GPIO_SD_B0_00
+DAT3,GPIO_SD_B0_05
+DAT2,GPIO_SD_B0_04
+PSRAM_CS,GPIO_EMC_24
+QSPI_IO1,GPIO_EMC_27
+QSPI_IO2,GPIO_EMC_28
+FLASH_CS,GPIO_EMC_22
+QSPI_IO0,GPIO_EMC_26
+QSPI_CLK,GPIO_EMC_25
+QSPI_IO3,GPIO_EMC_29
+A0,GPIO_AD_B1_02
+A1,GPIO_AD_B1_03
+A2,GPIO_AD_B1_07
+A3,GPIO_AD_B1_06
+A4,GPIO_AD_B1_01
+A5,GPIO_AD_B1_00
+A6,GPIO_AD_B1_10
+A7,GPIO_AD_B1_11
+A8,GPIO_AD_B1_08
+A9,GPIO_AD_B1_09
+A10,GPIO_AD_B0_12
+A11,GPIO_AD_B0_13
+A12,GPIO_AD_B1_14
+A13,GPIO_AD_B1_15
+LED,GPIO_B0_03
\ No newline at end of file
diff --git a/ports/mimxrt/boards/TEENSY41/teensy41_flexspi_nor_config.h b/ports/mimxrt/boards/TEENSY41/teensy41_flexspi_nor_config.h
new file mode 100755
index 0000000000..445a0baccc
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY41/teensy41_flexspi_nor_config.h
@@ -0,0 +1,259 @@
+/*
+ * Copyright 2018 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+// Based on tinyusb/hw/bsp/teensy_40/teensy40_flexspi_nor_config.h
+
+#ifndef __TEENSY40_FLEXSPI_NOR_CONFIG__
+#define __TEENSY40_FLEXSPI_NOR_CONFIG__
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "fsl_common.h"
+
+/*! @name Driver version */
+/*@{*/
+/*! @brief XIP_BOARD driver version 2.0.0. */
+#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
+/*@}*/
+
+/* FLEXSPI memory config block related defintions */
+#define FLEXSPI_CFG_BLK_TAG (0x42464346UL)     // ascii "FCFB" Big Endian
+#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
+#define FLEXSPI_CFG_BLK_SIZE (512)
+
+/* FLEXSPI Feature related definitions */
+#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
+
+/* Lookup table related definitions */
+#define CMD_INDEX_READ 0
+#define CMD_INDEX_READSTATUS 1
+#define CMD_INDEX_WRITEENABLE 2
+#define CMD_INDEX_WRITE 4
+
+#define CMD_LUT_SEQ_IDX_READ 0
+#define CMD_LUT_SEQ_IDX_READSTATUS 1
+#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define CMD_LUT_SEQ_IDX_ERASE 5
+#define CMD_LUT_SEQ_IDX_WRITE 9
+
+#define CMD_SDR 0x01
+#define CMD_DDR 0x21
+#define RADDR_SDR 0x02
+#define RADDR_DDR 0x22
+#define CADDR_SDR 0x03
+#define CADDR_DDR 0x23
+#define MODE1_SDR 0x04
+#define MODE1_DDR 0x24
+#define MODE2_SDR 0x05
+#define MODE2_DDR 0x25
+#define MODE4_SDR 0x06
+#define MODE4_DDR 0x26
+#define MODE8_SDR 0x07
+#define MODE8_DDR 0x27
+#define WRITE_SDR 0x08
+#define WRITE_DDR 0x28
+#define READ_SDR 0x09
+#define READ_DDR 0x29
+#define LEARN_SDR 0x0A
+#define LEARN_DDR 0x2A
+#define DATSZ_SDR 0x0B
+#define DATSZ_DDR 0x2B
+#define DUMMY_SDR 0x0C
+#define DUMMY_DDR 0x2C
+#define DUMMY_RWDS_SDR 0x0D
+#define DUMMY_RWDS_DDR 0x2D
+#define JMP_ON_CS 0x1F
+#define STOP 0
+
+#define FLEXSPI_1PAD 0
+#define FLEXSPI_2PAD 1
+#define FLEXSPI_4PAD 2
+#define FLEXSPI_8PAD 3
+
+#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
+    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
+     FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
+
+//!@brief Definitions for FlexSPI Serial Clock Frequency
+typedef enum _FlexSpiSerialClockFreq
+{
+    kFlexSpiSerialClk_30MHz  = 1,
+    kFlexSpiSerialClk_50MHz  = 2,
+    kFlexSpiSerialClk_60MHz  = 3,
+    kFlexSpiSerialClk_75MHz  = 4,
+    kFlexSpiSerialClk_80MHz  = 5,
+    kFlexSpiSerialClk_100MHz = 6,
+    kFlexSpiSerialClk_120MHz = 7,
+    kFlexSpiSerialClk_133MHz = 8,
+    kFlexSpiSerialClk_166MHz = 9,
+} flexspi_serial_clk_freq_t;
+
+//!@brief FlexSPI clock configuration type
+enum
+{
+    kFlexSpiClk_SDR, //!< Clock configure for SDR mode
+    kFlexSpiClk_DDR, //!< Clock configurat for DDR mode
+};
+
+//!@brief FlexSPI Read Sample Clock Source definition
+typedef enum _FlashReadSampleClkSource
+{
+    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
+    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
+    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
+    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
+} flexspi_read_sample_clk_t;
+
+//!@brief Misc feature bit definitions
+enum
+{
+    kFlexSpiMiscOffset_DiffClkEnable            = 0, //!< Bit for Differential clock enable
+    kFlexSpiMiscOffset_Ck2Enable                = 1, //!< Bit for CK2 enable
+    kFlexSpiMiscOffset_ParallelEnable           = 2, //!< Bit for Parallel mode enable
+    kFlexSpiMiscOffset_WordAddressableEnable    = 3, //!< Bit for Word Addressable enable
+    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, //!< Bit for Safe Configuration Frequency enable
+    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, //!< Bit for Pad setting override enable
+    kFlexSpiMiscOffset_DdrModeEnable            = 6, //!< Bit for DDR clock confiuration indication.
+};
+
+//!@brief Flash Type Definition
+enum
+{
+    kFlexSpiDeviceType_SerialNOR    = 1,    //!< Flash devices are Serial NOR
+    kFlexSpiDeviceType_SerialNAND   = 2,    //!< Flash devices are Serial NAND
+    kFlexSpiDeviceType_SerialRAM    = 3,    //!< Flash devices are Serial RAM/HyperFLASH
+    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, //!< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
+    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, //!< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
+};
+
+//!@brief Flash Pad Definitions
+enum
+{
+    kSerialFlash_1Pad  = 1,
+    kSerialFlash_2Pads = 2,
+    kSerialFlash_4Pads = 4,
+    kSerialFlash_8Pads = 8,
+};
+
+//!@brief FlexSPI LUT Sequence structure
+typedef struct _lut_sequence
+{
+    uint8_t seqNum; //!< Sequence Number, valid number: 1-16
+    uint8_t seqId;  //!< Sequence Index, valid number: 0-15
+    uint16_t reserved;
+} flexspi_lut_seq_t;
+
+//!@brief Flash Configuration Command Type
+enum
+{
+    kDeviceConfigCmdType_Generic,    //!< Generic command, for example: configure dummy cycles, drive strength, etc
+    kDeviceConfigCmdType_QuadEnable, //!< Quad Enable command
+    kDeviceConfigCmdType_Spi2Xpi,    //!< Switch from SPI to DPI/QPI/OPI mode
+    kDeviceConfigCmdType_Xpi2Spi,    //!< Switch from DPI/QPI/OPI to SPI mode
+    kDeviceConfigCmdType_Spi2NoCmd,  //!< Switch to 0-4-4/0-8-8 mode
+    kDeviceConfigCmdType_Reset,      //!< Reset device command
+};
+
+//!@brief FlexSPI Memory Configuration Block
+typedef struct _FlexSPIConfig
+{
+    uint32_t tag;               //!< [0x000-0x003] Tag, fixed value 0x42464346UL
+    uint32_t version;           //!< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
+    uint32_t reserved0;         //!< [0x008-0x00b] Reserved for future use
+    uint8_t readSampleClkSrc;   //!< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
+    uint8_t csHoldTime;         //!< [0x00d-0x00d] CS hold time, default value: 3
+    uint8_t csSetupTime;        //!< [0x00e-0x00e] CS setup time, default value: 3
+    uint8_t columnAddressWidth; //!< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
+    //! Serial NAND, need to refer to datasheet
+    uint8_t deviceModeCfgEnable; //!< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
+    uint8_t deviceModeType; //!< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
+    //! Generic configuration, etc.
+    uint16_t waitTimeCfgCommands; //!< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
+    //! DPI/QPI/OPI switch or reset command
+    flexspi_lut_seq_t deviceModeSeq; //!< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
+    //! sequence number, [31:16] Reserved
+    uint32_t deviceModeArg;    //!< [0x018-0x01b] Argument/Parameter for device configuration
+    uint8_t configCmdEnable;   //!< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
+    uint8_t configModeType[3]; //!< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
+    flexspi_lut_seq_t
+        configCmdSeqs[3]; //!< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
+    uint32_t reserved1;   //!< [0x02c-0x02f] Reserved for future use
+    uint32_t configCmdArgs[3];     //!< [0x030-0x03b] Arguments/Parameters for device Configuration commands
+    uint32_t reserved2;            //!< [0x03c-0x03f] Reserved for future use
+    uint32_t controllerMiscOption; //!< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
+    //! details
+    uint8_t deviceType;    //!< [0x044-0x044] Device Type:  See Flash Type Definition for more details
+    uint8_t sflashPadType; //!< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
+    uint8_t serialClkFreq; //!< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
+    //! Chapter for more details
+    uint8_t lutCustomSeqEnable; //!< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
+    //! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
+    uint32_t reserved3[2];           //!< [0x048-0x04f] Reserved for future use
+    uint32_t sflashA1Size;           //!< [0x050-0x053] Size of Flash connected to A1
+    uint32_t sflashA2Size;           //!< [0x054-0x057] Size of Flash connected to A2
+    uint32_t sflashB1Size;           //!< [0x058-0x05b] Size of Flash connected to B1
+    uint32_t sflashB2Size;           //!< [0x05c-0x05f] Size of Flash connected to B2
+    uint32_t csPadSettingOverride;   //!< [0x060-0x063] CS pad setting override value
+    uint32_t sclkPadSettingOverride; //!< [0x064-0x067] SCK pad setting override value
+    uint32_t dataPadSettingOverride; //!< [0x068-0x06b] data pad setting override value
+    uint32_t dqsPadSettingOverride;  //!< [0x06c-0x06f] DQS pad setting override value
+    uint32_t timeoutInMs;            //!< [0x070-0x073] Timeout threshold for read status command
+    uint32_t commandInterval;        //!< [0x074-0x077] CS deselect interval between two commands
+    uint16_t dataValidTime[2]; //!< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
+    uint16_t busyOffset;       //!< [0x07c-0x07d] Busy offset, valid value: 0-31
+    uint16_t busyBitPolarity;  //!< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
+    //! busy flag is 0 when flash device is busy
+    uint32_t lookupTable[64];           //!< [0x080-0x17f] Lookup table holds Flash command sequences
+    flexspi_lut_seq_t lutCustomSeq[12]; //!< [0x180-0x1af] Customizable LUT Sequences
+    uint32_t reserved4[4];              //!< [0x1b0-0x1bf] Reserved for future use
+} flexspi_mem_config_t;
+
+/*  */
+#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
+#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
+#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
+#define NOR_CMD_LUT_SEQ_IDX_READID 8
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
+#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
+#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
+
+/*
+ *  Serial NOR configuration block
+ */
+typedef struct _flexspi_nor_config
+{
+    flexspi_mem_config_t memConfig; //!< Common memory configuration info via FlexSPI
+    uint32_t pageSize;              //!< Page size of Serial NOR
+    uint32_t sectorSize;            //!< Sector size of Serial NOR
+    uint8_t ipcmdSerialClkFreq;     //!< Clock frequency for IP command
+    uint8_t isUniformBlockSize;     //!< Sector/Block size is the same
+    uint8_t reserved0[2];           //!< Reserved for future use
+    uint8_t serialNorType;          //!< Serial NOR Flash type: 0/1/2/3
+    uint8_t needExitNoCmdMode;      //!< Need to exit NoCmd mode before other IP command
+    uint8_t halfClkForNonReadCmd;   //!< Half the Serial Clock for non-read command: true/false
+    uint8_t needRestoreNoCmdMode;   //!< Need to Restore NoCmd mode after IP commmand execution
+    uint32_t blockSize;             //!< Block size
+    uint32_t reserve2[11];          //!< Reserved for future use
+} flexspi_nor_config_t;
+
+#define FLASH_BUSY_STATUS_POL 0
+#define FLASH_BUSY_STATUS_OFFSET 0
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __EVKMIMXRT1060_FLEXSPI_NOR_CONFIG__ */

From fad0efdcf277dcc5698d59445074f4ee806d7976 Mon Sep 17 00:00:00 2001
From: leo chung <gewalalb@gmail.com>
Date: Wed, 2 Jun 2021 10:27:27 +0800
Subject: [PATCH 196/349] esp32/Makefile: Fix wrong target for
 partition-table.bin.

   "$(BUILD)/partition_table/partition  -table.bin" is typing mistake.

Signed-off-by: leo chung <gewalalb@gmail.com>
---
 ports/esp32/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index 5a40cd9569..5065221635 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -38,7 +38,7 @@ all:
     		$(BUILD)/micropython.bin \
     		$(BUILD)/firmware.bin
 
-$(BUILD)/bootloader/bootloader.bin $(BUILD)/partition_table/partition  -table.bin $(BUILD)/micropython.bin: FORCE
+$(BUILD)/bootloader/bootloader.bin $(BUILD)/partition_table/partition-table.bin $(BUILD)/micropython.bin: FORCE
 
 clean:
 	idf.py $(IDFPY_FLAGS) fullclean

From a70a4e6688c6b29797b1e314ce2841e8e4fecb7b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 4 Jun 2021 01:17:09 +1000
Subject: [PATCH 197/349] py/emitglue: Always flush caches when assigning
 native ARM code.

Prior to this commit, cache flushing for ARM native code was done only in
the assembler code asm_thumb_end_pass()/asm_arm_end_pass(), at the last
pass of the assembler.  But this misses flushing the cache when loading
native code from an .mpy file, ie in persistentcode.c.

The change here makes sure the cache is always flushed/cleaned/invalidated
when assigning native code on ARM architectures.

This problem was found running tests/micropython/import_mpy_native_gc.py on
the mimxrt port.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/asmarm.c   | 19 -------------------
 py/asmarm.h   |  4 +++-
 py/asmthumb.c | 15 ---------------
 py/asmthumb.h |  4 +++-
 py/emitglue.c | 25 +++++++++++++++++++++++++
 5 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/py/asmarm.c b/py/asmarm.c
index 5662d75e19..4ba93d0806 100644
--- a/py/asmarm.c
+++ b/py/asmarm.c
@@ -38,25 +38,6 @@
 
 #define SIGNED_FIT24(x) (((x) & 0xff800000) == 0) || (((x) & 0xff000000) == 0xff000000)
 
-void asm_arm_end_pass(asm_arm_t *as) {
-    if (as->base.pass == MP_ASM_PASS_EMIT) {
-        #if (defined(__linux__) && defined(__GNUC__)) || __ARM_ARCH == 7
-        char *start = mp_asm_base_get_code(&as->base);
-        char *end = start + mp_asm_base_get_code_size(&as->base);
-        __builtin___clear_cache(start, end);
-        #elif defined(__arm__)
-        // flush I- and D-cache
-        asm volatile (
-            "0:"
-            "mrc p15, 0, r15, c7, c10, 3\n" // test and clean D-cache
-            "bne 0b\n"
-            "mov r0, #0\n"
-            "mcr p15, 0, r0, c7, c7, 0\n" // invalidate I-cache and D-cache
-            : : : "r0", "cc");
-        #endif
-    }
-}
-
 // Insert word into instruction flow
 STATIC void emit(asm_arm_t *as, uint op) {
     uint8_t *c = mp_asm_base_get_cur_to_write_bytes(&as->base, 4);
diff --git a/py/asmarm.h b/py/asmarm.h
index 46da661faa..0e029f20e9 100644
--- a/py/asmarm.h
+++ b/py/asmarm.h
@@ -72,7 +72,9 @@ typedef struct _asm_arm_t {
     uint stack_adjust;
 } asm_arm_t;
 
-void asm_arm_end_pass(asm_arm_t *as);
+static inline void asm_arm_end_pass(asm_arm_t *as) {
+    (void)as;
+}
 
 void asm_arm_entry(asm_arm_t *as, int num_locals);
 void asm_arm_exit(asm_arm_t *as);
diff --git a/py/asmthumb.c b/py/asmthumb.c
index f7ac87fa0f..db4520ce12 100644
--- a/py/asmthumb.c
+++ b/py/asmthumb.c
@@ -35,7 +35,6 @@
 
 #include "py/mpstate.h"
 #include "py/persistentcode.h"
-#include "py/mphal.h"
 #include "py/asmthumb.h"
 
 #define UNSIGNED_FIT5(x) ((uint32_t)(x) < 32)
@@ -62,20 +61,6 @@ static inline byte *asm_thumb_get_cur_to_write_bytes(asm_thumb_t *as, int n) {
     return mp_asm_base_get_cur_to_write_bytes(&as->base, n);
 }
 
-void asm_thumb_end_pass(asm_thumb_t *as) {
-    (void)as;
-    // could check labels are resolved...
-
-    #if __ICACHE_PRESENT == 1
-    if (as->base.pass == MP_ASM_PASS_EMIT) {
-        // flush D-cache, so the code emitted is stored in memory
-        MP_HAL_CLEAN_DCACHE(as->base.code_base, as->base.code_size);
-        // invalidate I-cache
-        SCB_InvalidateICache();
-    }
-    #endif
-}
-
 /*
 STATIC void asm_thumb_write_byte_1(asm_thumb_t *as, byte b1) {
     byte *c = asm_thumb_get_cur_to_write_bytes(as, 1);
diff --git a/py/asmthumb.h b/py/asmthumb.h
index 17a0cca98c..1a01d20c69 100644
--- a/py/asmthumb.h
+++ b/py/asmthumb.h
@@ -70,7 +70,9 @@ typedef struct _asm_thumb_t {
     uint32_t stack_adjust;
 } asm_thumb_t;
 
-void asm_thumb_end_pass(asm_thumb_t *as);
+static inline void asm_thumb_end_pass(asm_thumb_t *as) {
+    (void)as;
+}
 
 void asm_thumb_entry(asm_thumb_t *as, int num_locals);
 void asm_thumb_exit(asm_thumb_t *as);
diff --git a/py/emitglue.c b/py/emitglue.c
index 0ef708a3f3..09b48682ff 100644
--- a/py/emitglue.c
+++ b/py/emitglue.c
@@ -108,6 +108,31 @@ void mp_emit_glue_assign_native(mp_raw_code_t *rc, mp_raw_code_kind_t kind, void
 
     assert(kind == MP_CODE_NATIVE_PY || kind == MP_CODE_NATIVE_VIPER || kind == MP_CODE_NATIVE_ASM);
 
+    // Some architectures require flushing/invalidation of the I/D caches,
+    // so that the generated native code which was created in data RAM will
+    // be available for execution from instruction RAM.
+    #if MICROPY_EMIT_THUMB || MICROPY_EMIT_INLINE_THUMB
+    #if __ICACHE_PRESENT == 1
+    // Flush D-cache, so the code emitted is stored in RAM.
+    MP_HAL_CLEAN_DCACHE(fun_data, fun_len);
+    // Invalidate I-cache, so the newly-created code is reloaded from RAM.
+    SCB_InvalidateICache();
+    #endif
+    #elif MICROPY_EMIT_ARM
+    #if (defined(__linux__) && defined(__GNUC__)) || __ARM_ARCH == 7
+    __builtin___clear_cache(fun_data, (uint8_t *)fun_data + fun_len);
+    #elif defined(__arm__)
+    // Flush I-cache and D-cache.
+    asm volatile (
+        "0:"
+        "mrc p15, 0, r15, c7, c10, 3\n" // test and clean D-cache
+        "bne 0b\n"
+        "mov r0, #0\n"
+        "mcr p15, 0, r0, c7, c7, 0\n" // invalidate I-cache and D-cache
+        : : : "r0", "cc");
+    #endif
+    #endif
+
     rc->kind = kind;
     rc->scope_flags = scope_flags;
     rc->n_pos_args = n_pos_args;

From 5e1d3c8b5dff212ced531497a37651571991ddc0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 5 Jun 2021 10:40:48 +1000
Subject: [PATCH 198/349] py/stackctrl: Prevent unused-var warning when stack
 checking disabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/stackctrl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/stackctrl.h b/py/stackctrl.h
index ff8da0ab13..c21288b2b1 100644
--- a/py/stackctrl.h
+++ b/py/stackctrl.h
@@ -40,7 +40,7 @@ void mp_stack_check(void);
 
 #else
 
-#define mp_stack_set_limit(limit)
+#define mp_stack_set_limit(limit) (void)(limit)
 #define MP_STACK_CHECK()
 
 #endif

From 36cb365cadfc9597d10a60c0581268fa47305b69 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 5 Jun 2021 10:36:15 +1000
Subject: [PATCH 199/349] unix/main: Increase stack limit on ARM architectures.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/main.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ports/unix/main.c b/ports/unix/main.c
index e33c1742d8..a5db0869df 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -451,7 +451,13 @@ MP_NOINLINE int main_(int argc, char **argv) {
     signal(SIGPIPE, SIG_IGN);
     #endif
 
-    mp_stack_set_limit(40000 * (sizeof(void *) / 4));
+    // Define a reasonable stack limit to detect stack overflow.
+    mp_uint_t stack_limit = 40000 * (sizeof(void *) / 4);
+    #if defined(__arm__) && !defined(__thumb2__)
+    // ARM (non-Thumb) architectures require more stack.
+    stack_limit *= 2;
+    #endif
+    mp_stack_set_limit(stack_limit);
 
     pre_process_options(argc, argv);
 

From b15e1ef5a6c40b543e2b0d65252ef1475d03005e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 4 Jun 2021 23:40:47 +1000
Subject: [PATCH 200/349] github/workflows: Add workflow to build and run unix
 port on ARM.

Following on from ef16834887de02cbddf414b560e5a2af9cae4b16, this adds a
coverage build and running of the test suite on an ARM 32-bit Linux-based
architecture.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_unix.yml | 14 ++++++++++++++
 tools/ci.sh                      | 25 +++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 5c4a4f3047..c6ddd53037 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -200,3 +200,17 @@ jobs:
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
+
+  qemu_arm:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_unix_qemu_arm_setup
+    - name: Build
+      run: source tools/ci.sh && ci_unix_qemu_arm_build
+    - name: Run main test suite
+      run: source tools/ci.sh && ci_unix_qemu_arm_run_tests
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests.py --print-failures
diff --git a/tools/ci.sh b/tools/ci.sh
index 22b43d4513..e726ae40a7 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -300,6 +300,12 @@ CI_UNIX_OPTS_QEMU_MIPS=(
     LDFLAGS_EXTRA="-static"
 )
 
+CI_UNIX_OPTS_QEMU_ARM=(
+    CROSS_COMPILE=arm-linux-gnueabi-
+    VARIANT=coverage
+    MICROPY_STANDALONE=1
+)
+
 function ci_unix_build_helper {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/unix "$@" submodules
@@ -506,6 +512,25 @@ function ci_unix_qemu_mips_run_tests {
     (cd tests && MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests.py --exclude 'vfs_posix.py' --exclude 'ffi_(callback|float|float2).py')
 }
 
+function ci_unix_qemu_arm_setup {
+    sudo apt-get update
+    sudo apt-get install gcc-arm-linux-gnueabi g++-arm-linux-gnueabi
+    sudo apt-get install qemu-user
+    qemu-arm --version
+}
+
+function ci_unix_qemu_arm_build {
+    ci_unix_build_helper "${CI_UNIX_OPTS_QEMU_ARM[@]}"
+}
+
+function ci_unix_qemu_arm_run_tests {
+    # Issues with ARM tests:
+    # - (i)listdir does not work, it always returns the empty list (it's an issue with the underlying C call)
+    export QEMU_LD_PREFIX=/usr/arm-linux-gnueabi
+    file ./ports/unix/micropython-coverage
+    (cd tests && MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests.py --exclude 'vfs_posix.py')
+}
+
 ########################################################################################
 # ports/windows
 

From f17c0db5f7bedd6653dc4559b3adb6d5c424a648 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Thu, 20 May 2021 20:52:37 -0500
Subject: [PATCH 201/349] zephyr: Update disk access configuration for Zephyr
 v2.6.0.

Zephyr's Kconfig symbols and defaults for SDHC/SDMMC disk drivers and
the disk access subsystem were reworked between Zephyr v2.5.0 and
v2.6.0. Update MicroPython accordingly.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
---
 ports/zephyr/boards/mimxrt1050_evk.conf | 3 +--
 ports/zephyr/main.c                     | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ports/zephyr/boards/mimxrt1050_evk.conf b/ports/zephyr/boards/mimxrt1050_evk.conf
index 051ab7e60b..c4abf726a4 100644
--- a/ports/zephyr/boards/mimxrt1050_evk.conf
+++ b/ports/zephyr/boards/mimxrt1050_evk.conf
@@ -1,9 +1,8 @@
 # Required for zephyr.DiskAccess block devices
 CONFIG_DISK_ACCESS=y
-CONFIG_DISK_ACCESS_SDHC=y
 
 CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_PRODUCT="Zephyr MicroPython"
 CONFIG_USB_MASS_STORAGE=y
-CONFIG_MASS_STORAGE_DISK_NAME="SDHC"
+CONFIG_MASS_STORAGE_DISK_NAME="SDMMC"
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index f8ec0a0d27..7172f37824 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -100,8 +100,8 @@ STATIC void vfs_init(void) {
     const char *mount_point_str = NULL;
     int ret = 0;
 
-    #ifdef CONFIG_DISK_ACCESS_SDHC
-    mp_obj_t args[] = { mp_obj_new_str(CONFIG_DISK_SDHC_VOLUME_NAME, strlen(CONFIG_DISK_SDHC_VOLUME_NAME)) };
+    #ifdef CONFIG_DISK_DRIVER_SDMMC
+    mp_obj_t args[] = { mp_obj_new_str(CONFIG_SDMMC_VOLUME_NAME, strlen(CONFIG_SDMMC_VOLUME_NAME)) };
     bdev = zephyr_disk_access_type.make_new(&zephyr_disk_access_type, ARRAY_SIZE(args), 0, args);
     mount_point_str = "/sd";
     #elif defined(CONFIG_FLASH_MAP) && FLASH_AREA_LABEL_EXISTS(storage)

From 3331b1811d104739121462a30bc3340951965edf Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Thu, 20 May 2021 21:03:25 -0500
Subject: [PATCH 202/349] zephyr: Disable CONFIG_NET_SOCKETS_POSIX_NAMES.

Zephyr's default value for CONFIG_NET_SOCKETS_POSIX_NAMES was changed
from false to true between Zephyr v2.5.0 and v2.6.0. This caused
conflicts in MicroPython, which uses the zsock_ prefixed functions, so
disable it.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
---
 ports/zephyr/prj.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/zephyr/prj.conf b/ports/zephyr/prj.conf
index 9e855036d2..b6559e4f73 100644
--- a/ports/zephyr/prj.conf
+++ b/ports/zephyr/prj.conf
@@ -26,6 +26,7 @@ CONFIG_NET_IPV6=y
 CONFIG_NET_UDP=y
 CONFIG_NET_TCP=y
 CONFIG_NET_SOCKETS=y
+CONFIG_NET_SOCKETS_POSIX_NAMES=n
 CONFIG_TEST_RANDOM_GENERATOR=y
 
 CONFIG_NET_CONFIG_SETTINGS=y

From 5cb2ade65b9540dd1abdbfee944bcb9f1f1c52aa Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Thu, 20 May 2021 21:48:10 -0500
Subject: [PATCH 203/349] zephyr: Update to Zephyr v2.6.0.

Updates the zephyr port build instructions and CI to use the latest
zephyr release tag.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
---
 ports/zephyr/README.md | 6 +++---
 tools/ci.sh            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md
index cdc3c70f0e..9d6c223b47 100644
--- a/ports/zephyr/README.md
+++ b/ports/zephyr/README.md
@@ -4,7 +4,7 @@ MicroPython port to Zephyr RTOS
 This is a work-in-progress port of MicroPython to Zephyr RTOS
 (http://zephyrproject.org).
 
-This port requires Zephyr version v2.5.0, and may also work on higher
+This port requires Zephyr version v2.6.0, and may also work on higher
 versions.  All boards supported
 by Zephyr (with standard level of features support, like UART console)
 should work with MicroPython (but not all were tested).
@@ -38,13 +38,13 @@ setup is correct.
 If you already have Zephyr installed but are having issues building the
 MicroPython port then try installing the correct version of Zephyr via:
 
-    $ west init zephyrproject -m https://github.com/zephyrproject-rtos/zephyr --mr v2.5.0
+    $ west init zephyrproject -m https://github.com/zephyrproject-rtos/zephyr --mr v2.6.0
 
 Alternatively, you don't have to redo the Zephyr installation to just
 switch from master to a tagged release, you can instead do:
 
     $ cd zephyrproject/zephyr
-    $ git checkout v2.5.0
+    $ git checkout v2.6.0
     $ west update
 
 With Zephyr installed you may then need to configure your environment,
diff --git a/tools/ci.sh b/tools/ci.sh
index e726ae40a7..96c1bf89af 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -559,7 +559,7 @@ function ci_zephyr_setup {
 }
 
 function ci_zephyr_install {
-    docker exec zephyr-ci west init --mr v2.5.0 /zephyrproject
+    docker exec zephyr-ci west init --mr v2.6.0 /zephyrproject
     docker exec -w /zephyrproject zephyr-ci west update
     docker exec -w /zephyrproject zephyr-ci west zephyr-export
 }

From 80e79a777de8a43a37964be672da9e2449f4ec53 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 25 Apr 2021 22:30:19 +1000
Subject: [PATCH 204/349] zephyr: Add initial ubluetooth module integration.

Currently only advertising and scanning are supported, using the ring
buffer for events (ie not synchronous events at this stage).

The ble_gap_advertise.py multi-test passes (tested on a nucleo_wb55rg
board).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/CMakeLists.txt        |   1 +
 ports/zephyr/main.c                |   4 +
 ports/zephyr/modbluetooth_zephyr.c | 410 +++++++++++++++++++++++++++++
 ports/zephyr/mpconfigport.h        |  11 +-
 ports/zephyr/src/zephyr_start.c    |   4 +
 5 files changed, 429 insertions(+), 1 deletion(-)
 create mode 100644 ports/zephyr/modbluetooth_zephyr.c

diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index e30759e064..80adea5d86 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -40,6 +40,7 @@ set(MICROPY_SOURCE_PORT
     machine_i2c.c
     machine_pin.c
     machine_uart.c
+    modbluetooth_zephyr.c
     modmachine.c
     moduos.c
     modusocket.c
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index 7172f37824..38285ad944 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -49,6 +49,7 @@
 #include "py/stackctrl.h"
 #include "lib/utils/pyexec.h"
 #include "lib/mp-readline/readline.h"
+#include "extmod/modbluetooth.h"
 
 #if MICROPY_VFS
 #include "extmod/vfs.h"
@@ -168,6 +169,9 @@ soft_reset:
 
     printf("soft reboot\n");
 
+    #if MICROPY_PY_BLUETOOTH
+    mp_bluetooth_deinit();
+    #endif
     #if MICROPY_PY_MACHINE
     machine_pin_deinit();
     #endif
diff --git a/ports/zephyr/modbluetooth_zephyr.c b/ports/zephyr/modbluetooth_zephyr.c
new file mode 100644
index 0000000000..6b3a10d471
--- /dev/null
+++ b/ports/zephyr/modbluetooth_zephyr.c
@@ -0,0 +1,410 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019-2021 Damien P. George
+ * Copyright (c) 2019-2020 Jim Mussared
+ *
+ * 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/runtime.h"
+#include "py/mperrno.h"
+#include "py/mphal.h"
+
+#if MICROPY_PY_BLUETOOTH
+
+#include <bluetooth/bluetooth.h>
+#include <bluetooth/hci.h>
+#include "extmod/modbluetooth.h"
+
+#define DEBUG_printf(...) // printk("BLE: " __VA_ARGS__)
+
+#define BLE_HCI_SCAN_ITVL_MIN 0x10
+#define BLE_HCI_SCAN_ITVL_MAX 0xffff
+#define BLE_HCI_SCAN_WINDOW_MIN 0x10
+#define BLE_HCI_SCAN_WINDOW_MAX 0xffff
+
+#define ERRNO_BLUETOOTH_NOT_ACTIVE MP_ENODEV
+
+enum {
+    MP_BLUETOOTH_ZEPHYR_BLE_STATE_OFF,
+    MP_BLUETOOTH_ZEPHYR_BLE_STATE_ACTIVE,
+    MP_BLUETOOTH_ZEPHYR_BLE_STATE_SUSPENDED,
+};
+
+enum {
+    MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_INACTIVE,
+    MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_DEACTIVATING,
+    MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_ACTIVE,
+};
+
+typedef struct _mp_bluetooth_zephyr_root_pointers_t {
+    // Characteristic (and descriptor) value storage.
+    mp_gatts_db_t gatts_db;
+} mp_bluetooth_zephyr_root_pointers_t;
+
+STATIC int mp_bluetooth_zephyr_ble_state;
+
+#if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+STATIC int mp_bluetooth_zephyr_gap_scan_state;
+STATIC struct k_timer mp_bluetooth_zephyr_gap_scan_timer;
+STATIC struct bt_le_scan_cb mp_bluetooth_zephyr_gap_scan_cb_struct;
+#endif
+
+STATIC int bt_err_to_errno(int err) {
+    // Zephyr uses errno codes directly, but they are negative.
+    return -err;
+}
+
+// modbluetooth (and the layers above it) work in BE for addresses, Zephyr works in LE.
+STATIC void reverse_addr_byte_order(uint8_t *addr_out, const bt_addr_le_t *addr_in) {
+    for (int i = 0; i < 6; ++i) {
+        addr_out[i] = addr_in->a.val[5 - i];
+    }
+}
+
+#if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+void gap_scan_cb_recv(const struct bt_le_scan_recv_info *info, struct net_buf_simple *buf) {
+    DEBUG_printf("gap_scan_cb_recv: adv_type=%d\n", info->adv_type);
+
+    if (!mp_bluetooth_is_active()) {
+        return;
+    }
+
+    if (mp_bluetooth_zephyr_gap_scan_state != MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_ACTIVE) {
+        return;
+    }
+
+    uint8_t addr[6];
+    reverse_addr_byte_order(addr, info->addr);
+    mp_bluetooth_gap_on_scan_result(info->addr->type, addr, info->adv_type, info->rssi, buf->data, buf->len);
+}
+
+STATIC mp_obj_t gap_scan_stop(mp_obj_t unused) {
+    (void)unused;
+    mp_bluetooth_gap_scan_stop();
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(gap_scan_stop_obj, gap_scan_stop);
+
+void gap_scan_cb_timeout(struct k_timer *timer_id) {
+    DEBUG_printf("gap_scan_cb_timeout\n");
+    // Cannot call bt_le_scan_stop from a timer callback because this callback may be
+    // preempting the BT stack.  So schedule it to be called from the main thread.
+    while (!mp_sched_schedule(MP_OBJ_FROM_PTR(&gap_scan_stop_obj), mp_const_none)) {
+        k_yield();
+    }
+    // Indicate scanning has stopped so that no more scan result events are generated
+    // (they may still come in until bt_le_scan_stop is called by gap_scan_stop).
+    mp_bluetooth_zephyr_gap_scan_state = MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_DEACTIVATING;
+}
+#endif
+
+int mp_bluetooth_init(void) {
+    DEBUG_printf("mp_bluetooth_init\n");
+
+    // Clean up if necessary.
+    mp_bluetooth_deinit();
+
+    // Allocate memory for state.
+    MP_STATE_PORT(bluetooth_zephyr_root_pointers) = m_new0(mp_bluetooth_zephyr_root_pointers_t, 1);
+    mp_bluetooth_gatts_db_create(&MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db);
+
+    #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+    mp_bluetooth_zephyr_gap_scan_state = MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_INACTIVE;
+    k_timer_init(&mp_bluetooth_zephyr_gap_scan_timer, gap_scan_cb_timeout, NULL);
+    mp_bluetooth_zephyr_gap_scan_cb_struct.recv = gap_scan_cb_recv;
+    mp_bluetooth_zephyr_gap_scan_cb_struct.timeout = NULL; // currently not implemented in Zephyr
+    bt_le_scan_cb_register(&mp_bluetooth_zephyr_gap_scan_cb_struct);
+    #endif
+
+    if (mp_bluetooth_zephyr_ble_state == MP_BLUETOOTH_ZEPHYR_BLE_STATE_OFF) {
+        // bt_enable can only be called once.
+        int ret = bt_enable(NULL);
+        if (ret) {
+            return bt_err_to_errno(ret);
+        }
+    }
+
+    mp_bluetooth_zephyr_ble_state = MP_BLUETOOTH_ZEPHYR_BLE_STATE_ACTIVE;
+
+    DEBUG_printf("mp_bluetooth_init: ready\n");
+
+    return 0;
+}
+
+void mp_bluetooth_deinit(void) {
+    DEBUG_printf("mp_bluetooth_deinit %d\n", mp_bluetooth_zephyr_ble_state);
+    if (mp_bluetooth_zephyr_ble_state == MP_BLUETOOTH_ZEPHYR_BLE_STATE_OFF
+        || mp_bluetooth_zephyr_ble_state == MP_BLUETOOTH_ZEPHYR_BLE_STATE_SUSPENDED) {
+        return;
+    }
+
+    mp_bluetooth_gap_advertise_stop();
+
+    #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+    mp_bluetooth_gap_scan_stop();
+    bt_le_scan_cb_unregister(&mp_bluetooth_zephyr_gap_scan_cb_struct);
+    #endif
+
+    // There is no way to turn off the BT stack in Zephyr, so just set the
+    // state as suspended so it can be correctly reactivated later.
+    mp_bluetooth_zephyr_ble_state = MP_BLUETOOTH_ZEPHYR_BLE_STATE_SUSPENDED;
+
+    MP_STATE_PORT(bluetooth_zephyr_root_pointers) = NULL;
+}
+
+bool mp_bluetooth_is_active(void) {
+    return mp_bluetooth_zephyr_ble_state == MP_BLUETOOTH_ZEPHYR_BLE_STATE_ACTIVE;
+}
+
+void mp_bluetooth_get_current_address(uint8_t *addr_type, uint8_t *addr) {
+    if (!mp_bluetooth_is_active()) {
+        mp_raise_OSError(ERRNO_BLUETOOTH_NOT_ACTIVE);
+    }
+    bt_addr_le_t le_addr;
+    size_t count = 1;
+    bt_id_get(&le_addr, &count);
+    if (count == 0) {
+        mp_raise_OSError(EIO);
+    }
+    reverse_addr_byte_order(addr, &le_addr);
+    *addr_type = le_addr.type;
+}
+
+void mp_bluetooth_set_address_mode(uint8_t addr_mode) {
+    // TODO: implement
+}
+
+size_t mp_bluetooth_gap_get_device_name(const uint8_t **buf) {
+    const char *name = bt_get_name();
+    *buf = (const uint8_t *)name;
+    return strlen(name);
+}
+
+int mp_bluetooth_gap_set_device_name(const uint8_t *buf, size_t len) {
+    char tmp_buf[CONFIG_BT_DEVICE_NAME_MAX + 1];
+    if (len + 1 > sizeof(tmp_buf)) {
+        return MP_EINVAL;
+    }
+    memcpy(tmp_buf, buf, len);
+    tmp_buf[len] = '\0';
+    return bt_err_to_errno(bt_set_name(tmp_buf));
+}
+
+// Zephyr takes advertising/scan data as an array of (type, len, payload) packets,
+// and this function constructs such an array from raw advertising/scan data.
+STATIC void mp_bluetooth_prepare_bt_data(const uint8_t *data, size_t len, struct bt_data *bt_data, size_t *bt_len) {
+    size_t i = 0;
+    const uint8_t *d = data;
+    while (d < data + len && i < *bt_len) {
+        bt_data[i].type = d[1];
+        bt_data[i].data_len = d[0] - 1;
+        bt_data[i].data = &d[2];
+        i += 1;
+        d += 1 + d[0];
+    }
+    *bt_len = i;
+}
+
+int mp_bluetooth_gap_advertise_start(bool connectable, int32_t interval_us, const uint8_t *adv_data, size_t adv_data_len, const uint8_t *sr_data, size_t sr_data_len) {
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+
+    mp_bluetooth_gap_advertise_stop();
+
+    struct bt_data bt_ad_data[8];
+    size_t bt_ad_len = 0;
+    if (adv_data) {
+        bt_ad_len = MP_ARRAY_SIZE(bt_ad_data);
+        mp_bluetooth_prepare_bt_data(adv_data, adv_data_len, bt_ad_data, &bt_ad_len);
+    }
+
+    struct bt_data bt_sd_data[8];
+    size_t bt_sd_len = 0;
+    if (sr_data) {
+        bt_sd_len = MP_ARRAY_SIZE(bt_sd_data);
+        mp_bluetooth_prepare_bt_data(sr_data, sr_data_len, bt_sd_data, &bt_sd_len);
+    }
+
+    struct bt_le_adv_param param = {
+        .id = 0,
+        .sid = 0,
+        .secondary_max_skip = 0,
+        .options = (connectable ? BT_LE_ADV_OPT_CONNECTABLE : 0)
+            | BT_LE_ADV_OPT_ONE_TIME
+            | BT_LE_ADV_OPT_USE_IDENTITY
+            | BT_LE_ADV_OPT_SCANNABLE,
+        .interval_min = interval_us / 625,
+        .interval_max = interval_us / 625 + 1, // min/max cannot be the same value
+        .peer = NULL,
+    };
+
+    return bt_err_to_errno(bt_le_adv_start(&param, bt_ad_data, bt_ad_len, bt_sd_data, bt_sd_len));
+}
+
+void mp_bluetooth_gap_advertise_stop(void) {
+    // Note: bt_le_adv_stop returns 0 if adv is already stopped.
+    int ret = bt_le_adv_stop();
+    if (ret != 0) {
+        mp_raise_OSError(bt_err_to_errno(ret));
+    }
+}
+
+int mp_bluetooth_gatts_register_service_begin(bool append) {
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+
+    if (append) {
+        // Don't support append yet (modbluetooth.c doesn't support it yet anyway).
+        return MP_EOPNOTSUPP;
+    }
+
+    // Reset the gatt characteristic value db.
+    mp_bluetooth_gatts_db_reset(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db);
+
+    return MP_EOPNOTSUPP;
+}
+
+int mp_bluetooth_gatts_register_service_end(void) {
+    return MP_EOPNOTSUPP;
+}
+
+int mp_bluetooth_gatts_register_service(mp_obj_bluetooth_uuid_t *service_uuid, mp_obj_bluetooth_uuid_t **characteristic_uuids, uint16_t *characteristic_flags, mp_obj_bluetooth_uuid_t **descriptor_uuids, uint16_t *descriptor_flags, uint8_t *num_descriptors, uint16_t *handles, size_t num_characteristics) {
+    return MP_EOPNOTSUPP;
+}
+
+int mp_bluetooth_gap_disconnect(uint16_t conn_handle) {
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+    return MP_EOPNOTSUPP;
+}
+
+int mp_bluetooth_gatts_read(uint16_t value_handle, uint8_t **value, size_t *value_len) {
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+    return mp_bluetooth_gatts_db_read(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db, value_handle, value, value_len);
+}
+
+int mp_bluetooth_gatts_write(uint16_t value_handle, const uint8_t *value, size_t value_len) {
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+    return mp_bluetooth_gatts_db_write(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db, value_handle, value, value_len);
+}
+
+int mp_bluetooth_gatts_notify(uint16_t conn_handle, uint16_t value_handle) {
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+    return MP_EOPNOTSUPP;
+}
+
+int mp_bluetooth_gatts_notify_send(uint16_t conn_handle, uint16_t value_handle, const uint8_t *value, size_t value_len) {
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+    return MP_EOPNOTSUPP;
+}
+
+int mp_bluetooth_gatts_indicate(uint16_t conn_handle, uint16_t value_handle) {
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+    return MP_EOPNOTSUPP;
+}
+
+int mp_bluetooth_gatts_set_buffer(uint16_t value_handle, size_t len, bool append) {
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+    return MP_EOPNOTSUPP;
+}
+
+int mp_bluetooth_get_preferred_mtu(void) {
+    if (!mp_bluetooth_is_active()) {
+        mp_raise_OSError(ERRNO_BLUETOOTH_NOT_ACTIVE);
+    }
+    mp_raise_OSError(MP_EOPNOTSUPP);
+}
+
+int mp_bluetooth_set_preferred_mtu(uint16_t mtu) {
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+    return MP_EOPNOTSUPP;
+}
+
+#if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+
+int mp_bluetooth_gap_scan_start(int32_t duration_ms, int32_t interval_us, int32_t window_us, bool active_scan) {
+    // Stop any ongoing GAP scan.
+    int ret = mp_bluetooth_gap_scan_stop();
+    if (ret) {
+        return ret;
+    }
+
+    struct bt_le_scan_param param = {
+        .type = active_scan ? BT_HCI_LE_SCAN_ACTIVE : BT_HCI_LE_SCAN_PASSIVE,
+        .options = BT_LE_SCAN_OPT_NONE,
+        .interval = MAX(BLE_HCI_SCAN_ITVL_MIN, MIN(BLE_HCI_SCAN_ITVL_MAX, interval_us / 625)),
+        .window = MAX(BLE_HCI_SCAN_WINDOW_MIN, MIN(BLE_HCI_SCAN_WINDOW_MAX, window_us / 625)),
+    };
+    k_timer_start(&mp_bluetooth_zephyr_gap_scan_timer, K_MSEC(duration_ms), K_NO_WAIT);
+    mp_bluetooth_zephyr_gap_scan_state = MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_ACTIVE;
+    int err = bt_le_scan_start(&param, NULL);
+    return bt_err_to_errno(err);
+}
+
+int mp_bluetooth_gap_scan_stop(void) {
+    DEBUG_printf("mp_bluetooth_gap_scan_stop\n");
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+    if (mp_bluetooth_zephyr_gap_scan_state == MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_INACTIVE) {
+        // Already stopped.
+        return 0;
+    }
+    mp_bluetooth_zephyr_gap_scan_state = MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_INACTIVE;
+    k_timer_stop(&mp_bluetooth_zephyr_gap_scan_timer);
+    int err = bt_le_scan_stop();
+    if (err == 0) {
+        mp_bluetooth_gap_on_scan_complete();
+        return 0;
+    }
+    return bt_err_to_errno(err);
+}
+
+int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr, int32_t duration_ms) {
+    DEBUG_printf("mp_bluetooth_gap_peripheral_connect\n");
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+    return MP_EOPNOTSUPP;
+}
+
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+
+#endif // MICROPY_PY_BLUETOOTH
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 162ac8a576..c7f4653003 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -52,6 +52,7 @@
 #define MICROPY_PY_BUILTINS_REVERSED (0)
 #define MICROPY_PY_BUILTINS_SET     (0)
 #define MICROPY_PY_BUILTINS_STR_COUNT (0)
+#define MICROPY_PY_BUILTINS_MEMORYVIEW (1)
 #define MICROPY_PY_BUILTINS_HELP    (1)
 #define MICROPY_PY_BUILTINS_HELP_TEXT zephyr_help_text
 #define MICROPY_PY_ARRAY            (0)
@@ -69,6 +70,13 @@
 #define MICROPY_PY_UERRNO           (1)
 #define MICROPY_PY_USOCKET          (1)
 #endif
+#ifdef CONFIG_BT
+#define MICROPY_PY_BLUETOOTH        (1)
+#ifdef CONFIG_BT_CENTRAL
+#define MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE (1)
+#endif
+#define MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT (0)
+#endif
 #define MICROPY_PY_UBINASCII        (1)
 #define MICROPY_PY_UHASHLIB         (1)
 #define MICROPY_PY_UOS              (1)
@@ -123,7 +131,8 @@ typedef long mp_off_t;
 
 #define MICROPY_PORT_ROOT_POINTERS \
     const char *readline_hist[8]; \
-    void *machine_pin_irq_list; /* Linked list of pin irq objects */
+    void *machine_pin_irq_list; /* Linked list of pin irq objects */ \
+    struct _mp_bluetooth_zephyr_root_pointers_t *bluetooth_zephyr_root_pointers;
 
 extern const struct _mp_obj_module_t mp_module_machine;
 extern const struct _mp_obj_module_t mp_module_time;
diff --git a/ports/zephyr/src/zephyr_start.c b/ports/zephyr/src/zephyr_start.c
index 2e0993451b..62ee922a86 100644
--- a/ports/zephyr/src/zephyr_start.c
+++ b/ports/zephyr/src/zephyr_start.c
@@ -36,4 +36,8 @@ void main(void) {
     zephyr_getchar_init();
 #endif
     real_main();
+
+    // This is needed so the linker includes k_timer_init, z_impl_k_timer_start
+    // and z_impl_k_timer_stop, as used by libmicropython.a.
+    k_timer_start(NULL, K_MSEC(0), K_MSEC(0));
 }

From d00523ba0c04348d6b733c80a5d8a92468cde536 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 25 Apr 2021 22:30:45 +1000
Subject: [PATCH 205/349] zephyr/boards: Enable ubluetooth on nucleo_wb55rg
 board.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/boards/nucleo_wb55rg.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/zephyr/boards/nucleo_wb55rg.conf b/ports/zephyr/boards/nucleo_wb55rg.conf
index 369dabddeb..baf0f28075 100644
--- a/ports/zephyr/boards/nucleo_wb55rg.conf
+++ b/ports/zephyr/boards/nucleo_wb55rg.conf
@@ -1,2 +1,6 @@
 CONFIG_CONSOLE_SUBSYS=n
 CONFIG_NETWORKING=n
+CONFIG_BT=y
+CONFIG_BT_DEVICE_NAME_DYNAMIC=y
+CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_CENTRAL=y

From da8e47da21caba25994b6160ef8a2095ca1871ac Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 26 Apr 2021 00:37:11 +1000
Subject: [PATCH 206/349] tests/run-multitests.py: Allow to work without
 sys.stdout on target.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-multitests.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/run-multitests.py b/tests/run-multitests.py
index 66ca799675..b4afc1e526 100755
--- a/tests/run-multitests.py
+++ b/tests/run-multitests.py
@@ -32,8 +32,10 @@ import sys
 class multitest:
     @staticmethod
     def flush():
-        if hasattr(sys.stdout, "flush"):
+        try:
             sys.stdout.flush()
+        except AttributeError:
+            pass
     @staticmethod
     def skip():
         print("SKIP")

From 784208543448e8022b185a82015e107f04960738 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 26 Apr 2021 00:37:36 +1000
Subject: [PATCH 207/349] tests/multi_bluetooth/ble_gap_advertise.py: Allow to
 work without set.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/multi_bluetooth/ble_gap_advertise.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/multi_bluetooth/ble_gap_advertise.py b/tests/multi_bluetooth/ble_gap_advertise.py
index bb1ef94a71..67c8bf4593 100644
--- a/tests/multi_bluetooth/ble_gap_advertise.py
+++ b/tests/multi_bluetooth/ble_gap_advertise.py
@@ -30,14 +30,14 @@ def instance0():
 def instance1():
     multitest.next()
     finished = False
-    adv_types = set()
+    adv_types = {}
     adv_data = None
 
     def irq(ev, data):
         nonlocal finished, adv_types, adv_data
         if ev == _IRQ_SCAN_RESULT:
             if data[0] == BDADDR[0] and data[1] == BDADDR[1]:
-                adv_types.add(data[2])
+                adv_types[data[2]] = True
                 if adv_data is None:
                     adv_data = bytes(data[4])
                 else:

From 20a8f4f7ec2f691e2381a150ac6e246df9c58077 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 5 Jun 2021 22:28:05 +1000
Subject: [PATCH 208/349] tests/unix: Add ffi test for integer types.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/unix/ffi_lib.c        |  33 +++++++++
 tests/unix/ffi_types.py     |  51 ++++++++++++++
 tests/unix/ffi_types.py.exp | 136 ++++++++++++++++++++++++++++++++++++
 tools/ci.sh                 |  10 +++
 4 files changed, 230 insertions(+)
 create mode 100644 tests/unix/ffi_lib.c
 create mode 100644 tests/unix/ffi_types.py
 create mode 100644 tests/unix/ffi_types.py.exp

diff --git a/tests/unix/ffi_lib.c b/tests/unix/ffi_lib.c
new file mode 100644
index 0000000000..35340536ae
--- /dev/null
+++ b/tests/unix/ffi_lib.c
@@ -0,0 +1,33 @@
+#include <stdint.h>
+
+int8_t f8i(int8_t x) {
+    return x ^ 1;
+}
+
+uint8_t f8u(uint8_t x) {
+    return x ^ 1;
+}
+
+int16_t f16i(int16_t x) {
+    return x ^ 1;
+}
+
+uint16_t f16u(uint16_t x) {
+    return x ^ 1;
+}
+
+int32_t f32i(int32_t x) {
+    return x ^ 1;
+}
+
+uint32_t f32u(uint32_t x) {
+    return x ^ 1;
+}
+
+int64_t f64i(int64_t x) {
+    return x ^ 1;
+}
+
+uint64_t f64u(uint64_t x) {
+    return x ^ 1;
+}
diff --git a/tests/unix/ffi_types.py b/tests/unix/ffi_types.py
new file mode 100644
index 0000000000..fd94c509d0
--- /dev/null
+++ b/tests/unix/ffi_types.py
@@ -0,0 +1,51 @@
+# test 8/16/32/64 bit signed/unsigned integer arguments and return types for ffi functions
+# requires ffi_lib.c to be compiled as: $(CC) -shared -o ffi_lib.so ffi_lib.c
+
+import uos, usys
+
+try:
+    import ffi
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+ffi_lib_filename = "./" + usys.argv[0].rsplit("/", 1)[0] + "/ffi_lib.so"
+try:
+    uos.stat(ffi_lib_filename)
+except OSError:
+    print("SKIP")
+    raise SystemExit
+
+ffi_lib = ffi.open(ffi_lib_filename)
+
+f8i = ffi_lib.func("b", "f8i", "b")
+f8u = ffi_lib.func("B", "f8u", "B")
+f16i = ffi_lib.func("h", "f16i", "h")
+f16u = ffi_lib.func("H", "f16u", "H")
+f32i = ffi_lib.func("i", "f32i", "i")
+f32u = ffi_lib.func("I", "f32u", "I")
+f64i = ffi_lib.func("q", "f64i", "q")
+f64u = ffi_lib.func("Q", "f64u", "Q")
+
+for func_name in ("f8i", "f8u", "f16i", "f16u", "f32i", "f32u", "f64i", "f64u"):
+    func = globals()[func_name]
+    for val in (
+        0,
+        0x7F,
+        0x80,
+        0xFF,
+        0x100,
+        0x7FFF,
+        0x8000,
+        0xFFFF,
+        0x10000,
+        0x7FFFFFFF,
+        0x80000000,
+        0xFFFFFFFF,
+        0x100000000,
+        0x7FFF_FFFF_FFFF_FFFF,
+        0x8000_0000_0000_0000,
+        0xFFFF_FFFF_FFFF_FFFF,
+        0x1_0000_0000_0000_0000,
+    ):
+        print("{}({:x}) = {:x}".format(func_name, val, func(val)))
diff --git a/tests/unix/ffi_types.py.exp b/tests/unix/ffi_types.py.exp
new file mode 100644
index 0000000000..d6324477d6
--- /dev/null
+++ b/tests/unix/ffi_types.py.exp
@@ -0,0 +1,136 @@
+f8i(0) = 1
+f8i(7f) = 7e
+f8i(80) = -7f
+f8i(ff) = -2
+f8i(100) = 1
+f8i(7fff) = -2
+f8i(8000) = 1
+f8i(ffff) = -2
+f8i(10000) = 1
+f8i(7fffffff) = -2
+f8i(80000000) = 1
+f8i(ffffffff) = -2
+f8i(100000000) = 1
+f8i(7fffffffffffffff) = -2
+f8i(8000000000000000) = 1
+f8i(ffffffffffffffff) = -2
+f8i(10000000000000000) = 1
+f8u(0) = 1
+f8u(7f) = 7e
+f8u(80) = 81
+f8u(ff) = fe
+f8u(100) = 1
+f8u(7fff) = fe
+f8u(8000) = 1
+f8u(ffff) = fe
+f8u(10000) = 1
+f8u(7fffffff) = fe
+f8u(80000000) = 1
+f8u(ffffffff) = fe
+f8u(100000000) = 1
+f8u(7fffffffffffffff) = fe
+f8u(8000000000000000) = 1
+f8u(ffffffffffffffff) = fe
+f8u(10000000000000000) = 1
+f16i(0) = 1
+f16i(7f) = 7e
+f16i(80) = 81
+f16i(ff) = fe
+f16i(100) = 101
+f16i(7fff) = 7ffe
+f16i(8000) = -7fff
+f16i(ffff) = -2
+f16i(10000) = 1
+f16i(7fffffff) = -2
+f16i(80000000) = 1
+f16i(ffffffff) = -2
+f16i(100000000) = 1
+f16i(7fffffffffffffff) = -2
+f16i(8000000000000000) = 1
+f16i(ffffffffffffffff) = -2
+f16i(10000000000000000) = 1
+f16u(0) = 1
+f16u(7f) = 7e
+f16u(80) = 81
+f16u(ff) = fe
+f16u(100) = 101
+f16u(7fff) = 7ffe
+f16u(8000) = 8001
+f16u(ffff) = fffe
+f16u(10000) = 1
+f16u(7fffffff) = fffe
+f16u(80000000) = 1
+f16u(ffffffff) = fffe
+f16u(100000000) = 1
+f16u(7fffffffffffffff) = fffe
+f16u(8000000000000000) = 1
+f16u(ffffffffffffffff) = fffe
+f16u(10000000000000000) = 1
+f32i(0) = 1
+f32i(7f) = 7e
+f32i(80) = 81
+f32i(ff) = fe
+f32i(100) = 101
+f32i(7fff) = 7ffe
+f32i(8000) = 8001
+f32i(ffff) = fffe
+f32i(10000) = 10001
+f32i(7fffffff) = 7ffffffe
+f32i(80000000) = -7fffffff
+f32i(ffffffff) = -2
+f32i(100000000) = 1
+f32i(7fffffffffffffff) = -2
+f32i(8000000000000000) = 1
+f32i(ffffffffffffffff) = -2
+f32i(10000000000000000) = 1
+f32u(0) = 1
+f32u(7f) = 7e
+f32u(80) = 81
+f32u(ff) = fe
+f32u(100) = 101
+f32u(7fff) = 7ffe
+f32u(8000) = 8001
+f32u(ffff) = fffe
+f32u(10000) = 10001
+f32u(7fffffff) = 7ffffffe
+f32u(80000000) = 80000001
+f32u(ffffffff) = fffffffe
+f32u(100000000) = 1
+f32u(7fffffffffffffff) = fffffffe
+f32u(8000000000000000) = 1
+f32u(ffffffffffffffff) = fffffffe
+f32u(10000000000000000) = 1
+f64i(0) = 1
+f64i(7f) = 7e
+f64i(80) = 81
+f64i(ff) = fe
+f64i(100) = 101
+f64i(7fff) = 7ffe
+f64i(8000) = 8001
+f64i(ffff) = fffe
+f64i(10000) = 10001
+f64i(7fffffff) = 7ffffffe
+f64i(80000000) = 80000001
+f64i(ffffffff) = fffffffe
+f64i(100000000) = 100000001
+f64i(7fffffffffffffff) = 7ffffffffffffffe
+f64i(8000000000000000) = -7fffffffffffffff
+f64i(ffffffffffffffff) = -2
+f64i(10000000000000000) = 1
+f64u(0) = 1
+f64u(7f) = 7e
+f64u(80) = 81
+f64u(ff) = fe
+f64u(100) = 101
+f64u(7fff) = 7ffe
+f64u(8000) = 8001
+f64u(ffff) = fffe
+f64u(10000) = 10001
+f64u(7fffffff) = 7ffffffe
+f64u(80000000) = 80000001
+f64u(ffffffff) = fffffffe
+f64u(100000000) = 100000001
+f64u(7fffffffffffffff) = 7ffffffffffffffe
+f64u(8000000000000000) = 8000000000000001
+f64u(ffffffffffffffff) = fffffffffffffffe
+f64u(10000000000000000) = 1
diff --git a/tools/ci.sh b/tools/ci.sh
index 96c1bf89af..3039573322 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -313,6 +313,10 @@ function ci_unix_build_helper {
     make ${MAKEOPTS} -C ports/unix "$@"
 }
 
+function ci_unix_build_ffi_lib_helper {
+    $1 $2 -shared -o tests/unix/ffi_lib.so tests/unix/ffi_lib.c
+}
+
 function ci_unix_run_tests_helper {
     make -C ports/unix "$@" test
 }
@@ -359,6 +363,7 @@ function ci_unix_minimal_run_tests {
 
 function ci_unix_standard_build {
     ci_unix_build_helper VARIANT=standard
+    ci_unix_build_ffi_lib_helper gcc
 }
 
 function ci_unix_standard_run_tests {
@@ -379,6 +384,7 @@ function ci_unix_coverage_setup {
 
 function ci_unix_coverage_build {
     ci_unix_build_helper VARIANT=coverage
+    ci_unix_build_ffi_lib_helper gcc
 }
 
 function ci_unix_coverage_run_tests {
@@ -403,6 +409,7 @@ function ci_unix_32bit_setup {
 
 function ci_unix_coverage_32bit_build {
     ci_unix_build_helper VARIANT=coverage MICROPY_FORCE_32BIT=1
+    ci_unix_build_ffi_lib_helper gcc -m32
 }
 
 function ci_unix_coverage_32bit_run_tests {
@@ -416,6 +423,7 @@ function ci_unix_coverage_32bit_run_native_mpy_tests {
 function ci_unix_nanbox_build {
     # Use Python 2 to check that it can run the build scripts
     ci_unix_build_helper PYTHON=python2 VARIANT=nanbox
+    ci_unix_build_ffi_lib_helper gcc -m32
 }
 
 function ci_unix_nanbox_run_tests {
@@ -424,6 +432,7 @@ function ci_unix_nanbox_run_tests {
 
 function ci_unix_float_build {
     ci_unix_build_helper VARIANT=standard CFLAGS_EXTRA="-DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT"
+    ci_unix_build_ffi_lib_helper gcc
 }
 
 function ci_unix_float_run_tests {
@@ -521,6 +530,7 @@ function ci_unix_qemu_arm_setup {
 
 function ci_unix_qemu_arm_build {
     ci_unix_build_helper "${CI_UNIX_OPTS_QEMU_ARM[@]}"
+    ci_unix_build_ffi_lib_helper arm-linux-gnueabi-gcc
 }
 
 function ci_unix_qemu_arm_run_tests {

From f2149edbd2990dad4186be68b55228b1238ea9a8 Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Mon, 7 Jun 2021 12:48:12 -0400
Subject: [PATCH 209/349] Add deinit to new boards

---
 ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c    | 3 +++
 ports/raspberrypi/boards/adafruit_qt2040_trinkey/board.c     | 3 +++
 ports/raspberrypi/boards/arduino_nano_rp2040_connect/board.c | 3 +++
 ports/raspberrypi/boards/pimoroni_keybow2040/board.c         | 3 ---
 ports/raspberrypi/boards/pimoroni_picolipo_16mb/board.c      | 3 ---
 ports/raspberrypi/boards/pimoroni_picolipo_4mb/board.c       | 3 ---
 ports/raspberrypi/boards/pimoroni_picosystem/board.c         | 3 ---
 ports/raspberrypi/boards/pimoroni_tiny2040/board.c           | 3 +++
 ports/raspberrypi/boards/sparkfun_micromod_rp2040/board.c    | 3 +++
 9 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c b/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c
index c4021a83e9..eac54ce460 100644
--- a/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c
+++ b/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c
@@ -38,3 +38,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/adafruit_qt2040_trinkey/board.c b/ports/raspberrypi/boards/adafruit_qt2040_trinkey/board.c
index c4021a83e9..eac54ce460 100644
--- a/ports/raspberrypi/boards/adafruit_qt2040_trinkey/board.c
+++ b/ports/raspberrypi/boards/adafruit_qt2040_trinkey/board.c
@@ -38,3 +38,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/arduino_nano_rp2040_connect/board.c b/ports/raspberrypi/boards/arduino_nano_rp2040_connect/board.c
index 67486d4c23..de6e424ed9 100644
--- a/ports/raspberrypi/boards/arduino_nano_rp2040_connect/board.c
+++ b/ports/raspberrypi/boards/arduino_nano_rp2040_connect/board.c
@@ -35,3 +35,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/pimoroni_keybow2040/board.c b/ports/raspberrypi/boards/pimoroni_keybow2040/board.c
index 492703e3a1..de6e424ed9 100644
--- a/ports/raspberrypi/boards/pimoroni_keybow2040/board.c
+++ b/ports/raspberrypi/boards/pimoroni_keybow2040/board.c
@@ -38,6 +38,3 @@ void reset_board(void) {
 
 void board_deinit(void) {
 }
-
-void board_deinit(void) {
-}
diff --git a/ports/raspberrypi/boards/pimoroni_picolipo_16mb/board.c b/ports/raspberrypi/boards/pimoroni_picolipo_16mb/board.c
index 492703e3a1..de6e424ed9 100644
--- a/ports/raspberrypi/boards/pimoroni_picolipo_16mb/board.c
+++ b/ports/raspberrypi/boards/pimoroni_picolipo_16mb/board.c
@@ -38,6 +38,3 @@ void reset_board(void) {
 
 void board_deinit(void) {
 }
-
-void board_deinit(void) {
-}
diff --git a/ports/raspberrypi/boards/pimoroni_picolipo_4mb/board.c b/ports/raspberrypi/boards/pimoroni_picolipo_4mb/board.c
index 492703e3a1..de6e424ed9 100644
--- a/ports/raspberrypi/boards/pimoroni_picolipo_4mb/board.c
+++ b/ports/raspberrypi/boards/pimoroni_picolipo_4mb/board.c
@@ -38,6 +38,3 @@ void reset_board(void) {
 
 void board_deinit(void) {
 }
-
-void board_deinit(void) {
-}
diff --git a/ports/raspberrypi/boards/pimoroni_picosystem/board.c b/ports/raspberrypi/boards/pimoroni_picosystem/board.c
index 492703e3a1..de6e424ed9 100644
--- a/ports/raspberrypi/boards/pimoroni_picosystem/board.c
+++ b/ports/raspberrypi/boards/pimoroni_picosystem/board.c
@@ -38,6 +38,3 @@ void reset_board(void) {
 
 void board_deinit(void) {
 }
-
-void board_deinit(void) {
-}
diff --git a/ports/raspberrypi/boards/pimoroni_tiny2040/board.c b/ports/raspberrypi/boards/pimoroni_tiny2040/board.c
index 67486d4c23..de6e424ed9 100644
--- a/ports/raspberrypi/boards/pimoroni_tiny2040/board.c
+++ b/ports/raspberrypi/boards/pimoroni_tiny2040/board.c
@@ -35,3 +35,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/sparkfun_micromod_rp2040/board.c b/ports/raspberrypi/boards/sparkfun_micromod_rp2040/board.c
index c4021a83e9..eac54ce460 100644
--- a/ports/raspberrypi/boards/sparkfun_micromod_rp2040/board.c
+++ b/ports/raspberrypi/boards/sparkfun_micromod_rp2040/board.c
@@ -38,3 +38,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}

From b6a268fca44638db1683369cbeadd5eb9c968922 Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Mon, 7 Jun 2021 14:13:59 -0400
Subject: [PATCH 210/349] Further deinit additions

---
 locale/circuitpython.pot                                | 3 ++-
 ports/raspberrypi/boards/cytron_maker_pi_rp2040/board.c | 3 +++
 ports/raspberrypi/boards/pimoroni_pga2040/board.c       | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 0031641588..d1c27c180a 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -3828,7 +3828,8 @@ msgstr ""
 #: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h
 #: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h
 #: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
-#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h
+#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h
+#: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h
 #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h
 #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h
 #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
diff --git a/ports/raspberrypi/boards/cytron_maker_pi_rp2040/board.c b/ports/raspberrypi/boards/cytron_maker_pi_rp2040/board.c
index e68ca62414..b583e7bf11 100644
--- a/ports/raspberrypi/boards/cytron_maker_pi_rp2040/board.c
+++ b/ports/raspberrypi/boards/cytron_maker_pi_rp2040/board.c
@@ -35,3 +35,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/pimoroni_pga2040/board.c b/ports/raspberrypi/boards/pimoroni_pga2040/board.c
index 67486d4c23..de6e424ed9 100644
--- a/ports/raspberrypi/boards/pimoroni_pga2040/board.c
+++ b/ports/raspberrypi/boards/pimoroni_pga2040/board.c
@@ -35,3 +35,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}

From 525a920ca5f284b7eb5875550ae0febcd1714a06 Mon Sep 17 00:00:00 2001
From: Abilio Marques <abiliojr@gmail.com>
Date: Sun, 16 May 2021 05:30:25 +0200
Subject: [PATCH 211/349] unix/modffi: Fix conversion between Python integers
 and ffi types.

This commit fixes the following problems converting to/from Python integers
and ffi types:
- integers of 8 and 16 bits not working on big endian
- integers of 64 bits not working on 32 bits architectures
- unsigned returns were converted to signed Python integers

Fixes issue #7269.
---
 ports/unix/modffi.c | 64 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 63 insertions(+), 1 deletion(-)

diff --git a/ports/unix/modffi.c b/ports/unix/modffi.c
index 5c2595ec5e..12a33619e0 100644
--- a/ports/unix/modffi.c
+++ b/ports/unix/modffi.c
@@ -35,6 +35,7 @@
 #include "py/runtime.h"
 #include "py/binary.h"
 #include "py/mperrno.h"
+#include "py/objint.h"
 
 /*
  * modffi uses character codes to encode a value type, based on "struct"
@@ -59,6 +60,11 @@
 // This union is large enough to hold any supported argument/return value.
 typedef union _ffi_union_t {
     ffi_arg ffi;
+    unsigned char B;
+    unsigned short int H;
+    unsigned int I;
+    unsigned long int L;
+    unsigned long long int Q;
     float flt;
     double dbl;
 } ffi_union_t;
@@ -177,6 +183,20 @@ STATIC mp_obj_t return_ffi_value(ffi_union_t *val, char type) {
             return mp_obj_new_float_from_d(val->dbl);
         }
         #endif
+        case 'b':
+        case 'h':
+        case 'i':
+        case 'l':
+            return mp_obj_new_int((signed)val->ffi);
+        case 'B':
+        case 'H':
+        case 'I':
+        case 'L':
+            return mp_obj_new_int_from_uint(val->ffi);
+        case 'q':
+            return mp_obj_new_int_from_ll(val->Q);
+        case 'Q':
+            return mp_obj_new_int_from_ull(val->Q);
         case 'O':
             return (mp_obj_t)(intptr_t)val->ffi;
         default:
@@ -365,6 +385,48 @@ STATIC void ffifunc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_ki
     mp_printf(print, "<ffifunc %p>", self->func);
 }
 
+STATIC unsigned long long ffi_get_int_value(mp_obj_t o) {
+    if (mp_obj_is_small_int(o)) {
+        return MP_OBJ_SMALL_INT_VALUE(o);
+    } else {
+        unsigned long long res;
+        mp_obj_int_to_bytes_impl(o, MP_ENDIANNESS_BIG, sizeof(res), (byte *)&res);
+        return res;
+    }
+}
+
+STATIC ffi_union_t ffi_int_obj_to_ffi_union(mp_obj_t o, const char argtype) {
+    ffi_union_t ret;
+    if ((argtype | 0x20) == 'q') {
+        ret.Q = ffi_get_int_value(o);
+        return ret;
+    } else {
+        mp_uint_t val = mp_obj_int_get_truncated(o);
+        switch (argtype) {
+            case 'b':
+            case 'B':
+                ret.B = val;
+                break;
+            case 'h':
+            case 'H':
+                ret.H = val;
+                break;
+            case 'i':
+            case 'I':
+                ret.I = val;
+                break;
+            case 'l':
+            case 'L':
+                ret.L = val;
+                break;
+            default:
+                ret.ffi = val;
+                break;
+        }
+    }
+    return ret;
+}
+
 STATIC mp_obj_t ffifunc_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     (void)n_kw;
     mp_obj_ffifunc_t *self = MP_OBJ_TO_PTR(self_in);
@@ -387,7 +449,7 @@ STATIC mp_obj_t ffifunc_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
         } else if (a == mp_const_none) {
             values[i].ffi = 0;
         } else if (mp_obj_is_int(a)) {
-            values[i].ffi = mp_obj_int_get_truncated(a);
+            values[i] = ffi_int_obj_to_ffi_union(a, *argtype);
         } else if (mp_obj_is_str(a)) {
             const char *s = mp_obj_str_get_str(a);
             values[i].ffi = (ffi_arg)(intptr_t)s;

From de2e081260395f47d21bf39a97f3461df3d8b94f Mon Sep 17 00:00:00 2001
From: Miguel Grinberg <miguel.grinberg@gmail.com>
Date: Mon, 7 Jun 2021 11:40:09 +0100
Subject: [PATCH 212/349] extmod/uasyncio: Fix start_server and wait_closed
 race condition.

This fix prevents server.wait_closed() from raising an AttributeError when
trying to access server.task.  This can happen if it is called immediately
after start_server().
---
 extmod/uasyncio/stream.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/extmod/uasyncio/stream.py b/extmod/uasyncio/stream.py
index 395ff1f6af..2a259e618f 100644
--- a/extmod/uasyncio/stream.py
+++ b/extmod/uasyncio/stream.py
@@ -112,7 +112,6 @@ class Server:
         s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         s.bind(ai[-1])
         s.listen(backlog)
-        self.task = core.cur_task
         # Accept incoming connections
         while True:
             try:
@@ -135,7 +134,7 @@ class Server:
 # TODO could use an accept-callback on socket read activity instead of creating a task
 async def start_server(cb, host, port, backlog=5):
     s = Server()
-    core.create_task(s._serve(cb, host, port, backlog))
+    s.task = core.create_task(s._serve(cb, host, port, backlog))
     return s
 
 

From 8c02b94946c437ed841fe294442b1f0d2401c678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20V=C3=B6r=C3=B6s?= <zvoros@gmail.com>
Date: Sat, 5 Jun 2021 19:53:46 +0200
Subject: [PATCH 213/349] nrf: Add more math sources to Makefile, and enable
 log2 implementation.

This commit adds a few math functions to the source list in the Makefile,
and implements the log2f function, so that ulab can be compiled on the nrf
boards.  It also addresses part of #5162.
---
 ports/nrf/Makefile       | 19 ++++++++++++++++++-
 ports/nrf/mpconfigport.h |  4 ++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 8680950804..a3f914dbc1 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -160,8 +160,16 @@ SRC_LIB += $(addprefix lib/,\
         libm/sf_modf.c \
         libm/sf_ldexp.c \
         libm/asinfacosf.c \
+        libm/acoshf.c \
+        libm/asinhf.c \
         libm/atanf.c \
         libm/atan2f.c \
+        libm/atanhf.c \
+        libm/log1pf.c \
+        libm/sf_erf.c \
+        libm/erf_lgamma.c \
+        libm/wf_lgamma.c \
+        libm/wf_tgamma.c \
         libm/roundf.c \
 	)
 
@@ -186,8 +194,17 @@ SRC_LIB += $(addprefix lib/,\
         libm/sf_modf.c \
         libm/sf_ldexp.c \
         libm/asinfacosf.c \
+        libm/acoshf.c \
+        libm/asinhf.c \
         libm/atanf.c \
         libm/atan2f.c \
+        libm/atanhf.c \
+        libm/log1pf.c \
+        libm/sf_erf.c \
+        libm/erf_lgamma.c \
+        libm/wf_lgamma.c \
+        libm/wf_tgamma.c \
+        libm/roundf.c \
         )
 
 SRC_NRFX += $(addprefix lib/nrfx/drivers/src/,\
@@ -481,7 +498,7 @@ $(BUILD)/$(OUTPUT_FILENAME).elf: $(OBJ)
 	$(Q)$(SIZE) $@
 
 # List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(SRC_LIB) $(DRIVERS_SRC_C) $(SRC_BOARD_MODULES) $(SRC_MOD) 
+SRC_QSTR += $(SRC_C) $(SRC_LIB) $(DRIVERS_SRC_C) $(SRC_BOARD_MODULES) $(SRC_MOD)
 
 # Append any auto-generated sources that are needed by sources listed in
 # SRC_QSTR
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 714b1cc24f..183fdf6818 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -330,3 +330,7 @@ extern const struct _mp_obj_module_t ble_module;
 #include <alloca.h>
 
 #define MICROPY_PIN_DEFS_PORT_H "pin_defs_nrf5.h"
+
+#ifndef MP_NEED_LOG2
+#define MP_NEED_LOG2                (1)
+#endif

From 44b876f7693ba181c90dd813692f65e4a05266f8 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Fri, 28 May 2021 23:00:07 -0400
Subject: [PATCH 214/349] Inital keypad work: Keys working: one pin per key

keypad.Buttons and keypad.State

Buttons -> Keys; further work

wip

wip

wip: compiles

about to try

keypad.Keys working
---
 locale/circuitpython.pot          |   5 +-
 py/circuitpy_defns.mk             |  12 +-
 py/circuitpy_mpconfig.h           |  24 ++--
 py/circuitpy_mpconfig.mk          |   9 +-
 shared-bindings/keypad/Keys.c     | 175 ++++++++++++++++++++++++++++++
 shared-bindings/keypad/Keys.h     |  41 +++++++
 shared-bindings/keypad/State.c    |  75 +++++++++++++
 shared-bindings/keypad/State.h    |  44 ++++++++
 shared-bindings/keypad/__init__.c |  53 +++++++++
 shared-bindings/keypad/__init__.h |  41 +++++++
 shared-module/keypad/Keys.c       | 127 ++++++++++++++++++++++
 shared-module/keypad/Keys.h       |  44 ++++++++
 shared-module/keypad/State.c      |   0
 shared-module/keypad/__init__.c   |   0
 shared-module/keypad/__init__.h   |  30 +++++
 15 files changed, 664 insertions(+), 16 deletions(-)
 create mode 100644 shared-bindings/keypad/Keys.c
 create mode 100644 shared-bindings/keypad/Keys.h
 create mode 100644 shared-bindings/keypad/State.c
 create mode 100644 shared-bindings/keypad/State.h
 create mode 100644 shared-bindings/keypad/__init__.c
 create mode 100644 shared-bindings/keypad/__init__.h
 create mode 100644 shared-module/keypad/Keys.c
 create mode 100644 shared-module/keypad/Keys.h
 create mode 100644 shared-module/keypad/State.c
 create mode 100644 shared-module/keypad/__init__.c
 create mode 100644 shared-module/keypad/__init__.h

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index fbb6402051..f80bfd4eb3 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -116,7 +116,7 @@ msgid "%q must be a tuple of length 2"
 msgstr ""
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
-#: shared-bindings/canio/Match.c
+#: shared-bindings/canio/Match.c shared-bindings/keypad/Keys.c
 msgid "%q out of range"
 msgstr ""
 
@@ -905,7 +905,8 @@ msgstr ""
 
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c py/enum.c
 #: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/busio/SPI.c shared-bindings/microcontroller/Pin.c
+#: shared-bindings/busio/SPI.c shared-bindings/keypad/Keys.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 #: shared-bindings/terminalio/Terminal.c
 msgid "Expected a %q"
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index 41f8d71abd..6b3dd7f17a 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -178,6 +178,9 @@ endif
 ifeq ($(CIRCUITPY_FRAMEBUFFERIO),1)
 SRC_PATTERNS += framebufferio/%
 endif
+ifeq ($(CIRCUITPY__EVE),1)
+SRC_PATTERNS += _eve/%
+endif
 ifeq ($(CIRCUITPY_FREQUENCYIO),1)
 SRC_PATTERNS += frequencyio/%
 endif
@@ -196,12 +199,12 @@ endif
 ifeq ($(CIRCUITPY_IPADDRESS),1)
 SRC_PATTERNS += ipaddress/%
 endif
+ifeq ($(CIRCUITPY_KEYPAD),1)
+SRC_PATTERNS += keypad/%
+endif
 ifeq ($(CIRCUITPY_MATH),1)
 SRC_PATTERNS += math/%
 endif
-ifeq ($(CIRCUITPY__EVE),1)
-SRC_PATTERNS += _eve/%
-endif
 ifeq ($(CIRCUITPY_MEMORYMONITOR),1)
 SRC_PATTERNS += memorymonitor/%
 endif
@@ -512,6 +515,9 @@ SRC_SHARED_MODULE_ALL = \
 	framebufferio/__init__.c \
 	ipaddress/IPv4Address.c \
 	ipaddress/__init__.c \
+	keypad/__init__.c \
+	keypad/Keys.c \
+	keypad/State.c \
 	sdcardio/SDCard.c \
 	sdcardio/__init__.c \
 	gamepad/GamePad.c \
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index c71cad6aeb..21c91bfac6 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -439,6 +439,13 @@ extern const struct _mp_obj_module_t espidf_module;
 #define ESPIDF_MODULE
 #endif
 
+#if CIRCUITPY__EVE
+extern const struct _mp_obj_module_t _eve_module;
+#define _EVE_MODULE            { MP_OBJ_NEW_QSTR(MP_QSTR__eve), (mp_obj_t)&_eve_module },
+#else
+#define _EVE_MODULE
+#endif
+
 #if CIRCUITPY_FRAMEBUFFERIO
 extern const struct _mp_obj_module_t framebufferio_module;
 #define FRAMEBUFFERIO_MODULE       { MP_OBJ_NEW_QSTR(MP_QSTR_framebufferio), (mp_obj_t)&framebufferio_module },
@@ -522,6 +529,13 @@ extern const struct _mp_obj_module_t ipaddress_module;
 #define JSON_MODULE
 #endif
 
+#if CIRCUITPY_KEYPAD
+extern const struct _mp_obj_module_t keypad_module;
+#define KEYPAD_MODULE        { MP_OBJ_NEW_QSTR(MP_QSTR_keypad), (mp_obj_t)&keypad_module },
+#else
+#define KEYPAD_MODULE
+#endif
+
 #if CIRCUITPY_MATH
 extern const struct _mp_obj_module_t math_module;
 #define MATH_MODULE            { MP_OBJ_NEW_QSTR(MP_QSTR_math), (mp_obj_t)&math_module },
@@ -529,13 +543,6 @@ extern const struct _mp_obj_module_t math_module;
 #define MATH_MODULE
 #endif
 
-#if CIRCUITPY__EVE
-extern const struct _mp_obj_module_t _eve_module;
-#define _EVE_MODULE            { MP_OBJ_NEW_QSTR(MP_QSTR__eve), (mp_obj_t)&_eve_module },
-#else
-#define _EVE_MODULE
-#endif
-
 #if CIRCUITPY_MEMORYMONITOR
 extern const struct _mp_obj_module_t memorymonitor_module;
 #define MEMORYMONITOR_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_memorymonitor), (mp_obj_t)&memorymonitor_module },
@@ -876,6 +883,7 @@ extern const struct _mp_obj_module_t msgpack_module;
     VECTORIO_MODULE \
     ERRNO_MODULE \
     ESPIDF_MODULE \
+    _EVE_MODULE \
     FRAMEBUFFERIO_MODULE \
     FREQUENCYIO_MODULE \
     GAMEPAD_MODULE \
@@ -885,8 +893,8 @@ extern const struct _mp_obj_module_t msgpack_module;
     IPADDRESS_MODULE \
     IMAGECAPTURE_MODULE \
     JSON_MODULE \
+    KEYPAD_MODULE \
     MATH_MODULE \
-    _EVE_MODULE \
     MEMORYMONITOR_MODULE \
     MICROCONTROLLER_MODULE \
     MSGPACK_MODULE \
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 077470d936..9c9e84321e 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -178,6 +178,9 @@ CFLAGS += -DCIRCUITPY_ERRNO=$(CIRCUITPY_ERRNO)
 CIRCUITPY_ESPIDF ?= 0
 CFLAGS += -DCIRCUITPY_ESPIDF=$(CIRCUITPY_ESPIDF)
 
+CIRCUITPY__EVE ?= 0
+CFLAGS += -DCIRCUITPY__EVE=$(CIRCUITPY__EVE)
+
 CIRCUITPY_FREQUENCYIO ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_FREQUENCYIO=$(CIRCUITPY_FREQUENCYIO)
 
@@ -199,12 +202,12 @@ CFLAGS += -DCIRCUITPY_IPADDRESS=$(CIRCUITPY_IPADDRESS)
 CIRCUITPY_JSON ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_JSON=$(CIRCUITPY_JSON)
 
+CIRCUITPY_KEYPAD ?= $(CIRCUITPY_FULL_BUILD)
+CFLAGS += -DCIRCUITPY_KEYPAD=$(CIRCUITPY_KEYPAD)
+
 CIRCUITPY_MATH ?= 1
 CFLAGS += -DCIRCUITPY_MATH=$(CIRCUITPY_MATH)
 
-CIRCUITPY__EVE ?= 0
-CFLAGS += -DCIRCUITPY__EVE=$(CIRCUITPY__EVE)
-
 CIRCUITPY_MEMORYMONITOR ?= 0
 CFLAGS += -DCIRCUITPY_MEMORYMONITOR=$(CIRCUITPY_MEMORYMONITOR)
 
diff --git a/shared-bindings/keypad/Keys.c b/shared-bindings/keypad/Keys.c
new file mode 100644
index 0000000000..118328abe9
--- /dev/null
+++ b/shared-bindings/keypad/Keys.c
@@ -0,0 +1,175 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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 "py/objproperty.h"
+#include "shared-bindings/keypad/Keys.h"
+#include "shared-bindings/keypad/State.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "py/runtime.h"
+
+//| class Keys:
+//|     """Manage a set of independent keys."""
+//|
+//|     def __init__(self, pins: Sequence[microcontroller.Pin], *, level_when_pressed: bool, pull: bool = True) -> None:
+//|         """
+//|         Create a `Keys` object that will scan keys attached to the given sequence of pins.
+//|         Each key is independent and attached to its own pin.
+//|
+//|         :param Sequence[microcontroller.Pin] pins: The pins attached to the keys.
+//|           The key numbers correspond to indices into this sequence.
+//|         :param bool value_when_pressed: ``True`` if the pin reads high when the key is pressed.
+//|           ``False`` if the pin reads low (is grounded) when the key is pressed.
+//|           All the pins must be connected in the same way.
+//|         :param bool pull: ``True`` if an internal pull-up or pull-down should be
+//|            enabled on each pin. A pull-up will be used if ``value_when_pressed`` is ``False``;
+//|            a pull-down will be used if it is ``True``.
+//|            If an external pull is already provided for all the pins, you can set ``pull`` to ``False``.
+//|            However, enabling an internal pull when an external one is already present is not a problem;
+//|            it simply uses slightly more current.
+//|
+//|         Calls `scan()` once before returning, to initialize internal state.
+//|         """
+//|         ...
+
+STATIC mp_obj_t keypad_keys_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    keypad_keys_obj_t *self = m_new_obj(keypad_keys_obj_t);
+    self->base.type = &keypad_keys_type;
+    enum { ARG_pins, ARG_value_when_pressed, ARG_pull };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_pins, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_value_when_pressed, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_BOOL },
+        { MP_QSTR_pull, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} },
+    };
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    mp_obj_t pins = args[ARG_pins].u_obj;
+    const mp_uint_t num_pins = mp_obj_int_get_uint_checked(mp_obj_len(pins));
+    const bool value_when_pressed = args[ARG_value_when_pressed].u_bool;
+
+    mcu_pin_obj_t *pins_array[num_pins];
+
+    for (mp_uint_t i = 0; i < num_pins; i++) {
+        mcu_pin_obj_t *pin =
+            validate_obj_is_free_pin(mp_obj_subscr(pins, MP_OBJ_NEW_SMALL_INT(i), MP_OBJ_SENTINEL));
+        pins_array[i] = pin;
+    }
+
+    common_hal_keypad_keys_construct(self, num_pins, pins_array, value_when_pressed, args[ARG_pull].u_bool);
+    return MP_OBJ_FROM_PTR(self);
+}
+
+//|     def scan(self) -> None:
+//|         """Scan the keys and record which are newly pressed, still pressed,
+//|         newly released, and still released. For convenient activity checking,
+//|         """
+//|         ...
+//|
+STATIC mp_obj_t keypad_keys_scan(mp_obj_t self_in) {
+    keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    common_hal_keypad_keys_scan(self);
+    return MP_ROM_NONE;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_keys_scan_obj, keypad_keys_scan);
+
+//|     def state(self, key_num: int) -> keypad.State:
+//|         """Return the state for the given ``key_num``, based
+//|         on the results of the most recent `scan()`.
+//|
+//|         :param int key_num: Key number: corresponds to the sequence of pins
+//|         :return: state of key number ``key_num``
+//|         :rtype: keypad.State: One of `State.JUST_PRESSED`, `State.STILL_PRESSED`,
+//|           `State.JUST_RELEASED`, or `State.STILL_RELEASED`.
+//|           The inclusive states `State.PRESSED` and `State.RELEASED` will *not* be returned.
+//|         """
+//|         ...
+//|
+STATIC mp_obj_t keypad_keys_state(mp_obj_t self_in, mp_obj_t key_num_obj) {
+    keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_int_t key_num = mp_obj_int_get_checked(key_num_obj);
+    if (key_num < 0 || key_num >= common_hal_keypad_keys_length(self)) {
+        mp_raise_ValueError_varg(translate("%q out of range"), MP_QSTR_key_num);
+    }
+
+    return cp_enum_find(&keypad_state_type, common_hal_keypad_keys_state(self, (mp_uint_t)key_num));
+}
+MP_DEFINE_CONST_FUN_OBJ_2(keypad_keys_state_obj, keypad_keys_state);
+
+//|     def keys_with_state(self, state: State, into_list: List[Optional[int]]) -> None:
+//|         """Store key numbers of keys with state ``state`` in ``into_list``.
+//|         The states checked are based on the results of the most recent `scan()`.
+//|
+//|         You can use the inclusive states `State.PRESSED` and `State.RELEASED`.
+//|         `State.PRESSED` includes states `State.JUST_PRESSED` and `State.STILL_PRESSED`.
+//|         `State.RELEASED` includes `State.JUST_RELEASED` and `State.STILL_RELEASED`.
+//|
+//|         The key numbers are stored in ``into_list`` consecutively, up to ``len(into_list)``.
+//|         The ``into_list`` is not extended if there are more keys with the given
+//|         state than list slots. Instead, leftover key numbers are discarded.
+//|         If there are fewer keys with the given state, the rest of ``into_list``
+//|         is padded with ``None``. For example,
+//|         if four keys are being monitored, and only key numbers 0 and 2 have the given state,
+//|         ``into_list`` will be set to ``[0, 2, None, None]``. You can iterate over
+//|         ``into_list`` and stop when you find the first ``None``.
+//|         """
+//|         ...
+//|
+STATIC mp_obj_t keypad_keys_keys_with_state(mp_obj_t self_in, mp_obj_t state_in, mp_obj_t into_list_in) {
+    keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    if (!mp_obj_is_type(state_in, &keypad_state_type)) {
+        mp_raise_ValueError_varg(translate("Expected a %q"), keypad_state_type.name);
+    }
+
+    if (!mp_obj_is_type(into_list_in, &mp_type_list)) {
+        mp_raise_ValueError_varg(translate("Expected a %q"), mp_type_list.name);
+    }
+
+    int state = cp_enum_value(&keypad_state_type, state_in);
+    mp_obj_list_t *into_list = MP_OBJ_TO_PTR(into_list_in);
+
+    common_hal_keypad_keys_keys_with_state(self, state, into_list);
+
+    return MP_ROM_NONE;
+}
+MP_DEFINE_CONST_FUN_OBJ_3(keypad_keys_keys_with_state_obj, keypad_keys_keys_with_state);
+
+STATIC const mp_rom_map_elem_t keypad_keys_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_keys_with_state),  MP_ROM_PTR(&keypad_keys_keys_with_state_obj) },
+    { MP_ROM_QSTR(MP_QSTR_scan),             MP_ROM_PTR(&keypad_keys_scan_obj) },
+    { MP_ROM_QSTR(MP_QSTR_state),            MP_ROM_PTR(&keypad_keys_state_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(keypad_keys_locals_dict, keypad_keys_locals_dict_table);
+
+const mp_obj_type_t keypad_keys_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Keys,
+    .make_new = keypad_keys_make_new,
+    .locals_dict = (mp_obj_t)&keypad_keys_locals_dict,
+};
diff --git a/shared-bindings/keypad/Keys.h b/shared-bindings/keypad/Keys.h
new file mode 100644
index 0000000000..f7d33a78c1
--- /dev/null
+++ b/shared-bindings/keypad/Keys.h
@@ -0,0 +1,41 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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_KEYPAD_KEYS_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_KEYS_H
+
+#include "py/objlist.h"
+#include "shared-module/keypad/Keys.h"
+
+extern const mp_obj_type_t keypad_keys_type;
+
+void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pins, mcu_pin_obj_t *pins[], bool value_when_pressed,  bool pull);
+void common_hal_keypad_keys_keys_with_state(keypad_keys_obj_t *self, mp_int_t state, mp_obj_list_t *into);
+size_t common_hal_keypad_keys_length(keypad_keys_obj_t *self);
+void common_hal_keypad_keys_scan(keypad_keys_obj_t *self);
+mp_int_t common_hal_keypad_keys_state(keypad_keys_obj_t *self, mp_uint_t key_num);
+
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_KEYS_H
diff --git a/shared-bindings/keypad/State.c b/shared-bindings/keypad/State.c
new file mode 100644
index 0000000000..8e35d09a83
--- /dev/null
+++ b/shared-bindings/keypad/State.c
@@ -0,0 +1,75 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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/obj.h"
+#include "py/enum.h"
+
+#include "shared-bindings/keypad/State.h"
+
+// Defines enum values like
+// const cp_enum_obj_t state_JUST_PRESSED = ...
+MAKE_ENUM_VALUE(keypad_state_type, state, JUST_PRESSED, STATE_JUST_PRESSED);
+MAKE_ENUM_VALUE(keypad_state_type, state, STILL_PRESSED, STATE_STILL_PRESSED);
+MAKE_ENUM_VALUE(keypad_state_type, state, PRESSED, STATE_PRESSED);
+MAKE_ENUM_VALUE(keypad_state_type, state, JUST_RELEASED, STATE_JUST_RELEASED);
+MAKE_ENUM_VALUE(keypad_state_type, state, STILL_RELEASED, STATE_STILL_RELEASED);
+MAKE_ENUM_VALUE(keypad_state_type, state, RELEASED, STATE_RELEASED);
+
+//| class State:
+//|     """The state of a key, based on the last call to ``scan()``."""
+//|
+//|     JUST_PRESSED: State
+//|     """The key transitioned from released to pressed."""
+//|
+//|     STILL_PRESSED: State
+//|     """The key was already pressed, and continues to be pressed."""
+//|
+//|     PRESSED: State
+//|     """The key is now pressed. Used to indicate states `JUST_PRESSED` and `STILL_PRESSED` inclusively."""
+//|
+//|     JUST_RELEASED: State
+//|     """The key transitioned from pressed to released."""
+//|
+//|     STILL_RELEASED: State
+//|     """The key was already released, and continues to be released."""
+//|
+//|     RELEASED: State
+//|     """The key is now released. Used to indicate states `JUST_RELEASED` and `STILL_RELEASED` inclusively."""
+//|
+MAKE_ENUM_MAP(keypad_state) {
+    MAKE_ENUM_MAP_ENTRY(state, JUST_PRESSED),
+    MAKE_ENUM_MAP_ENTRY(state, STILL_PRESSED),
+    MAKE_ENUM_MAP_ENTRY(state, PRESSED),
+    MAKE_ENUM_MAP_ENTRY(state, JUST_RELEASED),
+    MAKE_ENUM_MAP_ENTRY(state, STILL_RELEASED),
+    MAKE_ENUM_MAP_ENTRY(state, RELEASED),
+};
+STATIC MP_DEFINE_CONST_DICT(keypad_state_locals_dict, keypad_state_locals_table);
+
+MAKE_PRINTER(keypad, keypad_state);
+
+// Defines keypad_state_type.
+MAKE_ENUM_TYPE(keypad, State, keypad_state);
diff --git a/shared-bindings/keypad/State.h b/shared-bindings/keypad/State.h
new file mode 100644
index 0000000000..1b6316b001
--- /dev/null
+++ b/shared-bindings/keypad/State.h
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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_KEYPAD_STATE__H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_STATE__H
+
+#include "py/obj.h"
+#include "py/enum.h"
+
+typedef enum {
+    STATE_JUST_PRESSED,
+    STATE_STILL_PRESSED,
+    STATE_PRESSED,
+    STATE_JUST_RELEASED,
+    STATE_STILL_RELEASED,
+    STATE_RELEASED,
+} keypad_state_t;
+
+extern const mp_obj_type_t keypad_state_type;
+
+#endif // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_STATE__H
diff --git a/shared-bindings/keypad/__init__.c b/shared-bindings/keypad/__init__.c
new file mode 100644
index 0000000000..4ca66b531a
--- /dev/null
+++ b/shared-bindings/keypad/__init__.c
@@ -0,0 +1,53 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2011 Dan Halbert 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/obj.h"
+
+#include "shared-bindings/keypad/__init__.h"
+// #include "shared-bindings/keypad/KeyMatrix.h"
+#include "shared-bindings/keypad/Keys.h"
+#include "shared-bindings/keypad/State.h"
+
+//| """Support for scanning keys and key matrices
+//|
+//| The `keypad` module provides native support to scan sets of keys or buttons,
+//| connected independently to individual pins, or connected in a row-and-column matrix.
+//| """
+//|
+
+STATIC mp_map_elem_t keypad_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__),  MP_OBJ_NEW_QSTR(MP_QSTR_keypad) },
+//    { MP_ROM_QSTR(MP_QSTR_KeyMatrix), MP_OBJ_FROM_PTR(&keypad_key_matrix_type) },
+    { MP_ROM_QSTR(MP_QSTR_Keys),      MP_OBJ_FROM_PTR(&keypad_keys_type) },
+    { MP_ROM_QSTR(MP_QSTR_State),     MP_OBJ_FROM_PTR(&keypad_state_type) },
+};
+
+STATIC MP_DEFINE_MUTABLE_DICT(keypad_module_globals, keypad_module_globals_table);
+
+const mp_obj_module_t keypad_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&keypad_module_globals,
+};
diff --git a/shared-bindings/keypad/__init__.h b/shared-bindings/keypad/__init__.h
new file mode 100644
index 0000000000..5e484dc5ed
--- /dev/null
+++ b/shared-bindings/keypad/__init__.h
@@ -0,0 +1,41 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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 SHARED_BINDINGS_KEYPAD_H
+#define SHARED_BINDINGS_KEYPAD_H
+
+#include "py/obj.h"
+#include "py/objtuple.h"
+#include "shared-module/keypad/__init__.h"
+
+extern mp_obj_tuple_t common_hal_keypad_devices;
+
+void keypad_set_devices(mp_obj_t devices);
+
+bool common_hal_keypad_disable(void);
+bool common_hal_keypad_enable(const mp_obj_t devices_seq);
+
+#endif // SHARED_BINDINGS_KEYPAD_H
diff --git a/shared-module/keypad/Keys.c b/shared-module/keypad/Keys.c
new file mode 100644
index 0000000000..ca1dca42ef
--- /dev/null
+++ b/shared-module/keypad/Keys.c
@@ -0,0 +1,127 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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/gc.h"
+#include "py/objproperty.h"
+#include "shared-bindings/keypad/Keys.h"
+#include "shared-bindings/keypad/State.h"
+#include "shared-bindings/digitalio/DigitalInOut.h"
+#include "py/runtime.h"
+
+void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pins, mcu_pin_obj_t *pins[], bool value_when_pressed, bool pull) {
+    mp_obj_t dios[num_pins];
+
+    for (size_t i = 0; i < num_pins; i++) {
+        digitalio_digitalinout_obj_t *dio = m_new_obj(digitalio_digitalinout_obj_t);
+        dio->base.type = &digitalio_digitalinout_type;
+        common_hal_digitalio_digitalinout_construct(dio, pins[i]);
+        if (pull) {
+            common_hal_digitalio_digitalinout_set_pull(dio, value_when_pressed ? PULL_DOWN : PULL_UP);
+        }
+        dios[i] = dio;
+    }
+
+    self->digitalinouts = mp_obj_new_tuple(num_pins, dios);
+    self->currently_pressed = (bool *)gc_alloc(sizeof(bool) * num_pins, false, false);
+    self->previously_pressed = (bool *)gc_alloc(sizeof(bool) * num_pins, false, false);
+    self->value_when_pressed = value_when_pressed;
+
+}
+
+void common_hal_keypad_keys_keys_with_state(keypad_keys_obj_t *self, int state, mp_obj_list_t *list_into) {
+    const size_t list_length = list_into->len;
+
+    size_t next_list_slot = 0;
+
+    for (mp_uint_t key_num = 0; key_num < common_hal_keypad_keys_length(self); key_num++) {
+        if (next_list_slot >= list_length) {
+            // List is full.
+            break;
+        }
+
+        bool store_key = false;
+        switch (state) {
+            case STATE_JUST_PRESSED:
+                store_key = !self->previously_pressed[key_num] && self->currently_pressed[key_num];
+                break;
+            case STATE_STILL_PRESSED:
+                store_key = self->previously_pressed[key_num] && self->currently_pressed[key_num];
+                break;
+            case STATE_PRESSED:
+                store_key = self->currently_pressed[key_num];
+                break;
+            case STATE_JUST_RELEASED:
+                store_key = self->previously_pressed[key_num] && !self->currently_pressed[key_num];
+                break;
+            case STATE_STILL_RELEASED:
+                store_key = !self->previously_pressed[key_num] && !self->currently_pressed[key_num];
+                break;
+            case STATE_RELEASED:
+                store_key = !self->currently_pressed[key_num];
+                break;
+        }
+
+        if (store_key) {
+            mp_obj_list_store(list_into, MP_OBJ_NEW_SMALL_INT(next_list_slot),
+                MP_OBJ_NEW_SMALL_INT(key_num));
+            next_list_slot++;
+        }
+
+        for (size_t unused_slot = next_list_slot; unused_slot < list_length; unused_slot++) {
+            mp_obj_list_store(list_into, MP_OBJ_NEW_SMALL_INT(unused_slot),
+                MP_ROM_NONE);
+        }
+    }
+}
+
+size_t common_hal_keypad_keys_length(keypad_keys_obj_t *self) {
+    return self->digitalinouts->len;
+}
+
+void common_hal_keypad_keys_scan(keypad_keys_obj_t *self) {
+    for (mp_uint_t key_num = 0; key_num < common_hal_keypad_keys_length(self); key_num++) {
+        self->previously_pressed[key_num] = self->currently_pressed[key_num];
+        self->currently_pressed[key_num] =
+            common_hal_digitalio_digitalinout_get_value(self->digitalinouts->items[key_num]) ==
+            self->value_when_pressed;
+    }
+}
+
+mp_int_t common_hal_keypad_keys_state(keypad_keys_obj_t *self, mp_uint_t key_num) {
+    if (self->currently_pressed[key_num]) {
+        if (self->previously_pressed[key_num]) {
+            return STATE_STILL_PRESSED;
+        } else {
+            return STATE_JUST_PRESSED;
+        }
+    } else {
+        if (self->previously_pressed[key_num]) {
+            return STATE_JUST_RELEASED;
+        } else {
+            return STATE_STILL_RELEASED;
+        }
+    }
+}
diff --git a/shared-module/keypad/Keys.h b/shared-module/keypad/Keys.h
new file mode 100644
index 0000000000..077b981dd6
--- /dev/null
+++ b/shared-module/keypad/Keys.h
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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_MODULE_KEYPAD_KEYS_H
+#define MICROPY_INCLUDED_SHARED_MODULE_KEYPAD_KEYS_H
+
+#include "common-hal/digitalio/DigitalInOut.h"
+
+#include "py/obj.h"
+#include "py/objtuple.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    mp_obj_tuple_t *digitalinouts;
+    bool value_when_pressed;
+    bool *previously_pressed;
+    bool *currently_pressed;
+} keypad_keys_obj_t;
+
+
+#endif  // MICROPY_INCLUDED_SHARED_MODULE_KEYPAD_KEYS_H
diff --git a/shared-module/keypad/State.c b/shared-module/keypad/State.c
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/shared-module/keypad/__init__.c b/shared-module/keypad/__init__.c
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/shared-module/keypad/__init__.h b/shared-module/keypad/__init__.h
new file mode 100644
index 0000000000..4220a3df63
--- /dev/null
+++ b/shared-module/keypad/__init__.h
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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 SHARED_MODULE_KEYPAD_H
+#define SHARED_MODULE_KEYPAD_H
+
+#endif // SHARED_MODULE_KEYPAD_H

From 7d23206018e04bbc4db4d408afbe07ad96e45ff3 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Fri, 28 May 2021 23:00:07 -0400
Subject: [PATCH 215/349] Inital keypad work: Keys working: one pin per key

keypad.Buttons and keypad.State

Buttons -> Keys; further work

wip

wip

wip: compiles

about to try

keypad.Keys working
---
 locale/circuitpython.pot          |   5 +-
 py/circuitpy_defns.mk             |  12 +-
 py/circuitpy_mpconfig.h           |  24 ++--
 py/circuitpy_mpconfig.mk          |   9 +-
 shared-bindings/keypad/Keys.c     | 175 ++++++++++++++++++++++++++++++
 shared-bindings/keypad/Keys.h     |  41 +++++++
 shared-bindings/keypad/State.c    |  75 +++++++++++++
 shared-bindings/keypad/State.h    |  44 ++++++++
 shared-bindings/keypad/__init__.c |  53 +++++++++
 shared-bindings/keypad/__init__.h |  41 +++++++
 shared-module/keypad/Keys.c       | 127 ++++++++++++++++++++++
 shared-module/keypad/Keys.h       |  44 ++++++++
 shared-module/keypad/State.c      |   0
 shared-module/keypad/__init__.c   |   0
 shared-module/keypad/__init__.h   |  30 +++++
 15 files changed, 664 insertions(+), 16 deletions(-)
 create mode 100644 shared-bindings/keypad/Keys.c
 create mode 100644 shared-bindings/keypad/Keys.h
 create mode 100644 shared-bindings/keypad/State.c
 create mode 100644 shared-bindings/keypad/State.h
 create mode 100644 shared-bindings/keypad/__init__.c
 create mode 100644 shared-bindings/keypad/__init__.h
 create mode 100644 shared-module/keypad/Keys.c
 create mode 100644 shared-module/keypad/Keys.h
 create mode 100644 shared-module/keypad/State.c
 create mode 100644 shared-module/keypad/__init__.c
 create mode 100644 shared-module/keypad/__init__.h

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index fbb6402051..f80bfd4eb3 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -116,7 +116,7 @@ msgid "%q must be a tuple of length 2"
 msgstr ""
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
-#: shared-bindings/canio/Match.c
+#: shared-bindings/canio/Match.c shared-bindings/keypad/Keys.c
 msgid "%q out of range"
 msgstr ""
 
@@ -905,7 +905,8 @@ msgstr ""
 
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c py/enum.c
 #: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/busio/SPI.c shared-bindings/microcontroller/Pin.c
+#: shared-bindings/busio/SPI.c shared-bindings/keypad/Keys.c
+#: shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 #: shared-bindings/terminalio/Terminal.c
 msgid "Expected a %q"
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index 41f8d71abd..6b3dd7f17a 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -178,6 +178,9 @@ endif
 ifeq ($(CIRCUITPY_FRAMEBUFFERIO),1)
 SRC_PATTERNS += framebufferio/%
 endif
+ifeq ($(CIRCUITPY__EVE),1)
+SRC_PATTERNS += _eve/%
+endif
 ifeq ($(CIRCUITPY_FREQUENCYIO),1)
 SRC_PATTERNS += frequencyio/%
 endif
@@ -196,12 +199,12 @@ endif
 ifeq ($(CIRCUITPY_IPADDRESS),1)
 SRC_PATTERNS += ipaddress/%
 endif
+ifeq ($(CIRCUITPY_KEYPAD),1)
+SRC_PATTERNS += keypad/%
+endif
 ifeq ($(CIRCUITPY_MATH),1)
 SRC_PATTERNS += math/%
 endif
-ifeq ($(CIRCUITPY__EVE),1)
-SRC_PATTERNS += _eve/%
-endif
 ifeq ($(CIRCUITPY_MEMORYMONITOR),1)
 SRC_PATTERNS += memorymonitor/%
 endif
@@ -512,6 +515,9 @@ SRC_SHARED_MODULE_ALL = \
 	framebufferio/__init__.c \
 	ipaddress/IPv4Address.c \
 	ipaddress/__init__.c \
+	keypad/__init__.c \
+	keypad/Keys.c \
+	keypad/State.c \
 	sdcardio/SDCard.c \
 	sdcardio/__init__.c \
 	gamepad/GamePad.c \
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index 009b428645..86321d5d02 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -440,6 +440,13 @@ extern const struct _mp_obj_module_t espidf_module;
 #define ESPIDF_MODULE
 #endif
 
+#if CIRCUITPY__EVE
+extern const struct _mp_obj_module_t _eve_module;
+#define _EVE_MODULE            { MP_OBJ_NEW_QSTR(MP_QSTR__eve), (mp_obj_t)&_eve_module },
+#else
+#define _EVE_MODULE
+#endif
+
 #if CIRCUITPY_FRAMEBUFFERIO
 extern const struct _mp_obj_module_t framebufferio_module;
 #define FRAMEBUFFERIO_MODULE       { MP_OBJ_NEW_QSTR(MP_QSTR_framebufferio), (mp_obj_t)&framebufferio_module },
@@ -523,6 +530,13 @@ extern const struct _mp_obj_module_t ipaddress_module;
 #define JSON_MODULE
 #endif
 
+#if CIRCUITPY_KEYPAD
+extern const struct _mp_obj_module_t keypad_module;
+#define KEYPAD_MODULE        { MP_OBJ_NEW_QSTR(MP_QSTR_keypad), (mp_obj_t)&keypad_module },
+#else
+#define KEYPAD_MODULE
+#endif
+
 #if CIRCUITPY_MATH
 extern const struct _mp_obj_module_t math_module;
 #define MATH_MODULE            { MP_OBJ_NEW_QSTR(MP_QSTR_math), (mp_obj_t)&math_module },
@@ -530,13 +544,6 @@ extern const struct _mp_obj_module_t math_module;
 #define MATH_MODULE
 #endif
 
-#if CIRCUITPY__EVE
-extern const struct _mp_obj_module_t _eve_module;
-#define _EVE_MODULE            { MP_OBJ_NEW_QSTR(MP_QSTR__eve), (mp_obj_t)&_eve_module },
-#else
-#define _EVE_MODULE
-#endif
-
 #if CIRCUITPY_MEMORYMONITOR
 extern const struct _mp_obj_module_t memorymonitor_module;
 #define MEMORYMONITOR_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_memorymonitor), (mp_obj_t)&memorymonitor_module },
@@ -877,6 +884,7 @@ extern const struct _mp_obj_module_t msgpack_module;
     VECTORIO_MODULE \
     ERRNO_MODULE \
     ESPIDF_MODULE \
+    _EVE_MODULE \
     FRAMEBUFFERIO_MODULE \
     FREQUENCYIO_MODULE \
     GAMEPAD_MODULE \
@@ -886,8 +894,8 @@ extern const struct _mp_obj_module_t msgpack_module;
     IPADDRESS_MODULE \
     IMAGECAPTURE_MODULE \
     JSON_MODULE \
+    KEYPAD_MODULE \
     MATH_MODULE \
-    _EVE_MODULE \
     MEMORYMONITOR_MODULE \
     MICROCONTROLLER_MODULE \
     MSGPACK_MODULE \
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 077470d936..9c9e84321e 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -178,6 +178,9 @@ CFLAGS += -DCIRCUITPY_ERRNO=$(CIRCUITPY_ERRNO)
 CIRCUITPY_ESPIDF ?= 0
 CFLAGS += -DCIRCUITPY_ESPIDF=$(CIRCUITPY_ESPIDF)
 
+CIRCUITPY__EVE ?= 0
+CFLAGS += -DCIRCUITPY__EVE=$(CIRCUITPY__EVE)
+
 CIRCUITPY_FREQUENCYIO ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_FREQUENCYIO=$(CIRCUITPY_FREQUENCYIO)
 
@@ -199,12 +202,12 @@ CFLAGS += -DCIRCUITPY_IPADDRESS=$(CIRCUITPY_IPADDRESS)
 CIRCUITPY_JSON ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_JSON=$(CIRCUITPY_JSON)
 
+CIRCUITPY_KEYPAD ?= $(CIRCUITPY_FULL_BUILD)
+CFLAGS += -DCIRCUITPY_KEYPAD=$(CIRCUITPY_KEYPAD)
+
 CIRCUITPY_MATH ?= 1
 CFLAGS += -DCIRCUITPY_MATH=$(CIRCUITPY_MATH)
 
-CIRCUITPY__EVE ?= 0
-CFLAGS += -DCIRCUITPY__EVE=$(CIRCUITPY__EVE)
-
 CIRCUITPY_MEMORYMONITOR ?= 0
 CFLAGS += -DCIRCUITPY_MEMORYMONITOR=$(CIRCUITPY_MEMORYMONITOR)
 
diff --git a/shared-bindings/keypad/Keys.c b/shared-bindings/keypad/Keys.c
new file mode 100644
index 0000000000..118328abe9
--- /dev/null
+++ b/shared-bindings/keypad/Keys.c
@@ -0,0 +1,175 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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 "py/objproperty.h"
+#include "shared-bindings/keypad/Keys.h"
+#include "shared-bindings/keypad/State.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "py/runtime.h"
+
+//| class Keys:
+//|     """Manage a set of independent keys."""
+//|
+//|     def __init__(self, pins: Sequence[microcontroller.Pin], *, level_when_pressed: bool, pull: bool = True) -> None:
+//|         """
+//|         Create a `Keys` object that will scan keys attached to the given sequence of pins.
+//|         Each key is independent and attached to its own pin.
+//|
+//|         :param Sequence[microcontroller.Pin] pins: The pins attached to the keys.
+//|           The key numbers correspond to indices into this sequence.
+//|         :param bool value_when_pressed: ``True`` if the pin reads high when the key is pressed.
+//|           ``False`` if the pin reads low (is grounded) when the key is pressed.
+//|           All the pins must be connected in the same way.
+//|         :param bool pull: ``True`` if an internal pull-up or pull-down should be
+//|            enabled on each pin. A pull-up will be used if ``value_when_pressed`` is ``False``;
+//|            a pull-down will be used if it is ``True``.
+//|            If an external pull is already provided for all the pins, you can set ``pull`` to ``False``.
+//|            However, enabling an internal pull when an external one is already present is not a problem;
+//|            it simply uses slightly more current.
+//|
+//|         Calls `scan()` once before returning, to initialize internal state.
+//|         """
+//|         ...
+
+STATIC mp_obj_t keypad_keys_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    keypad_keys_obj_t *self = m_new_obj(keypad_keys_obj_t);
+    self->base.type = &keypad_keys_type;
+    enum { ARG_pins, ARG_value_when_pressed, ARG_pull };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_pins, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_value_when_pressed, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_BOOL },
+        { MP_QSTR_pull, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} },
+    };
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    mp_obj_t pins = args[ARG_pins].u_obj;
+    const mp_uint_t num_pins = mp_obj_int_get_uint_checked(mp_obj_len(pins));
+    const bool value_when_pressed = args[ARG_value_when_pressed].u_bool;
+
+    mcu_pin_obj_t *pins_array[num_pins];
+
+    for (mp_uint_t i = 0; i < num_pins; i++) {
+        mcu_pin_obj_t *pin =
+            validate_obj_is_free_pin(mp_obj_subscr(pins, MP_OBJ_NEW_SMALL_INT(i), MP_OBJ_SENTINEL));
+        pins_array[i] = pin;
+    }
+
+    common_hal_keypad_keys_construct(self, num_pins, pins_array, value_when_pressed, args[ARG_pull].u_bool);
+    return MP_OBJ_FROM_PTR(self);
+}
+
+//|     def scan(self) -> None:
+//|         """Scan the keys and record which are newly pressed, still pressed,
+//|         newly released, and still released. For convenient activity checking,
+//|         """
+//|         ...
+//|
+STATIC mp_obj_t keypad_keys_scan(mp_obj_t self_in) {
+    keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    common_hal_keypad_keys_scan(self);
+    return MP_ROM_NONE;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_keys_scan_obj, keypad_keys_scan);
+
+//|     def state(self, key_num: int) -> keypad.State:
+//|         """Return the state for the given ``key_num``, based
+//|         on the results of the most recent `scan()`.
+//|
+//|         :param int key_num: Key number: corresponds to the sequence of pins
+//|         :return: state of key number ``key_num``
+//|         :rtype: keypad.State: One of `State.JUST_PRESSED`, `State.STILL_PRESSED`,
+//|           `State.JUST_RELEASED`, or `State.STILL_RELEASED`.
+//|           The inclusive states `State.PRESSED` and `State.RELEASED` will *not* be returned.
+//|         """
+//|         ...
+//|
+STATIC mp_obj_t keypad_keys_state(mp_obj_t self_in, mp_obj_t key_num_obj) {
+    keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_int_t key_num = mp_obj_int_get_checked(key_num_obj);
+    if (key_num < 0 || key_num >= common_hal_keypad_keys_length(self)) {
+        mp_raise_ValueError_varg(translate("%q out of range"), MP_QSTR_key_num);
+    }
+
+    return cp_enum_find(&keypad_state_type, common_hal_keypad_keys_state(self, (mp_uint_t)key_num));
+}
+MP_DEFINE_CONST_FUN_OBJ_2(keypad_keys_state_obj, keypad_keys_state);
+
+//|     def keys_with_state(self, state: State, into_list: List[Optional[int]]) -> None:
+//|         """Store key numbers of keys with state ``state`` in ``into_list``.
+//|         The states checked are based on the results of the most recent `scan()`.
+//|
+//|         You can use the inclusive states `State.PRESSED` and `State.RELEASED`.
+//|         `State.PRESSED` includes states `State.JUST_PRESSED` and `State.STILL_PRESSED`.
+//|         `State.RELEASED` includes `State.JUST_RELEASED` and `State.STILL_RELEASED`.
+//|
+//|         The key numbers are stored in ``into_list`` consecutively, up to ``len(into_list)``.
+//|         The ``into_list`` is not extended if there are more keys with the given
+//|         state than list slots. Instead, leftover key numbers are discarded.
+//|         If there are fewer keys with the given state, the rest of ``into_list``
+//|         is padded with ``None``. For example,
+//|         if four keys are being monitored, and only key numbers 0 and 2 have the given state,
+//|         ``into_list`` will be set to ``[0, 2, None, None]``. You can iterate over
+//|         ``into_list`` and stop when you find the first ``None``.
+//|         """
+//|         ...
+//|
+STATIC mp_obj_t keypad_keys_keys_with_state(mp_obj_t self_in, mp_obj_t state_in, mp_obj_t into_list_in) {
+    keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    if (!mp_obj_is_type(state_in, &keypad_state_type)) {
+        mp_raise_ValueError_varg(translate("Expected a %q"), keypad_state_type.name);
+    }
+
+    if (!mp_obj_is_type(into_list_in, &mp_type_list)) {
+        mp_raise_ValueError_varg(translate("Expected a %q"), mp_type_list.name);
+    }
+
+    int state = cp_enum_value(&keypad_state_type, state_in);
+    mp_obj_list_t *into_list = MP_OBJ_TO_PTR(into_list_in);
+
+    common_hal_keypad_keys_keys_with_state(self, state, into_list);
+
+    return MP_ROM_NONE;
+}
+MP_DEFINE_CONST_FUN_OBJ_3(keypad_keys_keys_with_state_obj, keypad_keys_keys_with_state);
+
+STATIC const mp_rom_map_elem_t keypad_keys_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_keys_with_state),  MP_ROM_PTR(&keypad_keys_keys_with_state_obj) },
+    { MP_ROM_QSTR(MP_QSTR_scan),             MP_ROM_PTR(&keypad_keys_scan_obj) },
+    { MP_ROM_QSTR(MP_QSTR_state),            MP_ROM_PTR(&keypad_keys_state_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(keypad_keys_locals_dict, keypad_keys_locals_dict_table);
+
+const mp_obj_type_t keypad_keys_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Keys,
+    .make_new = keypad_keys_make_new,
+    .locals_dict = (mp_obj_t)&keypad_keys_locals_dict,
+};
diff --git a/shared-bindings/keypad/Keys.h b/shared-bindings/keypad/Keys.h
new file mode 100644
index 0000000000..f7d33a78c1
--- /dev/null
+++ b/shared-bindings/keypad/Keys.h
@@ -0,0 +1,41 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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_KEYPAD_KEYS_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_KEYS_H
+
+#include "py/objlist.h"
+#include "shared-module/keypad/Keys.h"
+
+extern const mp_obj_type_t keypad_keys_type;
+
+void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pins, mcu_pin_obj_t *pins[], bool value_when_pressed,  bool pull);
+void common_hal_keypad_keys_keys_with_state(keypad_keys_obj_t *self, mp_int_t state, mp_obj_list_t *into);
+size_t common_hal_keypad_keys_length(keypad_keys_obj_t *self);
+void common_hal_keypad_keys_scan(keypad_keys_obj_t *self);
+mp_int_t common_hal_keypad_keys_state(keypad_keys_obj_t *self, mp_uint_t key_num);
+
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_KEYS_H
diff --git a/shared-bindings/keypad/State.c b/shared-bindings/keypad/State.c
new file mode 100644
index 0000000000..8e35d09a83
--- /dev/null
+++ b/shared-bindings/keypad/State.c
@@ -0,0 +1,75 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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/obj.h"
+#include "py/enum.h"
+
+#include "shared-bindings/keypad/State.h"
+
+// Defines enum values like
+// const cp_enum_obj_t state_JUST_PRESSED = ...
+MAKE_ENUM_VALUE(keypad_state_type, state, JUST_PRESSED, STATE_JUST_PRESSED);
+MAKE_ENUM_VALUE(keypad_state_type, state, STILL_PRESSED, STATE_STILL_PRESSED);
+MAKE_ENUM_VALUE(keypad_state_type, state, PRESSED, STATE_PRESSED);
+MAKE_ENUM_VALUE(keypad_state_type, state, JUST_RELEASED, STATE_JUST_RELEASED);
+MAKE_ENUM_VALUE(keypad_state_type, state, STILL_RELEASED, STATE_STILL_RELEASED);
+MAKE_ENUM_VALUE(keypad_state_type, state, RELEASED, STATE_RELEASED);
+
+//| class State:
+//|     """The state of a key, based on the last call to ``scan()``."""
+//|
+//|     JUST_PRESSED: State
+//|     """The key transitioned from released to pressed."""
+//|
+//|     STILL_PRESSED: State
+//|     """The key was already pressed, and continues to be pressed."""
+//|
+//|     PRESSED: State
+//|     """The key is now pressed. Used to indicate states `JUST_PRESSED` and `STILL_PRESSED` inclusively."""
+//|
+//|     JUST_RELEASED: State
+//|     """The key transitioned from pressed to released."""
+//|
+//|     STILL_RELEASED: State
+//|     """The key was already released, and continues to be released."""
+//|
+//|     RELEASED: State
+//|     """The key is now released. Used to indicate states `JUST_RELEASED` and `STILL_RELEASED` inclusively."""
+//|
+MAKE_ENUM_MAP(keypad_state) {
+    MAKE_ENUM_MAP_ENTRY(state, JUST_PRESSED),
+    MAKE_ENUM_MAP_ENTRY(state, STILL_PRESSED),
+    MAKE_ENUM_MAP_ENTRY(state, PRESSED),
+    MAKE_ENUM_MAP_ENTRY(state, JUST_RELEASED),
+    MAKE_ENUM_MAP_ENTRY(state, STILL_RELEASED),
+    MAKE_ENUM_MAP_ENTRY(state, RELEASED),
+};
+STATIC MP_DEFINE_CONST_DICT(keypad_state_locals_dict, keypad_state_locals_table);
+
+MAKE_PRINTER(keypad, keypad_state);
+
+// Defines keypad_state_type.
+MAKE_ENUM_TYPE(keypad, State, keypad_state);
diff --git a/shared-bindings/keypad/State.h b/shared-bindings/keypad/State.h
new file mode 100644
index 0000000000..1b6316b001
--- /dev/null
+++ b/shared-bindings/keypad/State.h
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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_KEYPAD_STATE__H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_STATE__H
+
+#include "py/obj.h"
+#include "py/enum.h"
+
+typedef enum {
+    STATE_JUST_PRESSED,
+    STATE_STILL_PRESSED,
+    STATE_PRESSED,
+    STATE_JUST_RELEASED,
+    STATE_STILL_RELEASED,
+    STATE_RELEASED,
+} keypad_state_t;
+
+extern const mp_obj_type_t keypad_state_type;
+
+#endif // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_STATE__H
diff --git a/shared-bindings/keypad/__init__.c b/shared-bindings/keypad/__init__.c
new file mode 100644
index 0000000000..4ca66b531a
--- /dev/null
+++ b/shared-bindings/keypad/__init__.c
@@ -0,0 +1,53 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2011 Dan Halbert 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/obj.h"
+
+#include "shared-bindings/keypad/__init__.h"
+// #include "shared-bindings/keypad/KeyMatrix.h"
+#include "shared-bindings/keypad/Keys.h"
+#include "shared-bindings/keypad/State.h"
+
+//| """Support for scanning keys and key matrices
+//|
+//| The `keypad` module provides native support to scan sets of keys or buttons,
+//| connected independently to individual pins, or connected in a row-and-column matrix.
+//| """
+//|
+
+STATIC mp_map_elem_t keypad_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__),  MP_OBJ_NEW_QSTR(MP_QSTR_keypad) },
+//    { MP_ROM_QSTR(MP_QSTR_KeyMatrix), MP_OBJ_FROM_PTR(&keypad_key_matrix_type) },
+    { MP_ROM_QSTR(MP_QSTR_Keys),      MP_OBJ_FROM_PTR(&keypad_keys_type) },
+    { MP_ROM_QSTR(MP_QSTR_State),     MP_OBJ_FROM_PTR(&keypad_state_type) },
+};
+
+STATIC MP_DEFINE_MUTABLE_DICT(keypad_module_globals, keypad_module_globals_table);
+
+const mp_obj_module_t keypad_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&keypad_module_globals,
+};
diff --git a/shared-bindings/keypad/__init__.h b/shared-bindings/keypad/__init__.h
new file mode 100644
index 0000000000..5e484dc5ed
--- /dev/null
+++ b/shared-bindings/keypad/__init__.h
@@ -0,0 +1,41 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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 SHARED_BINDINGS_KEYPAD_H
+#define SHARED_BINDINGS_KEYPAD_H
+
+#include "py/obj.h"
+#include "py/objtuple.h"
+#include "shared-module/keypad/__init__.h"
+
+extern mp_obj_tuple_t common_hal_keypad_devices;
+
+void keypad_set_devices(mp_obj_t devices);
+
+bool common_hal_keypad_disable(void);
+bool common_hal_keypad_enable(const mp_obj_t devices_seq);
+
+#endif // SHARED_BINDINGS_KEYPAD_H
diff --git a/shared-module/keypad/Keys.c b/shared-module/keypad/Keys.c
new file mode 100644
index 0000000000..ca1dca42ef
--- /dev/null
+++ b/shared-module/keypad/Keys.c
@@ -0,0 +1,127 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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/gc.h"
+#include "py/objproperty.h"
+#include "shared-bindings/keypad/Keys.h"
+#include "shared-bindings/keypad/State.h"
+#include "shared-bindings/digitalio/DigitalInOut.h"
+#include "py/runtime.h"
+
+void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pins, mcu_pin_obj_t *pins[], bool value_when_pressed, bool pull) {
+    mp_obj_t dios[num_pins];
+
+    for (size_t i = 0; i < num_pins; i++) {
+        digitalio_digitalinout_obj_t *dio = m_new_obj(digitalio_digitalinout_obj_t);
+        dio->base.type = &digitalio_digitalinout_type;
+        common_hal_digitalio_digitalinout_construct(dio, pins[i]);
+        if (pull) {
+            common_hal_digitalio_digitalinout_set_pull(dio, value_when_pressed ? PULL_DOWN : PULL_UP);
+        }
+        dios[i] = dio;
+    }
+
+    self->digitalinouts = mp_obj_new_tuple(num_pins, dios);
+    self->currently_pressed = (bool *)gc_alloc(sizeof(bool) * num_pins, false, false);
+    self->previously_pressed = (bool *)gc_alloc(sizeof(bool) * num_pins, false, false);
+    self->value_when_pressed = value_when_pressed;
+
+}
+
+void common_hal_keypad_keys_keys_with_state(keypad_keys_obj_t *self, int state, mp_obj_list_t *list_into) {
+    const size_t list_length = list_into->len;
+
+    size_t next_list_slot = 0;
+
+    for (mp_uint_t key_num = 0; key_num < common_hal_keypad_keys_length(self); key_num++) {
+        if (next_list_slot >= list_length) {
+            // List is full.
+            break;
+        }
+
+        bool store_key = false;
+        switch (state) {
+            case STATE_JUST_PRESSED:
+                store_key = !self->previously_pressed[key_num] && self->currently_pressed[key_num];
+                break;
+            case STATE_STILL_PRESSED:
+                store_key = self->previously_pressed[key_num] && self->currently_pressed[key_num];
+                break;
+            case STATE_PRESSED:
+                store_key = self->currently_pressed[key_num];
+                break;
+            case STATE_JUST_RELEASED:
+                store_key = self->previously_pressed[key_num] && !self->currently_pressed[key_num];
+                break;
+            case STATE_STILL_RELEASED:
+                store_key = !self->previously_pressed[key_num] && !self->currently_pressed[key_num];
+                break;
+            case STATE_RELEASED:
+                store_key = !self->currently_pressed[key_num];
+                break;
+        }
+
+        if (store_key) {
+            mp_obj_list_store(list_into, MP_OBJ_NEW_SMALL_INT(next_list_slot),
+                MP_OBJ_NEW_SMALL_INT(key_num));
+            next_list_slot++;
+        }
+
+        for (size_t unused_slot = next_list_slot; unused_slot < list_length; unused_slot++) {
+            mp_obj_list_store(list_into, MP_OBJ_NEW_SMALL_INT(unused_slot),
+                MP_ROM_NONE);
+        }
+    }
+}
+
+size_t common_hal_keypad_keys_length(keypad_keys_obj_t *self) {
+    return self->digitalinouts->len;
+}
+
+void common_hal_keypad_keys_scan(keypad_keys_obj_t *self) {
+    for (mp_uint_t key_num = 0; key_num < common_hal_keypad_keys_length(self); key_num++) {
+        self->previously_pressed[key_num] = self->currently_pressed[key_num];
+        self->currently_pressed[key_num] =
+            common_hal_digitalio_digitalinout_get_value(self->digitalinouts->items[key_num]) ==
+            self->value_when_pressed;
+    }
+}
+
+mp_int_t common_hal_keypad_keys_state(keypad_keys_obj_t *self, mp_uint_t key_num) {
+    if (self->currently_pressed[key_num]) {
+        if (self->previously_pressed[key_num]) {
+            return STATE_STILL_PRESSED;
+        } else {
+            return STATE_JUST_PRESSED;
+        }
+    } else {
+        if (self->previously_pressed[key_num]) {
+            return STATE_JUST_RELEASED;
+        } else {
+            return STATE_STILL_RELEASED;
+        }
+    }
+}
diff --git a/shared-module/keypad/Keys.h b/shared-module/keypad/Keys.h
new file mode 100644
index 0000000000..077b981dd6
--- /dev/null
+++ b/shared-module/keypad/Keys.h
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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_MODULE_KEYPAD_KEYS_H
+#define MICROPY_INCLUDED_SHARED_MODULE_KEYPAD_KEYS_H
+
+#include "common-hal/digitalio/DigitalInOut.h"
+
+#include "py/obj.h"
+#include "py/objtuple.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    mp_obj_tuple_t *digitalinouts;
+    bool value_when_pressed;
+    bool *previously_pressed;
+    bool *currently_pressed;
+} keypad_keys_obj_t;
+
+
+#endif  // MICROPY_INCLUDED_SHARED_MODULE_KEYPAD_KEYS_H
diff --git a/shared-module/keypad/State.c b/shared-module/keypad/State.c
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/shared-module/keypad/__init__.c b/shared-module/keypad/__init__.c
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/shared-module/keypad/__init__.h b/shared-module/keypad/__init__.h
new file mode 100644
index 0000000000..4220a3df63
--- /dev/null
+++ b/shared-module/keypad/__init__.h
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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 SHARED_MODULE_KEYPAD_H
+#define SHARED_MODULE_KEYPAD_H
+
+#endif // SHARED_MODULE_KEYPAD_H

From bdb70669a1391cebad0e525e821d40c236754990 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Wed, 9 Jun 2021 23:47:49 -0400
Subject: [PATCH 216/349] fix bad merge

---
 .../boards/sparkfun_samd51_micromod/board.c     | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/ports/atmel-samd/boards/sparkfun_samd51_micromod/board.c b/ports/atmel-samd/boards/sparkfun_samd51_micromod/board.c
index 1a8f297928..5fca974e9e 100644
--- a/ports/atmel-samd/boards/sparkfun_samd51_micromod/board.c
+++ b/ports/atmel-samd/boards/sparkfun_samd51_micromod/board.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2021 Dan Halbert for Adafruit Industries
+ * Copyright (c) 2017 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
@@ -24,12 +24,15 @@
  * THE SOFTWARE.
  */
 
-    << << << < HEAD: shared - module / keypad / __init__.h
-#ifndef SHARED_MODULE_KEYPAD_H
-#define SHARED_MODULE_KEYPAD_H
-== == == =
 #include "supervisor/board.h"
 #include "mpconfigboard.h"
-    >> >> >> > adafruit / main: ports / atmel - samd / boards / sparkfun_samd51_micromod / board.c
 
-#endif // SHARED_MODULE_KEYPAD_H
+void board_init(void) {
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+}

From d3d9e0a487f2d19831921473e4ee26aeee81aac0 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Thu, 10 Jun 2021 00:07:23 -0400
Subject: [PATCH 217/349] add debouncing

---
 shared-bindings/keypad/Keys.c | 13 +++++++++----
 shared-bindings/keypad/Keys.h |  2 +-
 shared-module/keypad/Keys.c   | 14 +++++++++++++-
 shared-module/keypad/Keys.h   |  1 +
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/shared-bindings/keypad/Keys.c b/shared-bindings/keypad/Keys.c
index 118328abe9..f1a83a64bd 100644
--- a/shared-bindings/keypad/Keys.c
+++ b/shared-bindings/keypad/Keys.c
@@ -80,20 +80,25 @@ STATIC mp_obj_t keypad_keys_make_new(const mp_obj_type_t *type, size_t n_args, c
     }
 
     common_hal_keypad_keys_construct(self, num_pins, pins_array, value_when_pressed, args[ARG_pull].u_bool);
+    common_hal_keypad_keys_scan(self);
     return MP_OBJ_FROM_PTR(self);
 }
 
-//|     def scan(self) -> None:
+//|     def scan(self) -> bool:
 //|         """Scan the keys and record which are newly pressed, still pressed,
-//|         newly released, and still released. For convenient activity checking,
+//|         newly released, and still released. If not enough time has elapsed since
+//|         the last scan for debouncing, do nothing and return ``False``.
+//|
+//|         :return: ``True`` if sufficient time has elapsed for debouncing (about 20 msecs),
+//|           otherwise ``False``.
+//|         :rtype: bool
 //|         """
 //|         ...
 //|
 STATIC mp_obj_t keypad_keys_scan(mp_obj_t self_in) {
     keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
-    common_hal_keypad_keys_scan(self);
-    return MP_ROM_NONE;
+    return mp_obj_new_bool(common_hal_keypad_keys_scan(self));
 }
 MP_DEFINE_CONST_FUN_OBJ_1(keypad_keys_scan_obj, keypad_keys_scan);
 
diff --git a/shared-bindings/keypad/Keys.h b/shared-bindings/keypad/Keys.h
index f7d33a78c1..694a560238 100644
--- a/shared-bindings/keypad/Keys.h
+++ b/shared-bindings/keypad/Keys.h
@@ -35,7 +35,7 @@ extern const mp_obj_type_t keypad_keys_type;
 void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pins, mcu_pin_obj_t *pins[], bool value_when_pressed,  bool pull);
 void common_hal_keypad_keys_keys_with_state(keypad_keys_obj_t *self, mp_int_t state, mp_obj_list_t *into);
 size_t common_hal_keypad_keys_length(keypad_keys_obj_t *self);
-void common_hal_keypad_keys_scan(keypad_keys_obj_t *self);
+bool common_hal_keypad_keys_scan(keypad_keys_obj_t *self);
 mp_int_t common_hal_keypad_keys_state(keypad_keys_obj_t *self, mp_uint_t key_num);
 
 #endif  // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_KEYS_H
diff --git a/shared-module/keypad/Keys.c b/shared-module/keypad/Keys.c
index ca1dca42ef..05faeafb0a 100644
--- a/shared-module/keypad/Keys.c
+++ b/shared-module/keypad/Keys.c
@@ -30,6 +30,9 @@
 #include "shared-bindings/keypad/State.h"
 #include "shared-bindings/digitalio/DigitalInOut.h"
 #include "py/runtime.h"
+#include "supervisor/port.h"
+
+#define DEBOUNCE_TICKS (20)
 
 void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pins, mcu_pin_obj_t *pins[], bool value_when_pressed, bool pull) {
     mp_obj_t dios[num_pins];
@@ -101,13 +104,22 @@ size_t common_hal_keypad_keys_length(keypad_keys_obj_t *self) {
     return self->digitalinouts->len;
 }
 
-void common_hal_keypad_keys_scan(keypad_keys_obj_t *self) {
+bool common_hal_keypad_keys_scan(keypad_keys_obj_t *self) {
+    uint64_t now = port_get_raw_ticks(NULL);
+    uint64_t last_scan_ticks = self->last_scan_ticks;
+    self->last_scan_ticks = now;
+    if (now - last_scan_ticks < DEBOUNCE_TICKS) {
+        // Too soon.
+        return false;
+    }
+
     for (mp_uint_t key_num = 0; key_num < common_hal_keypad_keys_length(self); key_num++) {
         self->previously_pressed[key_num] = self->currently_pressed[key_num];
         self->currently_pressed[key_num] =
             common_hal_digitalio_digitalinout_get_value(self->digitalinouts->items[key_num]) ==
             self->value_when_pressed;
     }
+    return true;
 }
 
 mp_int_t common_hal_keypad_keys_state(keypad_keys_obj_t *self, mp_uint_t key_num) {
diff --git a/shared-module/keypad/Keys.h b/shared-module/keypad/Keys.h
index 077b981dd6..898a937632 100644
--- a/shared-module/keypad/Keys.h
+++ b/shared-module/keypad/Keys.h
@@ -35,6 +35,7 @@
 typedef struct {
     mp_obj_base_t base;
     mp_obj_tuple_t *digitalinouts;
+    uint64_t last_scan_ticks;
     bool value_when_pressed;
     bool *previously_pressed;
     bool *currently_pressed;

From 01a8a95b2c99274df9983ed15cfa225189548dd4 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Thu, 10 Jun 2021 01:14:16 -0400
Subject: [PATCH 218/349] fix signed/unsigned compilation problem

---
 shared-bindings/keypad/Keys.c | 2 +-
 shared-module/keypad/Keys.c   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/shared-bindings/keypad/Keys.c b/shared-bindings/keypad/Keys.c
index f1a83a64bd..4a878ba247 100644
--- a/shared-bindings/keypad/Keys.c
+++ b/shared-bindings/keypad/Keys.c
@@ -117,7 +117,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(keypad_keys_scan_obj, keypad_keys_scan);
 STATIC mp_obj_t keypad_keys_state(mp_obj_t self_in, mp_obj_t key_num_obj) {
     keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_int_t key_num = mp_obj_int_get_checked(key_num_obj);
-    if (key_num < 0 || key_num >= common_hal_keypad_keys_length(self)) {
+    if (key_num < 0 || (mp_uint_t)key_num >= common_hal_keypad_keys_length(self)) {
         mp_raise_ValueError_varg(translate("%q out of range"), MP_QSTR_key_num);
     }
 
diff --git a/shared-module/keypad/Keys.c b/shared-module/keypad/Keys.c
index 05faeafb0a..c09317d1f9 100644
--- a/shared-module/keypad/Keys.c
+++ b/shared-module/keypad/Keys.c
@@ -106,13 +106,13 @@ size_t common_hal_keypad_keys_length(keypad_keys_obj_t *self) {
 
 bool common_hal_keypad_keys_scan(keypad_keys_obj_t *self) {
     uint64_t now = port_get_raw_ticks(NULL);
-    uint64_t last_scan_ticks = self->last_scan_ticks;
-    self->last_scan_ticks = now;
-    if (now - last_scan_ticks < DEBOUNCE_TICKS) {
+    if (now - self->last_scan_ticks < DEBOUNCE_TICKS) {
         // Too soon.
         return false;
     }
 
+    self->last_scan_ticks = now;
+
     for (mp_uint_t key_num = 0; key_num < common_hal_keypad_keys_length(self); key_num++) {
         self->previously_pressed[key_num] = self->currently_pressed[key_num];
         self->currently_pressed[key_num] =

From 71e3538a3274322ea845959d75283d1e96fefb6b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 19 May 2021 23:43:21 +1000
Subject: [PATCH 219/349] stm32/usb: Add USB_VCP.irq method, to set a callback
 on USB data RX.

Usage:

    usb = pyb.USB_VCP()
    usb.irq(lambda u:print(u, u.read()), usb.IRQ_RX)

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/pyb.USB_VCP.rst     | 14 +++++++
 ports/stm32/mpconfigport.h       |  3 ++
 ports/stm32/usb.c                | 71 +++++++++++++++++++++++++++++++-
 ports/stm32/usbd_cdc_interface.c |  2 +
 ports/stm32/usbd_cdc_interface.h |  2 +
 5 files changed, 91 insertions(+), 1 deletion(-)

diff --git a/docs/library/pyb.USB_VCP.rst b/docs/library/pyb.USB_VCP.rst
index bbcbc0701b..1e44e53fd8 100644
--- a/docs/library/pyb.USB_VCP.rst
+++ b/docs/library/pyb.USB_VCP.rst
@@ -109,6 +109,16 @@ Methods
 
    Return value: number of bytes sent.
 
+.. method:: USB_VCP.irq(handler=None, trigger=0, hard=False)
+
+   Register *handler* to be called whenever an event specified by *trigger*
+   occurs.  The *handler* function must take exactly one argument, which will
+   be the USB VCP object.  Pass in ``None`` to disable the callback.
+
+   Valid values for *trigger* are:
+
+     - ``USB_VCP.IRQ_RX``: new data is available for reading from the USB VCP object.
+
 
 Constants
 ---------
@@ -117,3 +127,7 @@ Constants
           USB_VCP.CTS
 
    to select the flow control type.
+
+.. data:: USB_VCP.IRQ_RX
+
+   IRQ trigger values for :meth:`USB_VCP.irq`.
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 28a2d6a76d..ff58c515e3 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -383,6 +383,9 @@ struct _mp_bluetooth_btstack_root_pointers_t;
     /* pointers to all CAN objects (if they have been created) */ \
     struct _pyb_can_obj_t *pyb_can_obj_all[MICROPY_HW_MAX_CAN]; \
     \
+    /* USB_VCP IRQ callbacks (if they have been set) */ \
+    mp_obj_t pyb_usb_vcp_irq[MICROPY_HW_USB_CDC_NUM]; \
+    \
     /* list of registered NICs */ \
     mp_obj_list_t mod_network_nic_list; \
     \
diff --git a/ports/stm32/usb.c b/ports/stm32/usb.c
index 5003bb27cc..eba95de49f 100644
--- a/ports/stm32/usb.c
+++ b/ports/stm32/usb.c
@@ -39,6 +39,7 @@
 #include "py/stream.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
+#include "lib/utils/mpirq.h"
 #include "bufhelper.h"
 #include "storage.h"
 #include "sdcard.h"
@@ -70,6 +71,9 @@
 #define MAX_ENDPOINT(dev_id) (8)
 #endif
 
+// Constants for USB_VCP.irq trigger.
+#define USBD_CDC_IRQ_RX (1)
+
 STATIC void pyb_usb_vcp_init0(void);
 
 // this will be persistent across a soft-reset
@@ -219,6 +223,7 @@ const mp_rom_obj_tuple_t pyb_usb_hid_keyboard_obj = {
 
 void pyb_usb_init0(void) {
     for (int i = 0; i < MICROPY_HW_USB_CDC_NUM; ++i) {
+        usb_device.usbd_cdc_itf[i].cdc_idx = i;
         usb_device.usbd_cdc_itf[i].attached_to_repl = false;
     }
     #if MICROPY_HW_USB_HID
@@ -644,14 +649,42 @@ const pyb_usb_vcp_obj_t pyb_usb_vcp_obj[MICROPY_HW_USB_CDC_NUM] = {
     #endif
 };
 
+STATIC bool pyb_usb_vcp_irq_scheduled[MICROPY_HW_USB_CDC_NUM];
+
 STATIC void pyb_usb_vcp_init0(void) {
+    for (size_t i = 0; i < MICROPY_HW_USB_CDC_NUM; ++i) {
+        MP_STATE_PORT(pyb_usb_vcp_irq)[i] = mp_const_none;
+        pyb_usb_vcp_irq_scheduled[i] = false;
+    }
+
     // Activate USB_VCP(0) on dupterm slot 1 for the REPL
     MP_STATE_VM(dupterm_objs[1]) = MP_OBJ_FROM_PTR(&pyb_usb_vcp_obj[0]);
     usb_vcp_attach_to_repl(&pyb_usb_vcp_obj[0], true);
 }
 
+STATIC mp_obj_t pyb_usb_vcp_irq_run(mp_obj_t self_in) {
+    pyb_usb_vcp_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uint8_t idx = self->cdc_itf->cdc_idx;
+    mp_obj_t callback = MP_STATE_PORT(pyb_usb_vcp_irq)[idx];
+    pyb_usb_vcp_irq_scheduled[idx] = false;
+    if (callback != mp_const_none && usbd_cdc_rx_num(self->cdc_itf)) {
+        mp_call_function_1(callback, self_in);
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_usb_vcp_irq_run_obj, pyb_usb_vcp_irq_run);
+
+void usbd_cdc_rx_event_callback(usbd_cdc_itf_t *cdc) {
+    uint8_t idx = cdc->cdc_idx;
+    mp_obj_t self = MP_OBJ_FROM_PTR(&pyb_usb_vcp_obj[idx]);
+    mp_obj_t callback = MP_STATE_PORT(pyb_usb_vcp_irq)[idx];
+    if (callback != mp_const_none && !pyb_usb_vcp_irq_scheduled[idx]) {
+        pyb_usb_vcp_irq_scheduled[idx] = mp_sched_schedule(MP_OBJ_FROM_PTR(&pyb_usb_vcp_irq_run_obj), self);
+    }
+}
+
 STATIC void pyb_usb_vcp_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    int id = ((pyb_usb_vcp_obj_t *)MP_OBJ_TO_PTR(self_in))->cdc_itf - &usb_device.usbd_cdc_itf[0];
+    int id = ((pyb_usb_vcp_obj_t *)MP_OBJ_TO_PTR(self_in))->cdc_itf->cdc_idx;
     mp_printf(print, "USB_VCP(%u)", id);
 }
 
@@ -796,6 +829,40 @@ STATIC mp_obj_t pyb_usb_vcp_recv(size_t n_args, const mp_obj_t *args, mp_map_t *
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_usb_vcp_recv_obj, 1, pyb_usb_vcp_recv);
 
+// irq(handler=None, trigger=0, hard=False)
+STATIC mp_obj_t pyb_usb_vcp_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    mp_arg_val_t args[MP_IRQ_ARG_INIT_NUM_ARGS];
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_IRQ_ARG_INIT_NUM_ARGS, mp_irq_init_args, args);
+    pyb_usb_vcp_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+
+    if (n_args > 1 || kw_args->used != 0) {
+        // Check the handler.
+        mp_obj_t handler = args[MP_IRQ_ARG_INIT_handler].u_obj;
+        if (handler != mp_const_none && !mp_obj_is_callable(handler)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("handler must be None or callable"));
+        }
+
+        // Check the trigger.
+        mp_uint_t trigger = args[MP_IRQ_ARG_INIT_trigger].u_int;
+        if (trigger == 0) {
+            handler = mp_const_none;
+        } else if (trigger != USBD_CDC_IRQ_RX) {
+            mp_raise_ValueError(MP_ERROR_TEXT("unsupported trigger"));
+        }
+
+        // Check hard/soft.
+        if (args[MP_IRQ_ARG_INIT_hard].u_bool) {
+            mp_raise_ValueError(MP_ERROR_TEXT("hard unsupported"));
+        }
+
+        // Reconfigure the IRQ.
+        MP_STATE_PORT(pyb_usb_vcp_irq)[self->cdc_itf->cdc_idx] = handler;
+    }
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_usb_vcp_irq_obj, 1, pyb_usb_vcp_irq);
+
 mp_obj_t pyb_usb_vcp___exit__(size_t n_args, const mp_obj_t *args) {
     return mp_const_none;
 }
@@ -814,6 +881,7 @@ STATIC const mp_rom_map_elem_t pyb_usb_vcp_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_readlines), MP_ROM_PTR(&mp_stream_unbuffered_readlines_obj)},
     { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
     { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&mp_identity_obj) },
+    { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&pyb_usb_vcp_irq_obj) },
     { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&mp_identity_obj) },
     { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj) },
     { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&pyb_usb_vcp___exit___obj) },
@@ -821,6 +889,7 @@ STATIC const mp_rom_map_elem_t pyb_usb_vcp_locals_dict_table[] = {
     // class constants
     { MP_ROM_QSTR(MP_QSTR_RTS), MP_ROM_INT(USBD_CDC_FLOWCONTROL_RTS) },
     { MP_ROM_QSTR(MP_QSTR_CTS), MP_ROM_INT(USBD_CDC_FLOWCONTROL_CTS) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RX), MP_ROM_INT(USBD_CDC_IRQ_RX) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(pyb_usb_vcp_locals_dict, pyb_usb_vcp_locals_dict_table);
diff --git a/ports/stm32/usbd_cdc_interface.c b/ports/stm32/usbd_cdc_interface.c
index a465f608a6..a1ac5fd22f 100644
--- a/ports/stm32/usbd_cdc_interface.c
+++ b/ports/stm32/usbd_cdc_interface.c
@@ -308,6 +308,8 @@ int8_t usbd_cdc_receive(usbd_cdc_state_t *cdc_in, size_t len) {
         }
     }
 
+    usbd_cdc_rx_event_callback(cdc);
+
     if ((cdc->flow & USBD_CDC_FLOWCONTROL_RTS) && (usbd_cdc_rx_buffer_full(cdc))) {
         cdc->rx_buf_full = true;
         return USBD_BUSY;
diff --git a/ports/stm32/usbd_cdc_interface.h b/ports/stm32/usbd_cdc_interface.h
index d0509b09f9..6b510f2399 100644
--- a/ports/stm32/usbd_cdc_interface.h
+++ b/ports/stm32/usbd_cdc_interface.h
@@ -63,6 +63,7 @@ typedef struct _usbd_cdc_itf_t {
     uint16_t tx_buf_ptr_out_next; // next position of above once transmission finished
     uint8_t tx_need_empty_packet; // used to flush the USB IN endpoint if the last packet was exactly the endpoint packet size
 
+    uint8_t cdc_idx; // between 0 and MICROPY_HW_USB_CDC_NUM-1
     volatile uint8_t connect_state; // indicates if we are connected
     uint8_t attached_to_repl; // indicates if interface is connected to REPL
     uint8_t flow; // USBD_CDC_FLOWCONTROL_* setting flags
@@ -82,5 +83,6 @@ void usbd_cdc_tx_always(usbd_cdc_itf_t *cdc, const uint8_t *buf, uint32_t len);
 
 int usbd_cdc_rx_num(usbd_cdc_itf_t *cdc);
 int usbd_cdc_rx(usbd_cdc_itf_t *cdc, uint8_t *buf, uint32_t len, uint32_t timeout);
+void usbd_cdc_rx_event_callback(usbd_cdc_itf_t *cdc);
 
 #endif // MICROPY_INCLUDED_STM32_USBD_CDC_INTERFACE_H

From cf849d84b984081b1b745edbad2dccd06bdb339f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Jun 2021 22:48:17 +1000
Subject: [PATCH 220/349] stm32/boards: Enable MICROPY_HW_SPIFLASH_ENABLE_CACHE
 on VCC_GND boards.

Because these boards use the SPI flash cache in their bdev.c configuration.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.h | 1 +
 ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.h b/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.h
index fd896c6666..e9e1f55c26 100644
--- a/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.h
+++ b/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.h
@@ -132,6 +132,7 @@ void VCC_GND_F407VE_board_early_init(void);
 
 extern const struct _mp_spiflash_config_t spiflash_config;
 extern struct _spi_bdev_t spi_bdev;
+#define MICROPY_HW_SPIFLASH_ENABLE_CACHE (1)
 #define MICROPY_HW_BDEV_IOCTL(op, arg) ( \
     (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE) : \
     (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \
diff --git a/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.h b/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.h
index bd17ab410f..37eeff5138 100644
--- a/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.h
+++ b/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.h
@@ -140,6 +140,7 @@ void VCC_GND_F407ZG_board_early_init(void);
 
 extern const struct _mp_spiflash_config_t spiflash_config;
 extern struct _spi_bdev_t spi_bdev;
+#define MICROPY_HW_SPIFLASH_ENABLE_CACHE (1)
 #define MICROPY_HW_BDEV_IOCTL(op, arg) ( \
     (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE) : \
     (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \

From 61f91de361c2c44e43fe326ea961b3cf68fcc310 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Jun 2021 22:48:54 +1000
Subject: [PATCH 221/349] stm32/sdram: Prevent array-bounds warnings with GCC
 11.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/sdram.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ports/stm32/sdram.c b/ports/stm32/sdram.c
index 2791df277a..514192519a 100644
--- a/ports/stm32/sdram.c
+++ b/ports/stm32/sdram.c
@@ -276,6 +276,13 @@ void sdram_leave_low_power(void) {
         (0 << 9U));                                                  // Mode Register Definition
 }
 
+#if __GNUC__ >= 11
+// Prevent array bounds warnings when accessing SDRAM_START_ADDRESS as a memory pointer.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
+#pragma GCC diagnostic ignored "-Wstringop-overflow"
+#endif
+
 bool sdram_test(bool fast) {
     uint8_t const pattern = 0xaa;
     uint8_t const antipattern = 0x55;
@@ -325,4 +332,8 @@ bool sdram_test(bool fast) {
     return true;
 }
 
+#if __GNUC__ >= 11
+#pragma GCC diagnostic pop
+#endif
+
 #endif // FMC_SDRAM_BANK

From c6e2237ac74e331fa8dda602b22057734563fa65 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Thu, 10 Jun 2021 09:05:19 -0400
Subject: [PATCH 222/349] fix non-longint builds

---
 shared-bindings/keypad/Keys.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/shared-bindings/keypad/Keys.c b/shared-bindings/keypad/Keys.c
index 4a878ba247..68a91e9243 100644
--- a/shared-bindings/keypad/Keys.c
+++ b/shared-bindings/keypad/Keys.c
@@ -68,7 +68,8 @@ STATIC mp_obj_t keypad_keys_make_new(const mp_obj_type_t *type, size_t n_args, c
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     mp_obj_t pins = args[ARG_pins].u_obj;
-    const mp_uint_t num_pins = mp_obj_int_get_uint_checked(mp_obj_len(pins));
+    // mp_obj_len() will be >= 0.
+    const size_t num_pins = (size_t)MP_OBJ_SMALL_INT_VALUE(mp_obj_len(pins));
     const bool value_when_pressed = args[ARG_value_when_pressed].u_bool;
 
     mcu_pin_obj_t *pins_array[num_pins];

From b815164bdf15269e39c0af67a5d765ec27a1509d Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Thu, 10 Jun 2021 10:09:55 -0400
Subject: [PATCH 223/349] Turn off keypad on a few small builds

---
 ports/stm/boards/espruino_pico/mpconfigboard.mk         | 1 +
 ports/stm/boards/espruino_wifi/mpconfigboard.mk         | 1 +
 ports/stm/boards/stm32f411ce_blackpill/mpconfigboard.mk | 1 +
 3 files changed, 3 insertions(+)

diff --git a/ports/stm/boards/espruino_pico/mpconfigboard.mk b/ports/stm/boards/espruino_pico/mpconfigboard.mk
index bc415f07ec..3f3e81d553 100644
--- a/ports/stm/boards/espruino_pico/mpconfigboard.mk
+++ b/ports/stm/boards/espruino_pico/mpconfigboard.mk
@@ -22,6 +22,7 @@ CIRCUITPY_AUDIOPWMIO = 0
 CIRCUITPY_BUSDEVICE = 0
 CIRCUITPY_BITMAPTOOLS = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
+CIRCUITPY_KEYPAD = 0
 CIRCUITPY_MIDI = 0
 CIRCUITPY_MSGPACK = 0
 CIRCUITPY_ULAB = 0
diff --git a/ports/stm/boards/espruino_wifi/mpconfigboard.mk b/ports/stm/boards/espruino_wifi/mpconfigboard.mk
index a2ceb1ae38..bb74ca8105 100644
--- a/ports/stm/boards/espruino_wifi/mpconfigboard.mk
+++ b/ports/stm/boards/espruino_wifi/mpconfigboard.mk
@@ -15,3 +15,4 @@ LD_FILE = boards/STM32F411_fs.ld
 # Too big for the flash
 CIRCUITPY_AUDIOCORE = 0
 CIRCUITPY_AUDIOPWMIO = 0
+CIRCUITPY_KEYPAD = 0
diff --git a/ports/stm/boards/stm32f411ce_blackpill/mpconfigboard.mk b/ports/stm/boards/stm32f411ce_blackpill/mpconfigboard.mk
index bfb88ab0ea..013d16dd6c 100644
--- a/ports/stm/boards/stm32f411ce_blackpill/mpconfigboard.mk
+++ b/ports/stm/boards/stm32f411ce_blackpill/mpconfigboard.mk
@@ -19,3 +19,4 @@ LD_FILE = boards/STM32F411_fs.ld
 # Too big for the flash
 CIRCUITPY_AUDIOCORE = 0
 CIRCUITPY_AUDIOPWMIO = 0
+CIRCUITPY_KEYPAD = 0

From 865abba197e4c1ccb4540f023b79035305effdb6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 11 Jun 2021 15:28:07 +1000
Subject: [PATCH 224/349] esp32/makeimg.py: Load sizes from partition table and
 verify data fits.

Changes introduced are:
- the application offset is now loaded from the partition table instead of
  being hard-coded to 0x10000
- maximum size of all sections is computed using the partition table
- an error is generated if any section overflows its allocated space
- remaining bytes are printed for each section

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/makeimg.py           | 50 +++++++++++++++++++++++++++-----
 ports/esp32/partitions-16MiB.csv |  3 +-
 ports/esp32/partitions-2MiB.csv  |  3 +-
 ports/esp32/partitions-ota.csv   |  3 +-
 ports/esp32/partitions.csv       |  3 +-
 5 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/ports/esp32/makeimg.py b/ports/esp32/makeimg.py
index 9f27ed6ef8..fd04583188 100644
--- a/ports/esp32/makeimg.py
+++ b/ports/esp32/makeimg.py
@@ -1,19 +1,44 @@
-import sys
+# Combine bootloader, partition table and application into a final binary.
+
+import os, sys
+
+sys.path.append(os.getenv("IDF_PATH") + "/components/partition_table")
+
+import gen_esp32part
 
 OFFSET_BOOTLOADER = 0x1000
 OFFSET_PARTITIONS = 0x8000
-OFFSET_APPLICATION = 0x10000
+
+
+def load_partition_table(filename):
+    with open(filename, "rb") as f:
+        return gen_esp32part.PartitionTable.from_binary(f.read())
+
+
+partition_table = load_partition_table(sys.argv[2])
+
+max_size_bootloader = OFFSET_PARTITIONS - OFFSET_BOOTLOADER
+max_size_partitions = 0
+offset_application = 0
+max_size_application = 0
+
+for part in partition_table:
+    if part.name == "nvs":
+        max_size_partitions = part.offset - OFFSET_PARTITIONS
+    elif part.type == gen_esp32part.APP_TYPE and offset_application == 0:
+        offset_application = part.offset
+        max_size_application = part.size
 
 files_in = [
-    ("bootloader", OFFSET_BOOTLOADER, sys.argv[1]),
-    ("partitions", OFFSET_PARTITIONS, sys.argv[2]),
-    ("application", OFFSET_APPLICATION, sys.argv[3]),
+    ("bootloader", OFFSET_BOOTLOADER, max_size_bootloader, sys.argv[1]),
+    ("partitions", OFFSET_PARTITIONS, max_size_partitions, sys.argv[2]),
+    ("application", offset_application, max_size_application, sys.argv[3]),
 ]
 file_out = sys.argv[4]
 
 cur_offset = OFFSET_BOOTLOADER
 with open(file_out, "wb") as fout:
-    for name, offset, file_in in files_in:
+    for name, offset, max_size, file_in in files_in:
         assert offset >= cur_offset
         fout.write(b"\xff" * (offset - cur_offset))
         cur_offset = offset
@@ -21,5 +46,14 @@ with open(file_out, "wb") as fout:
             data = fin.read()
             fout.write(data)
             cur_offset += len(data)
-            print("%-12s% 8d" % (name, len(data)))
-    print("%-12s% 8d" % ("total", cur_offset))
+            print(
+                "%-12s@0x%06x % 8d  (% 8d remaining)"
+                % (name, offset, len(data), max_size - len(data))
+            )
+            if len(data) > max_size:
+                print(
+                    "ERROR: %s overflows allocated space of %d bytes by %d bytes"
+                    % (name, max_size, len(data) - max_size)
+                )
+                sys.exit(1)
+    print("%-22s% 8d" % ("total", cur_offset))
diff --git a/ports/esp32/partitions-16MiB.csv b/ports/esp32/partitions-16MiB.csv
index 5133185c78..20d06bad47 100644
--- a/ports/esp32/partitions-16MiB.csv
+++ b/ports/esp32/partitions-16MiB.csv
@@ -1,6 +1,5 @@
 # Notes: the offset of the partition table itself is set in
-# $ESPIDF/components/partition_table/Kconfig.projbuild and the
-# offset of the factory/ota_0 partition is set in makeimg.py
+# $IDF_PATH/components/partition_table/Kconfig.projbuild.
 # Name,   Type, SubType, Offset,  Size, Flags
 nvs,      data, nvs,     0x9000,  0x6000,
 phy_init, data, phy,     0xf000,  0x1000,
diff --git a/ports/esp32/partitions-2MiB.csv b/ports/esp32/partitions-2MiB.csv
index 2d3d4c1204..73925a5144 100644
--- a/ports/esp32/partitions-2MiB.csv
+++ b/ports/esp32/partitions-2MiB.csv
@@ -1,6 +1,5 @@
 # Notes: the offset of the partition table itself is set in
-# $ESPIDF/components/partition_table/Kconfig.projbuild and the
-# offset of the factory/ota_0 partition is set in makeimg.py
+# $IDF_PATH/components/partition_table/Kconfig.projbuild.
 # Name,     Type, SubType, Offset,   Size, Flags
 nvs,        data, nvs,     0x9000,   0x6000,
 phy_init,   data, phy,     0xf000,   0x1000,
diff --git a/ports/esp32/partitions-ota.csv b/ports/esp32/partitions-ota.csv
index 08576b6a36..094ad76660 100644
--- a/ports/esp32/partitions-ota.csv
+++ b/ports/esp32/partitions-ota.csv
@@ -1,7 +1,6 @@
 # Partition table for MicroPython with OTA support using 4MB flash
 # Notes: the offset of the partition table itself is set in
-# $ESPIDF/components/partition_table/Kconfig.projbuild and the
-# offset of the factory/ota_0 partition is set in makeimg.py
+# $IDF_PATH/components/partition_table/Kconfig.projbuild.
 # Name,   Type, SubType, Offset,   Size,     Flags
 nvs,      data, nvs,     0x9000,   0x4000,
 otadata,  data, ota,     0xd000,   0x2000,
diff --git a/ports/esp32/partitions.csv b/ports/esp32/partitions.csv
index 68ab4b356a..d304dccc53 100644
--- a/ports/esp32/partitions.csv
+++ b/ports/esp32/partitions.csv
@@ -1,6 +1,5 @@
 # Notes: the offset of the partition table itself is set in
-# $ESPIDF/components/partition_table/Kconfig.projbuild and the
-# offset of the factory/ota_0 partition is set in makeimg.py
+# $IDF_PATH/components/partition_table/Kconfig.projbuild.
 # Name,   Type, SubType, Offset,  Size, Flags
 nvs,      data, nvs,     0x9000,  0x6000,
 phy_init, data, phy,     0xf000,  0x1000,

From f314cac60472719e1856565533e5b87920ddf32d Mon Sep 17 00:00:00 2001
From: noslaver <noam575@gmail.com>
Date: Sat, 1 Aug 2020 22:41:55 +0300
Subject: [PATCH 225/349] esp32/partitions-2MiB.csv: Update table so firmware
 fits.

The current MicroPython app size is larger than the size allocated in the
partitions table.
---
 ports/esp32/partitions-2MiB.csv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/partitions-2MiB.csv b/ports/esp32/partitions-2MiB.csv
index 73925a5144..ea6626825c 100644
--- a/ports/esp32/partitions-2MiB.csv
+++ b/ports/esp32/partitions-2MiB.csv
@@ -3,5 +3,5 @@
 # Name,     Type, SubType, Offset,   Size, Flags
 nvs,        data, nvs,     0x9000,   0x6000,
 phy_init,   data, phy,     0xf000,   0x1000,
-factory,    app,  factory, 0x10000,  0x110000,
-vfs,        data, fat,     0x120000, 0xA0000,
+factory,    app,  factory, 0x10000,  0x160000,
+vfs,        data, fat,     0x170000, 0x50000,

From da8aad18a4508476aa041406c0b06f5df4a8e59b Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <IhorNehrutsa@gmail.com>
Date: Fri, 11 Jun 2021 02:20:22 +0300
Subject: [PATCH 226/349] esp32/README: Describe how to select compatible
 version of existing IDF.

---
 ports/esp32/README.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index c349f44b27..c7d40070d1 100644
--- a/ports/esp32/README.md
+++ b/ports/esp32/README.md
@@ -50,10 +50,19 @@ To check out a copy of the IDF use git clone:
 $ git clone -b v4.0.2 --recursive https://github.com/espressif/esp-idf.git
 ```
 
-You can replace `v4.0.2` with `v4.1.1` or any other supported version.
+You can replace `v4.0.2` with `v4.1.1` or `v4.2` or any other supported version.
 (You don't need a full recursive clone; see the `ci_esp32_setup` function in
 `tools/ci.sh` in this repository for more detailed set-up commands.)
 
+If you already have a copy of the IDF then checkout a version compatible with
+MicroPython and update the submodules using:
+
+```bash
+$ cd esp-idf
+$ git checkout v4.2
+$ git submodule update --init --recursive
+```
+
 After you've cloned and checked out the IDF to the correct version, run the
 `install.sh` script:
 

From c0499bc2b9a7b4ceb1e0bdd65e900be162810d3d Mon Sep 17 00:00:00 2001
From: Peter Hinch <peter@hinch.me.uk>
Date: Tue, 21 Jan 2020 10:36:08 +0000
Subject: [PATCH 227/349] docs/library/machine.RTC.rst: Document datetime
 method and fix ex code.

This is the minimum change to fix the example code so it actually runs on
the majority of ports.
---
 docs/library/machine.RTC.rst | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/docs/library/machine.RTC.rst b/docs/library/machine.RTC.rst
index ae5446ef74..be2be2eee5 100644
--- a/docs/library/machine.RTC.rst
+++ b/docs/library/machine.RTC.rst
@@ -10,8 +10,8 @@ and time.
 Example usage::
 
     rtc = machine.RTC()
-    rtc.init((2014, 5, 1, 4, 13, 0, 0, 0))
-    print(rtc.now())
+    rtc.datetime((2020, 1, 21, 2, 10, 32, 36, 0))
+    print(rtc.datetime())
 
 
 Constructors
@@ -24,6 +24,20 @@ Constructors
 Methods
 -------
 
+.. method:: RTC.datetime([datetimetuple])
+
+   Get or set the date and time of the RTC.
+
+   With no arguments, this method returns an 8-tuple with the current
+   date and time.  With 1 argument (being an 8-tuple) it sets the date
+   and time.
+
+   The 8-tuple has the following format:
+
+       (year, month, day, weekday, hours, minutes, seconds, subseconds)
+
+   The meaning of the ``subseconds`` field is hardware dependent.
+
 .. method:: RTC.init(datetime)
 
    Initialise the RTC. Datetime is a tuple of the form:

From 37d01d4be3ab5d86e6d4042ccf140cd13a55ac4c Mon Sep 17 00:00:00 2001
From: Krzysztof Adamski <k@japko.eu>
Date: Thu, 18 Feb 2021 19:45:23 +0100
Subject: [PATCH 228/349] rp2/machine_rtc: Add initial support for RTC.

Initial support for machine.RTC on rp2 port. It only supports datetime()
method and nothing else. The method gets/returns a tuple of 8 items, just
like esp32 port, for example, but the usec parameter is ignored as the RP2
RTC only works up to seconds precision.

The Pico RTC isn't very useful as the time is lost during reset and there
seems to be no way to easily power up just the RTC clock with a low current
voltage, but still there seems to be use-cases for that, see issues #6831,
and a Thonny issue #1592. It was also requested for inclusion on v1.15
roadmap on #6832.

Signed-off-by: Krzysztof Adamski <k@japko.eu>
---
 ports/rp2/CMakeLists.txt |   3 +
 ports/rp2/machine_rtc.c  | 120 +++++++++++++++++++++++++++++++++++++++
 ports/rp2/modmachine.c   |   1 +
 ports/rp2/modmachine.h   |   1 +
 4 files changed, 125 insertions(+)
 create mode 100644 ports/rp2/machine_rtc.c

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 50cdba4ba0..2d6037712e 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -86,6 +86,7 @@ set(MICROPY_SOURCE_PORT
     machine_i2c.c
     machine_pin.c
     machine_pwm.c
+    machine_rtc.c
     machine_spi.c
     machine_timer.c
     machine_uart.c
@@ -113,6 +114,7 @@ set(MICROPY_SOURCE_QSTR
     ${PROJECT_SOURCE_DIR}/machine_i2c.c
     ${PROJECT_SOURCE_DIR}/machine_pin.c
     ${PROJECT_SOURCE_DIR}/machine_pwm.c
+    ${PROJECT_SOURCE_DIR}/machine_rtc.c
     ${PROJECT_SOURCE_DIR}/machine_spi.c
     ${PROJECT_SOURCE_DIR}/machine_timer.c
     ${PROJECT_SOURCE_DIR}/machine_uart.c
@@ -154,6 +156,7 @@ set(PICO_SDK_COMPONENTS
     pico_sync
     pico_time
     pico_unique_id
+    pico_util
     tinyusb_common
     tinyusb_device
 )
diff --git a/ports/rp2/machine_rtc.c b/ports/rp2/machine_rtc.c
new file mode 100644
index 0000000000..8ead51af13
--- /dev/null
+++ b/ports/rp2/machine_rtc.c
@@ -0,0 +1,120 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 "Krzysztof Adamski" <k@japko.eu>
+ *
+ * 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 <stdio.h>
+#include <string.h>
+
+#include <time.h>
+#include <sys/time.h>
+
+#include "py/nlr.h"
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "py/mperrno.h"
+#include "lib/timeutils/timeutils.h"
+#include "hardware/rtc.h"
+#include "pico/util/datetime.h"
+#include "modmachine.h"
+
+typedef struct _machine_rtc_obj_t {
+    mp_obj_base_t base;
+} machine_rtc_obj_t;
+
+// singleton RTC object
+STATIC const machine_rtc_obj_t machine_rtc_obj = {{&machine_rtc_type}};
+
+STATIC mp_obj_t machine_rtc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    // check arguments
+    mp_arg_check_num(n_args, n_kw, 0, 0, false);
+    bool r = rtc_running();
+
+    if (!r) {
+        // This shouldn't happen as rtc_init() is already called in main so
+        // it's here just in case
+        rtc_init();
+        datetime_t t = { .month = 1, .day = 1 };
+        rtc_set_datetime(&t);
+    }
+    // return constant object
+    return (mp_obj_t)&machine_rtc_obj;
+}
+
+STATIC mp_obj_t machine_rtc_datetime(mp_uint_t n_args, const mp_obj_t *args) {
+    if (n_args == 1) {
+        bool ret;
+        datetime_t t;
+
+        ret = rtc_get_datetime(&t);
+        if (!ret) {
+            mp_raise_OSError(MP_EIO);
+        }
+
+        mp_obj_t tuple[8] = {
+            mp_obj_new_int(t.year),
+            mp_obj_new_int(t.month),
+            mp_obj_new_int(t.day),
+            mp_obj_new_int(t.dotw),
+            mp_obj_new_int(t.hour),
+            mp_obj_new_int(t.min),
+            mp_obj_new_int(t.sec),
+            mp_obj_new_int(0)
+        };
+
+        return mp_obj_new_tuple(8, tuple);
+    } else {
+        mp_obj_t *items;
+
+        mp_obj_get_array_fixed_n(args[1], 8, &items);
+
+        datetime_t t = {
+            .year = mp_obj_get_int(items[0]),
+            .month = mp_obj_get_int(items[1]),
+            .day = mp_obj_get_int(items[2]),
+            .dotw = mp_obj_get_int(items[3]),
+            .hour = mp_obj_get_int(items[4]),
+            .min = mp_obj_get_int(items[5]),
+            .sec = mp_obj_get_int(items[6]),
+        };
+
+        rtc_set_datetime(&t);
+
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_rtc_datetime_obj, 1, 2, machine_rtc_datetime);
+
+STATIC const mp_rom_map_elem_t machine_rtc_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_datetime), MP_ROM_PTR(&machine_rtc_datetime_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(machine_rtc_locals_dict, machine_rtc_locals_dict_table);
+
+const mp_obj_type_t machine_rtc_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_RTC,
+    .make_new = machine_rtc_make_new,
+    .locals_dict = (mp_obj_t)&machine_rtc_locals_dict,
+};
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index cd7dcaade5..3656a7db5a 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -164,6 +164,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
     { MP_ROM_QSTR(MP_QSTR_PWM),                 MP_ROM_PTR(&machine_pwm_type) },
+    { MP_ROM_QSTR(MP_QSTR_RTC),                 MP_ROM_PTR(&machine_rtc_type) },
     { MP_ROM_QSTR(MP_QSTR_Signal),              MP_ROM_PTR(&machine_signal_type) },
     { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&machine_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
diff --git a/ports/rp2/modmachine.h b/ports/rp2/modmachine.h
index d09c83aee2..c79bcfdad1 100644
--- a/ports/rp2/modmachine.h
+++ b/ports/rp2/modmachine.h
@@ -7,6 +7,7 @@ extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_hw_i2c_type;
 extern const mp_obj_type_t machine_pin_type;
 extern const mp_obj_type_t machine_pwm_type;
+extern const mp_obj_type_t machine_rtc_type;
 extern const mp_obj_type_t machine_spi_type;
 extern const mp_obj_type_t machine_timer_type;
 extern const mp_obj_type_t machine_uart_type;

From fd4eec5555f93950ee14a45851d13ab7b781077e Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 12 Jun 2021 08:19:07 +0200
Subject: [PATCH 229/349] mimxrt/machine_rtc: Change RTC.datetime() tuple to
 match other ports.

This change moves the datetime tuple format back to the one used by all the
other ports:

    (year, month, day, weekday, hour, minute, second, microsecond)

Weekday is a number between 0 and 6, with 0 assigned to Monday.  It has to
be provided when setting the RTC with datetime(), but will be ignored on
entry and calculated when needed.

The weekday() method was removed, since that is now again a part of the
datetime tuple.

The now() method was updated so it continues to return a tuple that matches
CPython's datetime module.
---
 ports/mimxrt/machine_rtc.c | 40 +++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/ports/mimxrt/machine_rtc.c b/ports/mimxrt/machine_rtc.c
index 949d0b51f8..4c88466cf7 100644
--- a/ports/mimxrt/machine_rtc.c
+++ b/ports/mimxrt/machine_rtc.c
@@ -39,10 +39,10 @@ typedef struct _machine_rtc_obj_t {
 STATIC const machine_rtc_obj_t machine_rtc_obj = {{&machine_rtc_type}};
 
 // Calculate the weekday from the date.
-// The result is zero based with 0 = Sunday.
+// The result is zero based with 0 = Monday.
 // by Michael Keith and Tom Craver, 1990.
 static int calc_weekday(int y, int m, int d) {
-    return (d += m < 3 ? y-- : y - 2, 23 * m / 9 + d + 4 + y / 4 - y / 100 + y / 400) % 7;
+    return ((d += m < 3 ? y-- : y - 2, 23 * m / 9 + d + 4 + y / 4 - y / 100 + y / 400) + 6) % 7;
 }
 
 STATIC mp_obj_t machine_rtc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
@@ -66,11 +66,11 @@ STATIC mp_obj_t machine_rtc_datetime_helper(size_t n_args, const mp_obj_t *args)
             mp_obj_new_int(srtc_date.year),
             mp_obj_new_int(srtc_date.month),
             mp_obj_new_int(srtc_date.day),
+            mp_obj_new_int(calc_weekday(srtc_date.year, srtc_date.month, srtc_date.day)),
             mp_obj_new_int(srtc_date.hour),
             mp_obj_new_int(srtc_date.minute),
             mp_obj_new_int(srtc_date.second),
             mp_obj_new_int(ticks_us64() % 1000000),
-            mp_const_none,
         };
         return mp_obj_new_tuple(8, tuple);
     } else {
@@ -84,9 +84,10 @@ STATIC mp_obj_t machine_rtc_datetime_helper(size_t n_args, const mp_obj_t *args)
         srtc_date.year = year >= 100 ? year : year + 2000; // allow 21 for 2021
         srtc_date.month = mp_obj_get_int(items[1]);
         srtc_date.day = mp_obj_get_int(items[2]);
-        srtc_date.hour = mp_obj_get_int(items[3]);
-        srtc_date.minute = mp_obj_get_int(items[4]);
-        srtc_date.second = mp_obj_get_int(items[5]);
+        // Ignore weekday at items[3]
+        srtc_date.hour = mp_obj_get_int(items[4]);
+        srtc_date.minute = mp_obj_get_int(items[5]);
+        srtc_date.second = mp_obj_get_int(items[6]);
         if (SNVS_LP_SRTC_SetDatetime(SNVS, &srtc_date) != kStatus_Success) {
             mp_raise_ValueError(NULL);
         }
@@ -101,7 +102,21 @@ STATIC mp_obj_t machine_rtc_datetime(mp_uint_t n_args, const mp_obj_t *args) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_rtc_datetime_obj, 1, 2, machine_rtc_datetime);
 
 STATIC mp_obj_t machine_rtc_now(mp_obj_t self_in) {
-    return machine_rtc_datetime_helper(1, &self_in);
+    // Get date and time in CPython order.
+    snvs_lp_srtc_datetime_t srtc_date;
+    SNVS_LP_SRTC_GetDatetime(SNVS, &srtc_date);
+
+    mp_obj_t tuple[8] = {
+        mp_obj_new_int(srtc_date.year),
+        mp_obj_new_int(srtc_date.month),
+        mp_obj_new_int(srtc_date.day),
+        mp_obj_new_int(srtc_date.hour),
+        mp_obj_new_int(srtc_date.minute),
+        mp_obj_new_int(srtc_date.second),
+        mp_obj_new_int((ticks_us64() + us_offset) % 1000000),
+        mp_const_none,
+    };
+    return mp_obj_new_tuple(8, tuple);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_rtc_now_obj, machine_rtc_now);
 
@@ -112,16 +127,6 @@ STATIC mp_obj_t machine_rtc_init(mp_obj_t self_in, mp_obj_t date) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_rtc_init_obj, machine_rtc_init);
 
-STATIC mp_obj_t machine_rtc_weekday(mp_obj_t self_in) {
-    (void)self_in; // unused
-    int day;
-    snvs_lp_srtc_datetime_t srtc_date;
-    SNVS_LP_SRTC_GetDatetime(SNVS, &srtc_date);
-    day = calc_weekday(srtc_date.year, srtc_date.month, srtc_date.day);
-    return MP_OBJ_NEW_SMALL_INT((day + 6) % 7);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_rtc_weekday_obj, machine_rtc_weekday);
-
 // calibration(cal)
 // When the argument is a number in the range [-16 to 15], set the calibration value.
 STATIC mp_obj_t machine_rtc_calibration(mp_obj_t self_in, mp_obj_t cal_in) {
@@ -143,7 +148,6 @@ STATIC const mp_rom_map_elem_t machine_rtc_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_rtc_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_datetime), MP_ROM_PTR(&machine_rtc_datetime_obj) },
     { MP_ROM_QSTR(MP_QSTR_now), MP_ROM_PTR(&machine_rtc_now_obj) },
-    { MP_ROM_QSTR(MP_QSTR_weekday), MP_ROM_PTR(&machine_rtc_weekday_obj) },
     { MP_ROM_QSTR(MP_QSTR_calibration), MP_ROM_PTR(&machine_rtc_calibration_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_rtc_locals_dict, machine_rtc_locals_dict_table);

From 3ab8806c0d2fe77e9785216563b419cfadff71b0 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 12 Jun 2021 08:45:01 +0200
Subject: [PATCH 230/349] mimxrt/machine_rtc: Maintain microsecond offset.

The supplied value for microseconds in datetime() will be treated as a
starting value for the reported microseconds.  Due to internal processing
in setting the time, there is an offset about 1 ms.
---
 ports/mimxrt/machine_rtc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/mimxrt/machine_rtc.c b/ports/mimxrt/machine_rtc.c
index 4c88466cf7..4de3419c1c 100644
--- a/ports/mimxrt/machine_rtc.c
+++ b/ports/mimxrt/machine_rtc.c
@@ -37,6 +37,7 @@ typedef struct _machine_rtc_obj_t {
 
 // Singleton RTC object.
 STATIC const machine_rtc_obj_t machine_rtc_obj = {{&machine_rtc_type}};
+uint32_t us_offset = 0;
 
 // Calculate the weekday from the date.
 // The result is zero based with 0 = Monday.
@@ -70,7 +71,7 @@ STATIC mp_obj_t machine_rtc_datetime_helper(size_t n_args, const mp_obj_t *args)
             mp_obj_new_int(srtc_date.hour),
             mp_obj_new_int(srtc_date.minute),
             mp_obj_new_int(srtc_date.second),
-            mp_obj_new_int(ticks_us64() % 1000000),
+            mp_obj_new_int((ticks_us64() + us_offset) % 1000000),
         };
         return mp_obj_new_tuple(8, tuple);
     } else {
@@ -91,6 +92,7 @@ STATIC mp_obj_t machine_rtc_datetime_helper(size_t n_args, const mp_obj_t *args)
         if (SNVS_LP_SRTC_SetDatetime(SNVS, &srtc_date) != kStatus_Success) {
             mp_raise_ValueError(NULL);
         }
+        us_offset = (1000000 + mp_obj_get_int(items[7]) - ticks_us64() % 1000000) % 1000000;
 
         return mp_const_none;
     }

From c4ed17ff345ee59f284a2f6d1ec18034eeb311a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20V=C3=B6r=C3=B6s?= <zvoros@gmail.com>
Date: Sat, 12 Jun 2021 15:09:24 +0200
Subject: [PATCH 231/349] tests/cpydiff: Add test for array constructor with
 overflowing value.

---
 tests/cpydiff/module_array_constructor.py | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 tests/cpydiff/module_array_constructor.py

diff --git a/tests/cpydiff/module_array_constructor.py b/tests/cpydiff/module_array_constructor.py
new file mode 100644
index 0000000000..08cf2ef2d1
--- /dev/null
+++ b/tests/cpydiff/module_array_constructor.py
@@ -0,0 +1,10 @@
+"""
+categories: Modules,array
+description: Overflow checking is not implemented
+cause: MicroPython implements implicit truncation in order to reduce code size and execution time
+workaround: If CPython compatibility is needed then mask the value explicitly
+"""
+import array
+
+a = array.array("b", [257])
+print(a)

From 51614ce365d4ec683560106d2af56f15d5ff38fa Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 6 Jun 2021 21:42:48 +0200
Subject: [PATCH 232/349] stm32/eth: Add low-power mode configuration option.

Add low power functionality configurable with:

    lan.config(low_power=True/False)
---
 ports/stm32/eth.c         | 62 ++++++++++++++++++++++++++++++++-------
 ports/stm32/eth.h         |  1 +
 ports/stm32/network_lan.c |  4 +++
 3 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/ports/stm32/eth.c b/ports/stm32/eth.c
index 7a08e8c28c..30f8a1014e 100644
--- a/ports/stm32/eth.c
+++ b/ports/stm32/eth.c
@@ -46,6 +46,7 @@
 #define PHY_BCR                 (0x0000)
 #define PHY_BCR_SOFT_RESET      (0x8000)
 #define PHY_BCR_AUTONEG_EN      (0x1000)
+#define PHY_BCR_POWER_DOWN      (0x0800U)
 
 #undef PHY_BSR
 #define PHY_BSR                 (0x0001)
@@ -188,17 +189,6 @@ STATIC uint32_t eth_phy_read(uint32_t reg) {
 void eth_init(eth_t *self, int mac_idx) {
     mp_hal_get_mac(mac_idx, &self->netif.hwaddr[0]);
     self->netif.hwaddr_len = 6;
-}
-
-void eth_set_trace(eth_t *self, uint32_t value) {
-    self->trace_flags = value;
-}
-
-STATIC int eth_mac_init(eth_t *self) {
-    // Configure MPU
-    uint32_t irq_state = mpu_config_start();
-    mpu_config_region(MPU_REGION_ETH, (uint32_t)&eth_dma, MPU_CONFIG_ETH(MPU_REGION_SIZE_16KB));
-    mpu_config_end(irq_state);
 
     // Configure GPIO
     mp_hal_pin_config_alt_static(MICROPY_HW_ETH_MDC, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH_MDC);
@@ -211,6 +201,27 @@ STATIC int eth_mac_init(eth_t *self) {
     mp_hal_pin_config_alt_static(MICROPY_HW_ETH_RMII_TXD0, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH_RMII_TXD0);
     mp_hal_pin_config_alt_static(MICROPY_HW_ETH_RMII_TXD1, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH_RMII_TXD1);
 
+    // Enable peripheral clock
+    #if defined(STM32H7)
+    __HAL_RCC_ETH1MAC_CLK_ENABLE();
+    __HAL_RCC_ETH1TX_CLK_ENABLE();
+    __HAL_RCC_ETH1RX_CLK_ENABLE();
+    #else
+    __HAL_RCC_ETH_CLK_ENABLE();
+    #endif
+}
+
+void eth_set_trace(eth_t *self, uint32_t value) {
+    self->trace_flags = value;
+}
+
+STATIC int eth_mac_init(eth_t *self) {
+    // Configure MPU
+    uint32_t irq_state = mpu_config_start();
+    mpu_config_region(MPU_REGION_ETH, (uint32_t)&eth_dma, MPU_CONFIG_ETH(MPU_REGION_SIZE_16KB));
+    mpu_config_end(irq_state);
+
+    // Enable peripheral clock
     #if defined(STM32H7)
     __HAL_RCC_ETH1MAC_CLK_ENABLE();
     __HAL_RCC_ETH1TX_CLK_ENABLE();
@@ -791,6 +802,10 @@ int eth_link_status(eth_t *self) {
 
 int eth_start(eth_t *self) {
     eth_lwip_deinit(self);
+
+    // Make sure Eth is Not in low power mode.
+    eth_low_power_mode(self, false);
+
     int ret = eth_mac_init(self);
     if (ret < 0) {
         return ret;
@@ -805,4 +820,29 @@ int eth_stop(eth_t *self) {
     return 0;
 }
 
+void eth_low_power_mode(eth_t *self, bool enable) {
+    (void)self;
+
+    // Enable eth clock
+    #if defined(STM32H7)
+    __HAL_RCC_ETH1MAC_CLK_ENABLE();
+    #else
+    __HAL_RCC_ETH_CLK_ENABLE();
+    #endif
+
+    uint16_t bcr = eth_phy_read(PHY_BCR);
+    if (enable) {
+        // Enable low-power mode.
+        eth_phy_write(PHY_BCR, bcr | PHY_BCR_POWER_DOWN);
+        // Disable eth clock.
+        #if defined(STM32H7)
+        __HAL_RCC_ETH1MAC_CLK_DISABLE();
+        #else
+        __HAL_RCC_ETH_CLK_DISABLE();
+        #endif
+    } else {
+        // Disable low-power mode.
+        eth_phy_write(PHY_BCR, bcr & (~PHY_BCR_POWER_DOWN));
+    }
+}
 #endif // defined(MICROPY_HW_ETH_MDC)
diff --git a/ports/stm32/eth.h b/ports/stm32/eth.h
index fd46c7fa7c..47344b9526 100644
--- a/ports/stm32/eth.h
+++ b/ports/stm32/eth.h
@@ -35,5 +35,6 @@ struct netif *eth_netif(eth_t *self);
 int eth_link_status(eth_t *self);
 int eth_start(eth_t *self);
 int eth_stop(eth_t *self);
+void eth_low_power_mode(eth_t *self, bool enable);
 
 #endif // MICROPY_INCLUDED_STM32_ETH_H
diff --git a/ports/stm32/network_lan.c b/ports/stm32/network_lan.c
index 19b4e786d9..6dd9aadb65 100644
--- a/ports/stm32/network_lan.c
+++ b/ports/stm32/network_lan.c
@@ -134,6 +134,10 @@ STATIC mp_obj_t network_lan_config(size_t n_args, const mp_obj_t *args, mp_map_t
                         eth_set_trace(self->eth, mp_obj_get_int(e->value));
                         break;
                     }
+                    case MP_QSTR_low_power: {
+                        eth_low_power_mode(self->eth, mp_obj_get_int(e->value));
+                        break;
+                    }
                     default:
                         mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
                 }

From 66115a37444350b166384ae8be95639aef5a5af4 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 6 Jun 2021 21:49:40 +0200
Subject: [PATCH 233/349] stm32/eth: Fix eth_link_status function to use
 correct BSR bit.

Fixes #7346.
---
 ports/stm32/eth.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/eth.c b/ports/stm32/eth.c
index 30f8a1014e..79165e1191 100644
--- a/ports/stm32/eth.c
+++ b/ports/stm32/eth.c
@@ -791,11 +791,10 @@ int eth_link_status(eth_t *self) {
             return 2; // link no-ip;
         }
     } else {
-        int s = eth_phy_read(0) | eth_phy_read(0x10) << 16;
-        if (s == 0) {
-            return 0; // link down
+        if (eth_phy_read(PHY_BSR) & PHY_BSR_LINK_STATUS) {
+            return 1; // link up
         } else {
-            return 1; // link join
+            return 0; // link down
         }
     }
 }

From e7f7094ef60d91c89d05d2b006f2eb80fff3efd6 Mon Sep 17 00:00:00 2001
From: Krzysztof Adamski <k@japko.eu>
Date: Sun, 13 Jun 2021 10:27:45 +0200
Subject: [PATCH 234/349] rp2/machine_rtc: Check return value from
 rtc_set_datetime.

The rtc_set_datetime() from pico-sdk will validate the values in the
datetime_t structure and refuse to set the time if they aren't valid. It
makes sense to raise an exception if this happens instead of failing
silently which might be confusing (as an example, see:
https://github.com/micropython/micropython/pull/6928#issuecomment-860166044
).
---
 ports/rp2/machine_rtc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/rp2/machine_rtc.c b/ports/rp2/machine_rtc.c
index 8ead51af13..797bee5ed3 100644
--- a/ports/rp2/machine_rtc.c
+++ b/ports/rp2/machine_rtc.c
@@ -100,7 +100,9 @@ STATIC mp_obj_t machine_rtc_datetime(mp_uint_t n_args, const mp_obj_t *args) {
             .sec = mp_obj_get_int(items[6]),
         };
 
-        rtc_set_datetime(&t);
+        if (!rtc_set_datetime(&t)) {
+            mp_raise_OSError(MP_EINVAL);
+        }
 
     }
     return mp_const_none;

From 95048129b1d93854c25f501c02801929aeeb23f0 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sun, 6 Jun 2021 21:49:40 +0200
Subject: [PATCH 235/349] unix: Fix build on arm64-darwin due to integer cast.

This fixes error: cast to smaller integer type 'int' from 'pthread_t'.
pthread_t is defined as long, not as int.

Signed-off-by: Pavol Rusnak <pavol@rusnak.io>
---
 ports/unix/mpthreadport.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/unix/mpthreadport.c b/ports/unix/mpthreadport.c
index cbc4901f69..d3243b337f 100644
--- a/ports/unix/mpthreadport.c
+++ b/ports/unix/mpthreadport.c
@@ -126,7 +126,7 @@ void mp_thread_init(void) {
     thread->next = NULL;
 
     #if defined(__APPLE__)
-    snprintf(thread_signal_done_name, sizeof(thread_signal_done_name), "micropython_sem_%d", (int)thread->id);
+    snprintf(thread_signal_done_name, sizeof(thread_signal_done_name), "micropython_sem_%ld", (long)thread->id);
     thread_signal_done_p = sem_open(thread_signal_done_name, O_CREAT | O_EXCL, 0666, 0);
     #else
     sem_init(&thread_signal_done, 0, 0);

From 627c426259f9eab4271cfa492873422d7433bdd3 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Mon, 14 Jun 2021 16:00:15 -0400
Subject: [PATCH 236/349] wip

---
 locale/circuitpython.pot                      |  13 +-
 py/circuitpy_defns.mk                         |   3 +-
 shared-bindings/keypad/Event.c                | 125 ++++++++++++++++
 shared-bindings/keypad/Event.h                |  41 ++++++
 shared-bindings/keypad/Keys.c                 | 135 +++++++-----------
 shared-bindings/keypad/Keys.h                 |  14 +-
 shared-bindings/keypad/State.c                |  75 ----------
 shared-bindings/keypad/__init__.c             |   8 +-
 shared-module/keypad/Event.c                  |  44 ++++++
 .../State.h => shared-module/keypad/Event.h   |  23 ++-
 shared-module/keypad/Keys.c                   | 120 +++++++---------
 shared-module/keypad/Keys.h                   |   2 +
 shared-module/keypad/State.c                  |   0
 13 files changed, 347 insertions(+), 256 deletions(-)
 create mode 100644 shared-bindings/keypad/Event.c
 create mode 100644 shared-bindings/keypad/Event.h
 delete mode 100644 shared-bindings/keypad/State.c
 create mode 100644 shared-module/keypad/Event.c
 rename shared-bindings/keypad/State.h => shared-module/keypad/Event.h (71%)
 delete mode 100644 shared-module/keypad/State.c

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index c42a94ce98..0fe6299964 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -95,13 +95,18 @@ msgstr ""
 msgid "%q must be 1-255"
 msgstr ""
 
+#: shared-bindings/keypad/Event.c
+msgid "%q must be > 0"
+msgstr ""
+
 #: shared-bindings/memorymonitor/AllocationAlarm.c
 msgid "%q must be >= 0"
 msgstr ""
 
 #: shared-bindings/_bleio/CharacteristicBuffer.c
 #: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.c
-#: shared-bindings/displayio/Shape.c
+#: shared-bindings/displayio/Shape.c shared-bindings/keypad/KeyMatrix.c
+#: shared-bindings/keypad/Keys.c
 #: shared-bindings/memorymonitor/AllocationAlarm.c
 #: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c
 msgid "%q must be >= 1"
@@ -116,7 +121,8 @@ msgid "%q must be a tuple of length 2"
 msgstr ""
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
-#: shared-bindings/canio/Match.c shared-bindings/keypad/Keys.c
+#: shared-bindings/canio/Match.c shared-bindings/keypad/KeyMatrix.c
+#: shared-bindings/keypad/Keys.c
 msgid "%q out of range"
 msgstr ""
 
@@ -905,8 +911,7 @@ msgstr ""
 
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c py/enum.c
 #: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
-#: shared-bindings/busio/SPI.c shared-bindings/keypad/Keys.c
-#: shared-bindings/microcontroller/Pin.c
+#: shared-bindings/busio/SPI.c shared-bindings/microcontroller/Pin.c
 #: shared-bindings/neopixel_write/__init__.c
 #: shared-bindings/terminalio/Terminal.c
 msgid "Expected a %q"
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index 6b3dd7f17a..43ae46ac00 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -516,8 +516,9 @@ SRC_SHARED_MODULE_ALL = \
 	ipaddress/IPv4Address.c \
 	ipaddress/__init__.c \
 	keypad/__init__.c \
+	keypad/Event.c \
+	keypad/KeyMatrix.c \
 	keypad/Keys.c \
-	keypad/State.c \
 	sdcardio/SDCard.c \
 	sdcardio/__init__.c \
 	gamepad/GamePad.c \
diff --git a/shared-bindings/keypad/Event.c b/shared-bindings/keypad/Event.c
new file mode 100644
index 0000000000..218da5b82e
--- /dev/null
+++ b/shared-bindings/keypad/Event.c
@@ -0,0 +1,125 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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/obj.h"
+#include "py/objproperty.h"
+#include "py/runtime.h"
+
+#include "shared-bindings/keypad/Event.h"
+
+//| class Event:
+//|     """A key transition event."""
+//|     def __init__(self, key_num: int, pressed: bool) -> None:
+//|         """Create a key transition event, which reports a key-pressed or key-released transition.
+//|
+//|         :param int key_num: the key number
+//|         :param bool pressed: ``True`` if the key was pressed; ``False`` if it was released.
+//|         """
+//|         ...
+//|
+
+STATIC mp_obj_t keypad_event_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    keypad_event_obj_t *self = m_new_obj(keypad_event_obj_t);
+    self->base.type = &keypad_event_type;
+    enum { ARG_key_num, ARG_pressed };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_key_num, MP_ARG_REQUIRED | MP_ARG_INT },
+        { MP_QSTR_pressed, MP_ARG_REQUIRED | MP_ARG_BOOL },
+    };
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    const mp_int_t key_num = args[ARG_key_num].u_int;
+    if (key_num < 0) {
+        mp_raise_ValueError_varg(translate("%q must be > 0"), MP_QSTR_key_num);
+    }
+
+    common_hal_keypad_event_construct(self, (mp_uint_t)key_num, args[ARG_pressed].u_bool);
+    return MP_OBJ_FROM_PTR(self);
+}
+
+//|     key_num: int
+//|     """The key number."""
+//|
+STATIC mp_obj_t keypad_event_obj_get_key_num(mp_obj_t self_in) {
+    keypad_event_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_keypad_event_get_key_num(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_event_get_key_num_obj, keypad_event_obj_get_key_num);
+
+const mp_obj_property_t keypad_event_key_num_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&keypad_event_get_key_num_obj,
+              MP_ROM_NONE,
+              MP_ROM_NONE},
+};
+
+//|     pressed: bool
+//|     """True if event represents a key down (pressed) transition."""
+//|
+STATIC mp_obj_t keypad_event_obj_get_pressed(mp_obj_t self_in) {
+    keypad_event_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_bool(common_hal_keypad_event_get_pressed(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_event_get_pressed_obj, keypad_event_obj_get_pressed);
+
+const mp_obj_property_t keypad_event_pressed_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&keypad_event_get_pressed_obj,
+              MP_ROM_NONE,
+              MP_ROM_NONE},
+};
+
+//|     released: bool
+//|     """True if event represents a key up (released) transition."""
+//|
+STATIC mp_obj_t keypad_event_obj_get_released(mp_obj_t self_in) {
+    keypad_event_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_bool(common_hal_keypad_event_get_released(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_event_get_released_obj, keypad_event_obj_get_released);
+
+const mp_obj_property_t keypad_event_released_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&keypad_event_get_released_obj,
+              MP_ROM_NONE,
+              MP_ROM_NONE},
+};
+
+STATIC const mp_rom_map_elem_t keypad_event_locals_dict_table[] = {
+    // Properties
+    { MP_ROM_QSTR(MP_QSTR_key_num),  MP_ROM_PTR(&keypad_event_key_num_obj) },
+    { MP_ROM_QSTR(MP_QSTR_pressed),  MP_ROM_PTR(&keypad_event_pressed_obj) },
+    { MP_ROM_QSTR(MP_QSTR_released), MP_ROM_PTR(&keypad_event_released_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(keypad_event_locals_dict, keypad_event_locals_dict_table);
+
+const mp_obj_type_t keypad_event_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_UART,
+    .make_new = keypad_event_make_new,
+    .locals_dict = (mp_obj_dict_t *)&keypad_event_locals_dict,
+};
diff --git a/shared-bindings/keypad/Event.h b/shared-bindings/keypad/Event.h
new file mode 100644
index 0000000000..03e04eb6ee
--- /dev/null
+++ b/shared-bindings/keypad/Event.h
@@ -0,0 +1,41 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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_KEYPAD_EVENT__H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_EVENT__H
+
+#include "py/obj.h"
+#include "shared-module/keypad/Event.h"
+
+extern const mp_obj_type_t keypad_event_type;
+
+void common_hal_keypad_event_construct(keypad_event_obj_t *self, uint16_t key_num, bool pressed);
+mp_int_t common_hal_keypad_event_get_key_num(keypad_event_obj_t *self);
+bool common_hal_keypad_event_get_pressed(keypad_event_obj_t *self);
+bool common_hal_keypad_event_get_released(keypad_event_obj_t *self);
+
+
+#endif // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_EVENT__H
diff --git a/shared-bindings/keypad/Keys.c b/shared-bindings/keypad/Keys.c
index 68a91e9243..e92d91ce14 100644
--- a/shared-bindings/keypad/Keys.c
+++ b/shared-bindings/keypad/Keys.c
@@ -24,17 +24,15 @@
  * THE SOFTWARE.
  */
 
-#include "py/enum.h"
-#include "py/objproperty.h"
+#include "shared-bindings/keypad/Event.h"
 #include "shared-bindings/keypad/Keys.h"
-#include "shared-bindings/keypad/State.h"
 #include "shared-bindings/microcontroller/Pin.h"
 #include "py/runtime.h"
 
 //| class Keys:
 //|     """Manage a set of independent keys."""
 //|
-//|     def __init__(self, pins: Sequence[microcontroller.Pin], *, level_when_pressed: bool, pull: bool = True) -> None:
+//|     def __init__(self, pins: Sequence[microcontroller.Pin], *, level_when_pressed: bool, pull: bool = True, max_events: int = 16) -> None:
 //|         """
 //|         Create a `Keys` object that will scan keys attached to the given sequence of pins.
 //|         Each key is independent and attached to its own pin.
@@ -45,24 +43,27 @@
 //|           ``False`` if the pin reads low (is grounded) when the key is pressed.
 //|           All the pins must be connected in the same way.
 //|         :param bool pull: ``True`` if an internal pull-up or pull-down should be
-//|            enabled on each pin. A pull-up will be used if ``value_when_pressed`` is ``False``;
-//|            a pull-down will be used if it is ``True``.
-//|            If an external pull is already provided for all the pins, you can set ``pull`` to ``False``.
-//|            However, enabling an internal pull when an external one is already present is not a problem;
-//|            it simply uses slightly more current.
-//|
-//|         Calls `scan()` once before returning, to initialize internal state.
+//|           enabled on each pin. A pull-up will be used if ``value_when_pressed`` is ``False``;
+//|           a pull-down will be used if it is ``True``.
+//|           If an external pull is already provided for all the pins, you can set ``pull`` to ``False``.
+//|           However, enabling an internal pull when an external one is already present is not a problem;
+//|           it simply uses slightly more current.
+//|         :param int max_events: Size of key event queue:
+//|           maximum number of key transition events that are saved.
+//|           Must be >= 1.
+//|           If a new event arrives when the queue is full, the oldest event is discarded.
 //|         """
 //|         ...
 
 STATIC mp_obj_t keypad_keys_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     keypad_keys_obj_t *self = m_new_obj(keypad_keys_obj_t);
     self->base.type = &keypad_keys_type;
-    enum { ARG_pins, ARG_value_when_pressed, ARG_pull };
+    enum { ARG_pins, ARG_value_when_pressed, ARG_pull, ARG_max_events };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_pins, MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_value_when_pressed, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_BOOL },
         { MP_QSTR_pull, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} },
+        { MP_QSTR_max_events, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 16} },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
@@ -70,8 +71,14 @@ STATIC mp_obj_t keypad_keys_make_new(const mp_obj_type_t *type, size_t n_args, c
     mp_obj_t pins = args[ARG_pins].u_obj;
     // mp_obj_len() will be >= 0.
     const size_t num_pins = (size_t)MP_OBJ_SMALL_INT_VALUE(mp_obj_len(pins));
+
     const bool value_when_pressed = args[ARG_value_when_pressed].u_bool;
 
+    if (args[ARG_max_events].u_int < 1) {
+        mp_raise_ValueError_varg(translate("%q must be >= 1"), MP_QSTR_max_events);
+    }
+    const size_t max_events = (size_t)args[ARG_max_events].u_int;
+
     mcu_pin_obj_t *pins_array[num_pins];
 
     for (mp_uint_t i = 0; i < num_pins; i++) {
@@ -80,95 +87,61 @@ STATIC mp_obj_t keypad_keys_make_new(const mp_obj_type_t *type, size_t n_args, c
         pins_array[i] = pin;
     }
 
-    common_hal_keypad_keys_construct(self, num_pins, pins_array, value_when_pressed, args[ARG_pull].u_bool);
-    common_hal_keypad_keys_scan(self);
+    common_hal_keypad_keys_construct(self, num_pins, pins_array, value_when_pressed, args[ARG_pull].u_bool, max_events);
     return MP_OBJ_FROM_PTR(self);
 }
 
-//|     def scan(self) -> bool:
-//|         """Scan the keys and record which are newly pressed, still pressed,
-//|         newly released, and still released. If not enough time has elapsed since
-//|         the last scan for debouncing, do nothing and return ``False``.
+//|     def next_event(self) -> Optional[Event]:
+//|         """Return the next key transition event. Return ``None` if no events are pending.
 //|
-//|         :return: ``True`` if sufficient time has elapsed for debouncing (about 20 msecs),
-//|           otherwise ``False``.
-//|         :rtype: bool
+//|         Note that the queue size is limited; see ``max_events`` in the constructor.
+//|         If a new event arrives when the queue is full, the oldest event is discarded.
+//|
+//|         :return: the next queued key transition `Event`
+//|         :rtype: Optional[Event]
 //|         """
 //|         ...
 //|
-STATIC mp_obj_t keypad_keys_scan(mp_obj_t self_in) {
+STATIC mp_obj_t keypad_keys_next_event(mp_obj_t self_in, mp_obj_t event_in) {
     keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
-
-    return mp_obj_new_bool(common_hal_keypad_keys_scan(self));
+    return common_hal_keypad_keys_next_event(self);
 }
-MP_DEFINE_CONST_FUN_OBJ_1(keypad_keys_scan_obj, keypad_keys_scan);
+MP_DEFINE_CONST_FUN_OBJ_2(keypad_keys_next_event_obj, keypad_keys_next_event);
 
-//|     def state(self, key_num: int) -> keypad.State:
-//|         """Return the state for the given ``key_num``, based
-//|         on the results of the most recent `scan()`.
-//|
-//|         :param int key_num: Key number: corresponds to the sequence of pins
-//|         :return: state of key number ``key_num``
-//|         :rtype: keypad.State: One of `State.JUST_PRESSED`, `State.STILL_PRESSED`,
-//|           `State.JUST_RELEASED`, or `State.STILL_RELEASED`.
-//|           The inclusive states `State.PRESSED` and `State.RELEASED` will *not* be returned.
+//|     def clear_events(self) -> None:
+//|         """Clear any queued key transition events.
 //|         """
 //|         ...
 //|
-STATIC mp_obj_t keypad_keys_state(mp_obj_t self_in, mp_obj_t key_num_obj) {
+STATIC mp_obj_t keypad_keys_clear_events(mp_obj_t self_in) {
     keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_int_t key_num = mp_obj_int_get_checked(key_num_obj);
-    if (key_num < 0 || (mp_uint_t)key_num >= common_hal_keypad_keys_length(self)) {
+
+    common_hal_keypad_keys_clear_events(self);
+    return MP_ROM_NONE;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_keys_clear_events_obj, keypad_keys_clear_events);
+
+//|     def pressed(self, key_num: int) -> None:
+//|         """Return ``True`` if the given key is pressed. This is a debounced read
+//|         of the key state which bypasses the event queue.
+//|         """
+//|         ...
+//|
+STATIC mp_obj_t keypad_keys_pressed(mp_obj_t self_in, mp_obj_t key_num_in) {
+    keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_int_t key_num = mp_obj_get_int(key_num_in);
+    if (key_num < 0 || key_num >= common_hal_keypad_keys_num_keys(self)) {
         mp_raise_ValueError_varg(translate("%q out of range"), MP_QSTR_key_num);
     }
 
-    return cp_enum_find(&keypad_state_type, common_hal_keypad_keys_state(self, (mp_uint_t)key_num));
+    return mp_obj_new_bool(common_hal_keypad_keys_pressed(self, (mp_uint_t)key_num));
 }
-MP_DEFINE_CONST_FUN_OBJ_2(keypad_keys_state_obj, keypad_keys_state);
-
-//|     def keys_with_state(self, state: State, into_list: List[Optional[int]]) -> None:
-//|         """Store key numbers of keys with state ``state`` in ``into_list``.
-//|         The states checked are based on the results of the most recent `scan()`.
-//|
-//|         You can use the inclusive states `State.PRESSED` and `State.RELEASED`.
-//|         `State.PRESSED` includes states `State.JUST_PRESSED` and `State.STILL_PRESSED`.
-//|         `State.RELEASED` includes `State.JUST_RELEASED` and `State.STILL_RELEASED`.
-//|
-//|         The key numbers are stored in ``into_list`` consecutively, up to ``len(into_list)``.
-//|         The ``into_list`` is not extended if there are more keys with the given
-//|         state than list slots. Instead, leftover key numbers are discarded.
-//|         If there are fewer keys with the given state, the rest of ``into_list``
-//|         is padded with ``None``. For example,
-//|         if four keys are being monitored, and only key numbers 0 and 2 have the given state,
-//|         ``into_list`` will be set to ``[0, 2, None, None]``. You can iterate over
-//|         ``into_list`` and stop when you find the first ``None``.
-//|         """
-//|         ...
-//|
-STATIC mp_obj_t keypad_keys_keys_with_state(mp_obj_t self_in, mp_obj_t state_in, mp_obj_t into_list_in) {
-    keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
-
-    if (!mp_obj_is_type(state_in, &keypad_state_type)) {
-        mp_raise_ValueError_varg(translate("Expected a %q"), keypad_state_type.name);
-    }
-
-    if (!mp_obj_is_type(into_list_in, &mp_type_list)) {
-        mp_raise_ValueError_varg(translate("Expected a %q"), mp_type_list.name);
-    }
-
-    int state = cp_enum_value(&keypad_state_type, state_in);
-    mp_obj_list_t *into_list = MP_OBJ_TO_PTR(into_list_in);
-
-    common_hal_keypad_keys_keys_with_state(self, state, into_list);
-
-    return MP_ROM_NONE;
-}
-MP_DEFINE_CONST_FUN_OBJ_3(keypad_keys_keys_with_state_obj, keypad_keys_keys_with_state);
+MP_DEFINE_CONST_FUN_OBJ_2(keypad_keys_pressed_obj, keypad_keys_pressed);
 
 STATIC const mp_rom_map_elem_t keypad_keys_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_keys_with_state),  MP_ROM_PTR(&keypad_keys_keys_with_state_obj) },
-    { MP_ROM_QSTR(MP_QSTR_scan),             MP_ROM_PTR(&keypad_keys_scan_obj) },
-    { MP_ROM_QSTR(MP_QSTR_state),            MP_ROM_PTR(&keypad_keys_state_obj) },
+    { MP_ROM_QSTR(MP_QSTR_clear_events), MP_ROM_PTR(&keypad_keys_clear_events_obj) },
+    { MP_ROM_QSTR(MP_QSTR_next_event),   MP_ROM_PTR(&keypad_keys_next_event_obj) },
+    { MP_ROM_QSTR(MP_QSTR_pressed),      MP_ROM_PTR(&keypad_keys_pressed_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(keypad_keys_locals_dict, keypad_keys_locals_dict_table);
diff --git a/shared-bindings/keypad/Keys.h b/shared-bindings/keypad/Keys.h
index 694a560238..e9ab0b91e5 100644
--- a/shared-bindings/keypad/Keys.h
+++ b/shared-bindings/keypad/Keys.h
@@ -32,10 +32,14 @@
 
 extern const mp_obj_type_t keypad_keys_type;
 
-void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pins, mcu_pin_obj_t *pins[], bool value_when_pressed,  bool pull);
-void common_hal_keypad_keys_keys_with_state(keypad_keys_obj_t *self, mp_int_t state, mp_obj_list_t *into);
-size_t common_hal_keypad_keys_length(keypad_keys_obj_t *self);
-bool common_hal_keypad_keys_scan(keypad_keys_obj_t *self);
-mp_int_t common_hal_keypad_keys_state(keypad_keys_obj_t *self, mp_uint_t key_num);
+void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pins, mcu_pin_obj_t *pins[], bool value_when_pressed,  bool pull, size_t max_events);
+
+mp_uint_t common_hal_keypad_keys_num_keys(keypad_keys_obj_t *self);
+bool common_hal_keypad_keys_pressed(keypad_keys_obj_t *self, mp_uint_t key_num);
+
+mp_obj_t common_hal_keypad_keys_next_event(keypad_keys_obj_t *self);
+void common_hal_keypad_keys_clear_events(keypad_keys_obj_t *self);
+
+void keypad_keys_scan(keypad_keys_obj_t *self);
 
 #endif  // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_KEYS_H
diff --git a/shared-bindings/keypad/State.c b/shared-bindings/keypad/State.c
deleted file mode 100644
index 8e35d09a83..0000000000
--- a/shared-bindings/keypad/State.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2021 Dan Halbert 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/obj.h"
-#include "py/enum.h"
-
-#include "shared-bindings/keypad/State.h"
-
-// Defines enum values like
-// const cp_enum_obj_t state_JUST_PRESSED = ...
-MAKE_ENUM_VALUE(keypad_state_type, state, JUST_PRESSED, STATE_JUST_PRESSED);
-MAKE_ENUM_VALUE(keypad_state_type, state, STILL_PRESSED, STATE_STILL_PRESSED);
-MAKE_ENUM_VALUE(keypad_state_type, state, PRESSED, STATE_PRESSED);
-MAKE_ENUM_VALUE(keypad_state_type, state, JUST_RELEASED, STATE_JUST_RELEASED);
-MAKE_ENUM_VALUE(keypad_state_type, state, STILL_RELEASED, STATE_STILL_RELEASED);
-MAKE_ENUM_VALUE(keypad_state_type, state, RELEASED, STATE_RELEASED);
-
-//| class State:
-//|     """The state of a key, based on the last call to ``scan()``."""
-//|
-//|     JUST_PRESSED: State
-//|     """The key transitioned from released to pressed."""
-//|
-//|     STILL_PRESSED: State
-//|     """The key was already pressed, and continues to be pressed."""
-//|
-//|     PRESSED: State
-//|     """The key is now pressed. Used to indicate states `JUST_PRESSED` and `STILL_PRESSED` inclusively."""
-//|
-//|     JUST_RELEASED: State
-//|     """The key transitioned from pressed to released."""
-//|
-//|     STILL_RELEASED: State
-//|     """The key was already released, and continues to be released."""
-//|
-//|     RELEASED: State
-//|     """The key is now released. Used to indicate states `JUST_RELEASED` and `STILL_RELEASED` inclusively."""
-//|
-MAKE_ENUM_MAP(keypad_state) {
-    MAKE_ENUM_MAP_ENTRY(state, JUST_PRESSED),
-    MAKE_ENUM_MAP_ENTRY(state, STILL_PRESSED),
-    MAKE_ENUM_MAP_ENTRY(state, PRESSED),
-    MAKE_ENUM_MAP_ENTRY(state, JUST_RELEASED),
-    MAKE_ENUM_MAP_ENTRY(state, STILL_RELEASED),
-    MAKE_ENUM_MAP_ENTRY(state, RELEASED),
-};
-STATIC MP_DEFINE_CONST_DICT(keypad_state_locals_dict, keypad_state_locals_table);
-
-MAKE_PRINTER(keypad, keypad_state);
-
-// Defines keypad_state_type.
-MAKE_ENUM_TYPE(keypad, State, keypad_state);
diff --git a/shared-bindings/keypad/__init__.c b/shared-bindings/keypad/__init__.c
index 4ca66b531a..20f60a5137 100644
--- a/shared-bindings/keypad/__init__.c
+++ b/shared-bindings/keypad/__init__.c
@@ -27,9 +27,9 @@
 #include "py/obj.h"
 
 #include "shared-bindings/keypad/__init__.h"
-// #include "shared-bindings/keypad/KeyMatrix.h"
+#include "shared-bindings/keypad/Event.h"
+#include "shared-bindings/keypad/KeyMatrix.h"
 #include "shared-bindings/keypad/Keys.h"
-#include "shared-bindings/keypad/State.h"
 
 //| """Support for scanning keys and key matrices
 //|
@@ -40,9 +40,9 @@
 
 STATIC mp_map_elem_t keypad_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),  MP_OBJ_NEW_QSTR(MP_QSTR_keypad) },
-//    { MP_ROM_QSTR(MP_QSTR_KeyMatrix), MP_OBJ_FROM_PTR(&keypad_key_matrix_type) },
+    { MP_ROM_QSTR(MP_QSTR_Event),     MP_OBJ_FROM_PTR(&keypad_event_type) },
+    { MP_ROM_QSTR(MP_QSTR_KeyMatrix), MP_OBJ_FROM_PTR(&keypad_keymatrix_type) },
     { MP_ROM_QSTR(MP_QSTR_Keys),      MP_OBJ_FROM_PTR(&keypad_keys_type) },
-    { MP_ROM_QSTR(MP_QSTR_State),     MP_OBJ_FROM_PTR(&keypad_state_type) },
 };
 
 STATIC MP_DEFINE_MUTABLE_DICT(keypad_module_globals, keypad_module_globals_table);
diff --git a/shared-module/keypad/Event.c b/shared-module/keypad/Event.c
new file mode 100644
index 0000000000..6556d1f5a3
--- /dev/null
+++ b/shared-module/keypad/Event.c
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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 "shared-module/keypad/Event.h"
+
+void common_hal_keypad_event_construct(keypad_event_obj_t *self, mp_uint_t key_num, bool pressed) {
+    self->key_num = key_num;
+    self->pressed = true;
+}
+
+mp_int_t common_hal_keypad_event_get_key_num(keypad_event_obj_t *self) {
+    return self->key_num;
+}
+
+bool common_hal_keypad_event_get_pressed(keypad_event_obj_t *self) {
+    return self->pressed;
+}
+
+bool common_hal_keypad_event_get_released(keypad_event_obj_t *self) {
+    return !self->pressed;
+}
diff --git a/shared-bindings/keypad/State.h b/shared-module/keypad/Event.h
similarity index 71%
rename from shared-bindings/keypad/State.h
rename to shared-module/keypad/Event.h
index 1b6316b001..4780df0aa2 100644
--- a/shared-bindings/keypad/State.h
+++ b/shared-module/keypad/Event.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the MicroPython project, http://micropython.org/
+ * This file is part of the Micro Python project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -24,21 +24,16 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_STATE__H
-#define MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_STATE__H
+#ifndef MICROPY_INCLUDED_SHARED_MODULE_KEYPAD_EVENT_H
+#define MICROPY_INCLUDED_SHARED_MODULE_KEYPAD_EVENT_H
 
 #include "py/obj.h"
-#include "py/enum.h"
 
-typedef enum {
-    STATE_JUST_PRESSED,
-    STATE_STILL_PRESSED,
-    STATE_PRESSED,
-    STATE_JUST_RELEASED,
-    STATE_STILL_RELEASED,
-    STATE_RELEASED,
-} keypad_state_t;
+typedef struct {
+    mp_obj_base_t base;
+    uint16_t key_num;
+    bool pressed;
+} keypad_event_obj_t;
 
-extern const mp_obj_type_t keypad_state_type;
 
-#endif // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_STATE__H
+#endif  // MICROPY_INCLUDED_SHARED_MODULE_KEYPAD_EVENT_H
diff --git a/shared-module/keypad/Keys.c b/shared-module/keypad/Keys.c
index c09317d1f9..582668bce9 100644
--- a/shared-module/keypad/Keys.c
+++ b/shared-module/keypad/Keys.c
@@ -25,16 +25,20 @@
  */
 
 #include "py/gc.h"
-#include "py/objproperty.h"
+#include "shared-bindings/keypad/Event.h"
 #include "shared-bindings/keypad/Keys.h"
-#include "shared-bindings/keypad/State.h"
 #include "shared-bindings/digitalio/DigitalInOut.h"
 #include "py/runtime.h"
 #include "supervisor/port.h"
 
 #define DEBOUNCE_TICKS (20)
 
-void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pins, mcu_pin_obj_t *pins[], bool value_when_pressed, bool pull) {
+// Top bit of 16-bit event indicates pressed or released. Rest is key_num.
+#define EVENT_PRESSED (1 << 15)
+#define EVENT_RELEASED (0)
+#define EVENT_KEY_NUM_MASK (~EVENT_PRESSED)
+
+void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pins, mcu_pin_obj_t *pins[], bool value_when_pressed, bool pull, size_t max_events) {
     mp_obj_t dios[num_pins];
 
     for (size_t i = 0; i < num_pins; i++) {
@@ -52,88 +56,60 @@ void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pin
     self->previously_pressed = (bool *)gc_alloc(sizeof(bool) * num_pins, false, false);
     self->value_when_pressed = value_when_pressed;
 
+    // Event queue is 16-bit values.
+    ringbuf_alloc(self->encoded_events, max_events * 2, false);
 }
 
-void common_hal_keypad_keys_keys_with_state(keypad_keys_obj_t *self, int state, mp_obj_list_t *list_into) {
-    const size_t list_length = list_into->len;
-
-    size_t next_list_slot = 0;
-
-    for (mp_uint_t key_num = 0; key_num < common_hal_keypad_keys_length(self); key_num++) {
-        if (next_list_slot >= list_length) {
-            // List is full.
-            break;
-        }
-
-        bool store_key = false;
-        switch (state) {
-            case STATE_JUST_PRESSED:
-                store_key = !self->previously_pressed[key_num] && self->currently_pressed[key_num];
-                break;
-            case STATE_STILL_PRESSED:
-                store_key = self->previously_pressed[key_num] && self->currently_pressed[key_num];
-                break;
-            case STATE_PRESSED:
-                store_key = self->currently_pressed[key_num];
-                break;
-            case STATE_JUST_RELEASED:
-                store_key = self->previously_pressed[key_num] && !self->currently_pressed[key_num];
-                break;
-            case STATE_STILL_RELEASED:
-                store_key = !self->previously_pressed[key_num] && !self->currently_pressed[key_num];
-                break;
-            case STATE_RELEASED:
-                store_key = !self->currently_pressed[key_num];
-                break;
-        }
-
-        if (store_key) {
-            mp_obj_list_store(list_into, MP_OBJ_NEW_SMALL_INT(next_list_slot),
-                MP_OBJ_NEW_SMALL_INT(key_num));
-            next_list_slot++;
-        }
-
-        for (size_t unused_slot = next_list_slot; unused_slot < list_length; unused_slot++) {
-            mp_obj_list_store(list_into, MP_OBJ_NEW_SMALL_INT(unused_slot),
-                MP_ROM_NONE);
-        }
-    }
-}
-
-size_t common_hal_keypad_keys_length(keypad_keys_obj_t *self) {
+size_t common_hal_keypad_keys_num_keys(keypad_keys_obj_t *self) {
     return self->digitalinouts->len;
 }
 
-bool common_hal_keypad_keys_scan(keypad_keys_obj_t *self) {
+void keypad_keys_scan(keypad_keys_obj_t *self) {
     uint64_t now = port_get_raw_ticks(NULL);
     if (now - self->last_scan_ticks < DEBOUNCE_TICKS) {
-        // Too soon.
-        return false;
+        // Too soon. Wait longer to debounce.
+        return;
     }
 
     self->last_scan_ticks = now;
 
-    for (mp_uint_t key_num = 0; key_num < common_hal_keypad_keys_length(self); key_num++) {
-        self->previously_pressed[key_num] = self->currently_pressed[key_num];
-        self->currently_pressed[key_num] =
-            common_hal_digitalio_digitalinout_get_value(self->digitalinouts->items[key_num]) ==
+    for (mp_uint_t key_num = 0; key_num < common_hal_keypad_keys_num_keys(self); key_num++) {
+        // Remember the previous up/down state.
+        const bool previous = self->currently_pressed[key_num];
+        self->previously_pressed[key_num] = previous;
+
+        // Get the current state.
+        const bool current = common_hal_digitalio_digitalinout_get_value(self->digitalinouts->items[key_num]) ==
             self->value_when_pressed;
+        self->currently_pressed[key_num] = current;
+
+        // Record any transitions.
+        if (previous != current) {
+            if (ringbuf_num_empty(self->encoded_events) == 0) {
+                // Discard oldest if full.
+                ringbuf_get16(self->encoded_events);
+            }
+            ringbuf_put16(self->encoded_events, key_num | (current ? EVENT_PRESSED : EVENT_RELEASED));
+        }
     }
-    return true;
 }
 
-mp_int_t common_hal_keypad_keys_state(keypad_keys_obj_t *self, mp_uint_t key_num) {
-    if (self->currently_pressed[key_num]) {
-        if (self->previously_pressed[key_num]) {
-            return STATE_STILL_PRESSED;
-        } else {
-            return STATE_JUST_PRESSED;
-        }
-    } else {
-        if (self->previously_pressed[key_num]) {
-            return STATE_JUST_RELEASED;
-        } else {
-            return STATE_STILL_RELEASED;
-        }
-    }
+bool common_hal_keypad_keys_pressed(keypad_keys_obj_t *self, mp_uint_t key_num) {
+    return self->currently_pressed[key_num];
+}
+
+mp_obj_t common_hal_keypad_keys_next_event(keypad_keys_obj_t *self) {
+    int encoded_event = ringbuf_get16(self->encoded_events);
+    if (encoded_event == -1) {
+        return MP_ROM_NONE;
+    }
+
+    keypad_event_obj_t *event = m_new_obj(keypad_event_obj_t);
+    self->base.type = &keypad_event_type;
+    common_hal_keypad_event_construct(event, encoded_event & EVENT_KEY_NUM_MASK, encoded_event & EVENT_PRESSED);
+    return MP_OBJ_FROM_PTR(event);
+}
+
+void common_hal_keypad_keys_clear_events(keypad_keys_obj_t *self) {
+    ringbuf_clear(self->encoded_events);
 }
diff --git a/shared-module/keypad/Keys.h b/shared-module/keypad/Keys.h
index 898a937632..67822dd6d9 100644
--- a/shared-module/keypad/Keys.h
+++ b/shared-module/keypad/Keys.h
@@ -31,6 +31,7 @@
 
 #include "py/obj.h"
 #include "py/objtuple.h"
+#include "py/ringbuf.h"
 
 typedef struct {
     mp_obj_base_t base;
@@ -39,6 +40,7 @@ typedef struct {
     bool value_when_pressed;
     bool *previously_pressed;
     bool *currently_pressed;
+    ringbuf_t *encoded_events;
 } keypad_keys_obj_t;
 
 
diff --git a/shared-module/keypad/State.c b/shared-module/keypad/State.c
deleted file mode 100644
index e69de29bb2..0000000000

From 32eec8523074b298aec0ace1aa6f0833895f50e5 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Mon, 14 Jun 2021 20:54:43 -0400
Subject: [PATCH 237/349] compiles

---
 lib/utils/linked_list.h            |  36 +++++
 main.c                             |  10 ++
 py/circuitpy_mpconfig.h            |  13 ++
 shared-bindings/keypad/KeyMatrix.c | 228 +++++++++++++++++++++++++++++
 shared-bindings/keypad/KeyMatrix.h |  49 +++++++
 shared-bindings/keypad/Keys.c      |  50 ++++++-
 shared-bindings/keypad/Keys.h      |   4 +-
 shared-module/keypad/KeyMatrix.c   | 225 ++++++++++++++++++++++++++++
 shared-module/keypad/KeyMatrix.h   |  51 +++++++
 shared-module/keypad/Keys.c        | 101 +++++++++++--
 shared-module/keypad/Keys.h        |   6 +-
 shared-module/keypad/__init__.c    |  38 +++++
 shared-module/keypad/__init__.h    |   3 +
 supervisor/shared/lock.c           |  51 +++++++
 supervisor/shared/lock.h           |  36 +++++
 supervisor/shared/tick.c           |  11 ++
 supervisor/supervisor.mk           |   1 +
 17 files changed, 893 insertions(+), 20 deletions(-)
 create mode 100644 lib/utils/linked_list.h
 create mode 100644 shared-bindings/keypad/KeyMatrix.c
 create mode 100644 shared-bindings/keypad/KeyMatrix.h
 create mode 100644 shared-module/keypad/KeyMatrix.c
 create mode 100644 shared-module/keypad/KeyMatrix.h
 create mode 100644 supervisor/shared/lock.c
 create mode 100644 supervisor/shared/lock.h

diff --git a/lib/utils/linked_list.h b/lib/utils/linked_list.h
new file mode 100644
index 0000000000..cd5ea0fc7c
--- /dev/null
+++ b/lib/utils/linked_list.h
@@ -0,0 +1,36 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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_LINKED_LIST_H
+#define MICROPY_INCLUDED_LINKED_LIST_H
+
+#define LINKED_LIST_PREPEND(LIST_HEAD, OBJECT, NEXT_FIELD) \
+    OBJECT->NEXT_FIELD = LIST_HEAD; \
+    LIST_HEAD = OBJECT;
+
+#define LINKED_LIST_DELETE(LIST_HEAD, OBJECT,
+
+#endif // MICROPY_INCLUDED_LINKED_LIST_H
diff --git a/main.c b/main.c
index 94d35fb8d7..a11157a5fb 100755
--- a/main.c
+++ b/main.c
@@ -86,6 +86,10 @@
 #include "shared-module/displayio/__init__.h"
 #endif
 
+#if CIRCUITPY_KEYPAD
+#include "shared-module/keypad/__init__.h"
+#endif
+
 #if CIRCUITPY_MEMORYMONITOR
 #include "shared-module/memorymonitor/__init__.h"
 #endif
@@ -230,9 +234,11 @@ STATIC void cleanup_after_vm(supervisor_allocation* heap) {
     #if CIRCUITPY_DISPLAYIO
     reset_displays();
     #endif
+
     #if CIRCUITPY_MEMORYMONITOR
     memorymonitor_reset();
     #endif
+
     filesystem_flush();
     stop_mp();
     free_memory(heap);
@@ -242,6 +248,10 @@ STATIC void cleanup_after_vm(supervisor_allocation* heap) {
     common_hal_canio_reset();
     #endif
 
+    #if CIRCUITPY_KEYPAD
+    keypad_reset();
+    #endif
+
     // reset_board_busses() first because it may release pins from the never_reset state, so that
     // reset_port() can reset them.
     #if CIRCUITPY_BOARD
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index 86321d5d02..4b6585c2a4 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -533,8 +533,20 @@ extern const struct _mp_obj_module_t ipaddress_module;
 #if CIRCUITPY_KEYPAD
 extern const struct _mp_obj_module_t keypad_module;
 #define KEYPAD_MODULE        { MP_OBJ_NEW_QSTR(MP_QSTR_keypad), (mp_obj_t)&keypad_module },
+#define KEYPAD_ROOT_POINTERS \
+    mp_obj_t keypad_keys_linked_list; \
+    mp_obj_t keypad_keymatrix_linked_list;
 #else
 #define KEYPAD_MODULE
+#define KEYPAD_ROOT_POINTERS
+#endif
+
+#if CIRCUITPY_GAMEPAD || CIRCUITPY_GAMEPADSHIFT
+// Scan gamepad every 32ms
+#define CIRCUITPY_GAMEPAD_TICKS 0x1f
+#define GAMEPAD_ROOT_POINTERS mp_obj_t gamepad_singleton;
+#else
+#define GAMEPAD_ROOT_POINTERS
 #endif
 
 #if CIRCUITPY_MATH
@@ -962,6 +974,7 @@ struct _supervisor_allocation_node;
     vstr_t *repl_line; \
     mp_obj_t rtc_time_source; \
     GAMEPAD_ROOT_POINTERS \
+    KEYPAD_ROOT_POINTERS \
     mp_obj_t pew_singleton; \
     BOARD_UART_ROOT_POINTER \
     FLASH_ROOT_POINTERS \
diff --git a/shared-bindings/keypad/KeyMatrix.c b/shared-bindings/keypad/KeyMatrix.c
new file mode 100644
index 0000000000..b6b09a9a0a
--- /dev/null
+++ b/shared-bindings/keypad/KeyMatrix.c
@@ -0,0 +1,228 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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 "lib/utils/context_manager_helpers.h"
+#include "py/runtime.h"
+#include "shared-bindings/keypad/Event.h"
+#include "shared-bindings/keypad/KeyMatrix.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared-bindings/util.h"
+
+//| class KeyMatrix:
+//|     """Manage a 2D matrix of keys with row and column pins."""
+//|
+//|     def __init__(self, row_pins: Sequence[microcontroller.Pin], col_pins: Sequence[microcontroller.Pin], max_events: int = 16) -> None:
+//|         """
+//|         Create a `Keys` object that will scan key matrix attached to the given row and column pins.
+//|         If the matrix uses diodes, the diode anodes should be connected to the column pins,
+//|         and the cathodes should be connected to the row pins.
+//|
+//|         The keys are numbered sequentially from zero. A key number can be computed
+//|         by ``col * len(row_pins) + row``.
+//|
+//|         :param Sequence[microcontroller.Pin] row_pins: The pins attached to rows.
+//|         :param Sequence[microcontroller.Pin] col_pins: The pins attached to rows.
+//|         :param int max_events: Size of key event queue:
+//|           maximum number of key transition events that are saved.
+//|           Must be >= 1.
+//|           If a new event arrives when the queue is full, the oldest event is discarded.
+//|         """
+//|         ...
+
+STATIC mp_obj_t keypad_keymatrix_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    keypad_keymatrix_obj_t *self = m_new_obj(keypad_keymatrix_obj_t);
+    self->base.type = &keypad_keymatrix_type;
+    enum { ARG_row_pins, ARG_col_pins, ARG_max_events };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_row_pins, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_col_pins, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_BOOL },
+        { MP_QSTR_max_events, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 16} },
+    };
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    mp_obj_t row_pins = args[ARG_row_pins].u_obj;
+    // mp_obj_len() will be >= 0.
+    const size_t num_row_pins = (size_t)MP_OBJ_SMALL_INT_VALUE(mp_obj_len(row_pins));
+
+    mp_obj_t col_pins = args[ARG_col_pins].u_obj;
+    const size_t num_col_pins = (size_t)MP_OBJ_SMALL_INT_VALUE(mp_obj_len(col_pins));
+
+    if (args[ARG_max_events].u_int < 1) {
+        mp_raise_ValueError_varg(translate("%q must be >= 1"), MP_QSTR_max_events);
+    }
+    const size_t max_events = (size_t)args[ARG_max_events].u_int;
+
+    mcu_pin_obj_t *row_pins_array[num_row_pins];
+    mcu_pin_obj_t *col_pins_array[num_col_pins];
+
+    for (mp_uint_t i = 0; i < num_row_pins; i++) {
+        mcu_pin_obj_t *pin =
+            validate_obj_is_free_pin(mp_obj_subscr(row_pins, MP_OBJ_NEW_SMALL_INT(i), MP_OBJ_SENTINEL));
+        row_pins_array[i] = pin;
+    }
+
+    for (mp_uint_t i = 0; i < num_col_pins; i++) {
+        mcu_pin_obj_t *pin =
+            validate_obj_is_free_pin(mp_obj_subscr(col_pins, MP_OBJ_NEW_SMALL_INT(i), MP_OBJ_SENTINEL));
+        col_pins_array[i] = pin;
+    }
+
+    common_hal_keypad_keymatrix_construct(self, num_row_pins, row_pins_array, num_col_pins, col_pins_array, max_events);
+    return MP_OBJ_FROM_PTR(self);
+}
+
+//|     def deinit(self) -> None:
+//|         """Stop scanning and release the pins."""
+//|         ...
+//|
+STATIC mp_obj_t keypad_keymatrix_deinit(mp_obj_t self_in) {
+    keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_keypad_keymatrix_deinit(self);
+    return MP_ROM_NONE;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_keymatrix_deinit_obj, keypad_keymatrix_deinit);
+
+//|     def __enter__(self) -> KeyMatrix:
+//|         """No-op used by Context Managers."""
+//|         ...
+//|
+//  Provided by context manager helper.
+
+//|     def __exit__(self) -> None:
+//|         """Automatically deinitializes when exiting a context. See
+//|         :ref:`lifetime-and-contextmanagers` for more info."""
+//|         ...
+//|
+STATIC mp_obj_t keypad_keymatrix___exit__(size_t n_args, const mp_obj_t *args) {
+    (void)n_args;
+    common_hal_keypad_keymatrix_deinit(args[0]);
+    return MP_ROM_NONE;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(keypad_keymatrix___exit___obj, 4, 4, keypad_keymatrix___exit__);
+
+STATIC void check_for_deinit(keypad_keymatrix_obj_t *self) {
+    if (common_hal_keypad_keymatrix_deinited(self)) {
+        raise_deinited_error();
+    }
+}
+
+//|     def next_event(self) -> Optional[Event]:
+//|         """Return the next key transition event. Return ``None` if no events are pending.
+//|
+//|         Note that the queue size is limited; see ``max_events`` in the constructor.
+//|         If a new event arrives when the queue is full, the oldest event is discarded.
+//|
+//|         :return: the next queued key transition `Event`
+//|         :rtype: Optional[Event]
+//|         """
+//|         ...
+//|
+STATIC mp_obj_t keypad_keymatrix_next_event(mp_obj_t self_in, mp_obj_t event_in) {
+    keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+
+    return common_hal_keypad_keymatrix_next_event(self);
+}
+MP_DEFINE_CONST_FUN_OBJ_2(keypad_keymatrix_next_event_obj, keypad_keymatrix_next_event);
+
+//|     def clear_events(self) -> None:
+//|         """Clear any queued key transition events.
+//|         """
+//|         ...
+//|
+STATIC mp_obj_t keypad_keymatrix_clear_events(mp_obj_t self_in) {
+    keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+
+    common_hal_keypad_keymatrix_clear_events(self);
+    return MP_ROM_NONE;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_keymatrix_clear_events_obj, keypad_keymatrix_clear_events);
+
+//|     def pressed(self, key_num: int) -> None:
+//|         """Return ``True`` if the given key is pressed. This is a debounced read
+//|         of the key state which bypasses the event queue.
+//|         """
+//|         ...
+//|
+STATIC mp_obj_t keypad_keymatrix_pressed(mp_obj_t self_in, mp_obj_t key_num_in) {
+    keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+
+    mp_int_t key_num = mp_obj_get_int(key_num_in);
+    if (key_num < 0 || key_num >= common_hal_keypad_keymatrix_num_keys(self)) {
+        mp_raise_ValueError_varg(translate("%q out of range"), MP_QSTR_key_num);
+    }
+
+    return mp_obj_new_bool(common_hal_keypad_keymatrix_pressed(self, (mp_uint_t)key_num));
+}
+MP_DEFINE_CONST_FUN_OBJ_2(keypad_keymatrix_pressed_obj, keypad_keymatrix_pressed);
+
+//|     def key_num(self, row: int, col: int) -> int:
+//|         """Return the key number for a given row and column.
+//|         The key number is calculated by `row * number_of_columns + col`.
+//|         """
+//|         ...
+//|
+STATIC mp_obj_t keypad_keymatrix_key_num(mp_obj_t self_in, mp_obj_t row_in, mp_obj_t col_in) {
+    keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+
+    const mp_int_t row = mp_obj_get_int(row_in);
+    if (row < 0 || row >= common_hal_keypad_keymatrix_num_rows(self)) {
+        mp_raise_ValueError_varg(translate("%q out of range"), MP_QSTR_row_num);
+    }
+
+    const mp_int_t col = mp_obj_get_int(col_in);
+    if (col < 0 || col >= common_hal_keypad_keymatrix_num_cols(self)) {
+        mp_raise_ValueError_varg(translate("%q out of range"), MP_QSTR_col_num);
+    }
+
+    return MP_OBJ_NEW_SMALL_INT(
+        (mp_int_t)common_hal_keypad_keymatrix_key_num(self, (mp_uint_t)row, (mp_uint_t)col));
+}
+MP_DEFINE_CONST_FUN_OBJ_3(keypad_keymatrix_key_num_obj, keypad_keymatrix_key_num);
+
+STATIC const mp_rom_map_elem_t keypad_keymatrix_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_deinit),      MP_ROM_PTR(&keypad_keymatrix_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR___enter__),   MP_ROM_PTR(&default___enter___obj) },
+    { MP_ROM_QSTR(MP_QSTR___exit__),    MP_ROM_PTR(&keypad_keymatrix___exit___obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_clear_events), MP_ROM_PTR(&keypad_keymatrix_clear_events_obj) },
+    { MP_ROM_QSTR(MP_QSTR_key_num),      MP_ROM_PTR(&keypad_keymatrix_key_num_obj) },
+    { MP_ROM_QSTR(MP_QSTR_next_event),   MP_ROM_PTR(&keypad_keymatrix_next_event_obj) },
+    { MP_ROM_QSTR(MP_QSTR_pressed),      MP_ROM_PTR(&keypad_keymatrix_pressed_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(keypad_keymatrix_locals_dict, keypad_keymatrix_locals_dict_table);
+
+const mp_obj_type_t keypad_keymatrix_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Keys,
+    .make_new = keypad_keymatrix_make_new,
+    .locals_dict = (mp_obj_t)&keypad_keymatrix_locals_dict,
+};
diff --git a/shared-bindings/keypad/KeyMatrix.h b/shared-bindings/keypad/KeyMatrix.h
new file mode 100644
index 0000000000..f0ce8761bc
--- /dev/null
+++ b/shared-bindings/keypad/KeyMatrix.h
@@ -0,0 +1,49 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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_KEYPAD_KEYMATRIX_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_KEYMATRIX_H
+
+#include "py/objlist.h"
+#include "shared-module/keypad/KeyMatrix.h"
+
+extern const mp_obj_type_t keypad_keymatrix_type;
+
+void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint_t num_row_pins, mcu_pin_obj_t *row_pins[], mp_uint_t num_col_pins, mcu_pin_obj_t *col_pins[], size_t max_events);
+void common_hal_keypad_keymatrix_deinit(keypad_keymatrix_obj_t *self);
+bool common_hal_keypad_keymatrix_deinited(keypad_keymatrix_obj_t *self);
+
+mp_uint_t common_hal_keypad_keymatrix_key_num(keypad_keymatrix_obj_t *self, mp_uint_t row, mp_uint_t col);
+
+mp_uint_t common_hal_keypad_keymatrix_num_keys(keypad_keymatrix_obj_t *self);
+mp_uint_t common_hal_keypad_keymatrix_num_cols(keypad_keymatrix_obj_t *self);
+mp_uint_t common_hal_keypad_keymatrix_num_rows(keypad_keymatrix_obj_t *self);
+
+bool common_hal_keypad_keymatrix_pressed(keypad_keymatrix_obj_t *self, mp_uint_t key_num);
+mp_obj_t common_hal_keypad_keymatrix_next_event(keypad_keymatrix_obj_t *self);
+void common_hal_keypad_keymatrix_clear_events(keypad_keymatrix_obj_t *self);
+
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_KEYMATRIX_H
diff --git a/shared-bindings/keypad/Keys.c b/shared-bindings/keypad/Keys.c
index e92d91ce14..a54cff0ba9 100644
--- a/shared-bindings/keypad/Keys.c
+++ b/shared-bindings/keypad/Keys.c
@@ -24,10 +24,12 @@
  * THE SOFTWARE.
  */
 
+#include "lib/utils/context_manager_helpers.h"
+#include "py/runtime.h"
 #include "shared-bindings/keypad/Event.h"
 #include "shared-bindings/keypad/Keys.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "py/runtime.h"
+#include "shared-bindings/util.h"
 
 //| class Keys:
 //|     """Manage a set of independent keys."""
@@ -88,9 +90,46 @@ STATIC mp_obj_t keypad_keys_make_new(const mp_obj_type_t *type, size_t n_args, c
     }
 
     common_hal_keypad_keys_construct(self, num_pins, pins_array, value_when_pressed, args[ARG_pull].u_bool, max_events);
+
     return MP_OBJ_FROM_PTR(self);
 }
 
+//|     def deinit(self) -> None:
+//|         """Stop scanning and release the pins."""
+//|         ...
+//|
+STATIC mp_obj_t keypad_keys_deinit(mp_obj_t self_in) {
+    keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    common_hal_keypad_keys_deinit(self);
+    return MP_ROM_NONE;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_keys_deinit_obj, keypad_keys_deinit);
+
+//|     def __enter__(self) -> Keys:
+//|         """No-op used by Context Managers."""
+//|         ...
+//|
+//  Provided by context manager helper.
+
+//|     def __exit__(self) -> None:
+//|         """Automatically deinitializes when exiting a context. See
+//|         :ref:`lifetime-and-contextmanagers` for more info."""
+//|         ...
+//|
+STATIC mp_obj_t keypad_keys___exit__(size_t n_args, const mp_obj_t *args) {
+    (void)n_args;
+    common_hal_keypad_keys_deinit(args[0]);
+    return MP_ROM_NONE;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(keypad_keys___exit___obj, 4, 4, keypad_keys___exit__);
+
+STATIC void check_for_deinit(keypad_keys_obj_t *self) {
+    if (common_hal_keypad_keys_deinited(self)) {
+        raise_deinited_error();
+    }
+}
+
 //|     def next_event(self) -> Optional[Event]:
 //|         """Return the next key transition event. Return ``None` if no events are pending.
 //|
@@ -104,6 +143,8 @@ STATIC mp_obj_t keypad_keys_make_new(const mp_obj_type_t *type, size_t n_args, c
 //|
 STATIC mp_obj_t keypad_keys_next_event(mp_obj_t self_in, mp_obj_t event_in) {
     keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+
     return common_hal_keypad_keys_next_event(self);
 }
 MP_DEFINE_CONST_FUN_OBJ_2(keypad_keys_next_event_obj, keypad_keys_next_event);
@@ -115,6 +156,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(keypad_keys_next_event_obj, keypad_keys_next_event);
 //|
 STATIC mp_obj_t keypad_keys_clear_events(mp_obj_t self_in) {
     keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
 
     common_hal_keypad_keys_clear_events(self);
     return MP_ROM_NONE;
@@ -129,6 +171,8 @@ MP_DEFINE_CONST_FUN_OBJ_1(keypad_keys_clear_events_obj, keypad_keys_clear_events
 //|
 STATIC mp_obj_t keypad_keys_pressed(mp_obj_t self_in, mp_obj_t key_num_in) {
     keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+
     mp_int_t key_num = mp_obj_get_int(key_num_in);
     if (key_num < 0 || key_num >= common_hal_keypad_keys_num_keys(self)) {
         mp_raise_ValueError_varg(translate("%q out of range"), MP_QSTR_key_num);
@@ -139,6 +183,10 @@ STATIC mp_obj_t keypad_keys_pressed(mp_obj_t self_in, mp_obj_t key_num_in) {
 MP_DEFINE_CONST_FUN_OBJ_2(keypad_keys_pressed_obj, keypad_keys_pressed);
 
 STATIC const mp_rom_map_elem_t keypad_keys_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_deinit),      MP_ROM_PTR(&keypad_keys_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR___enter__),   MP_ROM_PTR(&default___enter___obj) },
+    { MP_ROM_QSTR(MP_QSTR___exit__),    MP_ROM_PTR(&keypad_keys___exit___obj) },
+
     { MP_ROM_QSTR(MP_QSTR_clear_events), MP_ROM_PTR(&keypad_keys_clear_events_obj) },
     { MP_ROM_QSTR(MP_QSTR_next_event),   MP_ROM_PTR(&keypad_keys_next_event_obj) },
     { MP_ROM_QSTR(MP_QSTR_pressed),      MP_ROM_PTR(&keypad_keys_pressed_obj) },
diff --git a/shared-bindings/keypad/Keys.h b/shared-bindings/keypad/Keys.h
index e9ab0b91e5..f7ec2302d8 100644
--- a/shared-bindings/keypad/Keys.h
+++ b/shared-bindings/keypad/Keys.h
@@ -33,6 +33,8 @@
 extern const mp_obj_type_t keypad_keys_type;
 
 void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pins, mcu_pin_obj_t *pins[], bool value_when_pressed,  bool pull, size_t max_events);
+void common_hal_keypad_keys_deinit(keypad_keys_obj_t *self);
+bool common_hal_keypad_keys_deinited(keypad_keys_obj_t *self);
 
 mp_uint_t common_hal_keypad_keys_num_keys(keypad_keys_obj_t *self);
 bool common_hal_keypad_keys_pressed(keypad_keys_obj_t *self, mp_uint_t key_num);
@@ -40,6 +42,4 @@ bool common_hal_keypad_keys_pressed(keypad_keys_obj_t *self, mp_uint_t key_num);
 mp_obj_t common_hal_keypad_keys_next_event(keypad_keys_obj_t *self);
 void common_hal_keypad_keys_clear_events(keypad_keys_obj_t *self);
 
-void keypad_keys_scan(keypad_keys_obj_t *self);
-
 #endif  // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_KEYS_H
diff --git a/shared-module/keypad/KeyMatrix.c b/shared-module/keypad/KeyMatrix.c
new file mode 100644
index 0000000000..4164de050f
--- /dev/null
+++ b/shared-module/keypad/KeyMatrix.c
@@ -0,0 +1,225 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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/gc.h"
+#include "py/runtime.h"
+#include "shared-bindings/keypad/Event.h"
+#include "shared-bindings/keypad/KeyMatrix.h"
+#include "shared-bindings/digitalio/DigitalInOut.h"
+#include "shared-bindings/util.h"
+#include "supervisor/port.h"
+#include "supervisor/shared/lock.h"
+#include "supervisor/shared/tick.h"
+
+static supervisor_lock_t keypad_keymatrix_linked_list_lock;
+
+#define DEBOUNCE_TICKS (20)
+
+// Top bit of 16-bit event indicates pressed or released. Rest is key_num.
+#define EVENT_PRESSED (1 << 15)
+#define EVENT_RELEASED (0)
+#define EVENT_KEY_NUM_MASK (~EVENT_PRESSED)
+
+static mp_uint_t row_col_to_key_num(keypad_keymatrix_obj_t *self, mp_uint_t row, mp_uint_t col) {
+    return row * self->col_digitalinouts->len + col;
+}
+
+void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint_t num_row_pins, mcu_pin_obj_t *row_pins[], mp_uint_t num_col_pins, mcu_pin_obj_t *col_pins[], size_t max_events) {
+
+    mp_obj_t row_dios[num_row_pins];
+    for (size_t i = 0; i < num_row_pins; i++) {
+        digitalio_digitalinout_obj_t *dio = m_new_obj(digitalio_digitalinout_obj_t);
+        dio->base.type = &digitalio_digitalinout_type;
+        common_hal_digitalio_digitalinout_construct(dio, row_pins[i]);
+        common_hal_digitalio_digitalinout_switch_to_input(dio, PULL_UP);
+        row_dios[i] = dio;
+    }
+    self->row_digitalinouts = mp_obj_new_tuple(num_col_pins, row_dios);
+
+    mp_obj_t col_dios[num_col_pins];
+    for (size_t i = 0; i < num_col_pins; i++) {
+        digitalio_digitalinout_obj_t *dio = m_new_obj(digitalio_digitalinout_obj_t);
+        dio->base.type = &digitalio_digitalinout_type;
+        common_hal_digitalio_digitalinout_construct(dio, col_pins[i]);
+        common_hal_digitalio_digitalinout_switch_to_input(dio, PULL_UP);
+        col_dios[i] = dio;
+    }
+    self->col_digitalinouts = mp_obj_new_tuple(num_row_pins, col_dios);
+
+    self->currently_pressed = (bool *)gc_alloc(sizeof(bool) * num_row_pins * num_col_pins, false, false);
+    self->previously_pressed = (bool *)gc_alloc(sizeof(bool) * num_row_pins * num_col_pins, false, false);
+
+    // Event queue is 16-bit values.
+    ringbuf_alloc(self->encoded_events, max_events * 2, false);
+
+    // Add self to the list of active Keys objects.
+
+    supervisor_acquire_lock(&keypad_keymatrix_linked_list_lock);
+    self->next = MP_STATE_VM(keypad_keymatrix_linked_list);
+    MP_STATE_VM(keypad_keymatrix_linked_list) = self;
+    supervisor_release_lock(&keypad_keymatrix_linked_list_lock);
+}
+
+void common_hal_keypad_keymatrix_deinit(keypad_keymatrix_obj_t *self) {
+    if (common_hal_keypad_keymatrix_deinited(self)) {
+        return;
+    }
+
+    for (size_t row = 0; row < common_hal_keypad_keymatrix_num_rows(self); row++) {
+        common_hal_digitalio_digitalinout_deinit(self->row_digitalinouts->items[row]);
+    }
+    self->row_digitalinouts = MP_ROM_NONE;
+
+    for (size_t col = 0; col < common_hal_keypad_keymatrix_num_cols(self); col++) {
+        common_hal_digitalio_digitalinout_deinit(self->col_digitalinouts->items[col]);
+    }
+    self->col_digitalinouts = MP_ROM_NONE;
+
+    // Remove self from the list of active KeyMatrix objects.
+
+    supervisor_acquire_lock(&keypad_keymatrix_linked_list_lock);
+    if (MP_STATE_VM(keypad_keymatrix_linked_list) == self) {
+        // I'm at the front; splice myself out.
+        MP_STATE_VM(keypad_keymatrix_linked_list) = self->next;
+    } else {
+        keypad_keymatrix_obj_t *current = MP_STATE_VM(keypad_keymatrix_linked_list);
+        while (current) {
+            if (current->next == self) {
+                // Splice myself out.
+                current->next = self->next;
+                break;
+            }
+            current = current->next;
+        }
+    }
+    supervisor_release_lock(&keypad_keymatrix_linked_list_lock);
+}
+
+bool common_hal_keypad_keymatrix_deinited(keypad_keymatrix_obj_t *self) {
+    return self->row_digitalinouts == MP_ROM_NONE;
+}
+
+size_t common_hal_keypad_keymatrix_num_keys(keypad_keymatrix_obj_t *self) {
+    return common_hal_keypad_keymatrix_num_rows(self) * common_hal_keypad_keymatrix_num_cols(self);
+}
+
+size_t common_hal_keypad_keymatrix_num_rows(keypad_keymatrix_obj_t *self) {
+    return self->row_digitalinouts->len;
+}
+
+size_t common_hal_keypad_keymatrix_num_cols(keypad_keymatrix_obj_t *self) {
+    return self->col_digitalinouts->len;
+}
+
+bool common_hal_keypad_keymatrix_pressed(keypad_keymatrix_obj_t *self, mp_uint_t key_num) {
+    return self->currently_pressed[key_num];
+}
+
+mp_obj_t common_hal_keypad_keymatrix_next_event(keypad_keymatrix_obj_t *self) {
+    int encoded_event = ringbuf_get16(self->encoded_events);
+    if (encoded_event == -1) {
+        return MP_ROM_NONE;
+    }
+
+    keypad_event_obj_t *event = m_new_obj(keypad_event_obj_t);
+    self->base.type = &keypad_event_type;
+    common_hal_keypad_event_construct(event, encoded_event & EVENT_KEY_NUM_MASK, encoded_event & EVENT_PRESSED);
+    return MP_OBJ_FROM_PTR(event);
+}
+
+void common_hal_keypad_keymatrix_clear_events(keypad_keymatrix_obj_t *self) {
+    ringbuf_clear(self->encoded_events);
+}
+
+mp_uint_t common_hal_keypad_keymatrix_key_num(keypad_keymatrix_obj_t *self, mp_uint_t row, mp_uint_t col) {
+    return row_col_to_key_num(self, row, col);
+}
+
+static void keypad_keymatrix_scan(keypad_keymatrix_obj_t *self) {
+    uint64_t now = port_get_raw_ticks(NULL);
+    if (now - self->last_scan_ticks < DEBOUNCE_TICKS) {
+        // Too soon. Wait longer to debounce.
+        return;
+    }
+
+    self->last_scan_ticks = now;
+
+    // On entry, all pins are set to inputs with a pull-up.
+    for (size_t row = 0; row < common_hal_keypad_keymatrix_num_rows(self); row++) {
+        // Switch this row to an output and set to low.
+        common_hal_digitalio_digitalinout_switch_to_output(
+            self->row_digitalinouts->items[row], false, DRIVE_MODE_PUSH_PULL);
+
+        for (size_t col = 0; col < common_hal_keypad_keymatrix_num_cols(self); col++) {
+            mp_uint_t key_num = row_col_to_key_num(self, row, col);
+            const bool previous = self->currently_pressed[key_num];
+            self->previously_pressed[key_num] = previous;
+
+            // Get the current state, by reading whether the col got pulled down or not.
+            const bool current =
+                common_hal_digitalio_digitalinout_get_value(self->col_digitalinouts->items[key_num]);
+            self->currently_pressed[key_num] = current;
+
+            // Record any transitions.
+            if (previous != current) {
+                if (ringbuf_num_empty(self->encoded_events) == 0) {
+                    // Discard oldest if full.
+                    ringbuf_get16(self->encoded_events);
+                }
+                ringbuf_put16(self->encoded_events, key_num | (current ? EVENT_PRESSED : EVENT_RELEASED));
+            }
+
+        }
+
+        // Switch the row back to an input, pulled up.
+        common_hal_digitalio_digitalinout_switch_to_input(self->row_digitalinouts->items[row], PULL_UP);
+    }
+}
+
+void keypad_keymatrix_tick(void) {
+    // Fast path.
+    if (!MP_STATE_VM(keypad_keymatrix_linked_list)) {
+        return;
+    }
+
+    if (supervisor_try_lock(&keypad_keymatrix_linked_list_lock)) {
+        keypad_keymatrix_obj_t *keypad_keymatrix = MP_STATE_VM(keypad_keymatrix_linked_list);
+        while (keypad_keymatrix) {
+            keypad_keymatrix_scan(keypad_keymatrix);
+            keypad_keymatrix = keypad_keymatrix->next;
+        }
+        supervisor_release_lock(&keypad_keymatrix_linked_list_lock);
+    }
+}
+
+void keypad_keymatrix_reset(void) {
+    if (MP_STATE_VM(keypad_keymatrix_linked_list)) {
+        supervisor_disable_tick();
+    }
+
+    MP_STATE_VM(keypad_keys_linked_list) = NULL;
+    keypad_keymatrix_linked_list_lock = false;
+}
diff --git a/shared-module/keypad/KeyMatrix.h b/shared-module/keypad/KeyMatrix.h
new file mode 100644
index 0000000000..d598f3941e
--- /dev/null
+++ b/shared-module/keypad/KeyMatrix.h
@@ -0,0 +1,51 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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_MODULE_KEYPAD_KEYMATRIX_H
+#define MICROPY_INCLUDED_SHARED_MODULE_KEYPAD_KEYMATRIX_H
+
+#include "common-hal/digitalio/DigitalInOut.h"
+
+#include "py/obj.h"
+#include "py/objtuple.h"
+#include "py/ringbuf.h"
+
+typedef struct _keypad_keymatrix_obj_t {
+    mp_obj_base_t base;
+    mp_obj_tuple_t *row_digitalinouts;
+    mp_obj_tuple_t *col_digitalinouts;
+    uint64_t last_scan_ticks;
+    bool *previously_pressed;
+    bool *currently_pressed;
+    ringbuf_t *encoded_events;
+    // Keep a linked list of active KeyMatrix objects.
+    struct _keypad_keymatrix_obj_t *next;
+} keypad_keymatrix_obj_t;
+
+void keypad_keymatrix_tick();
+void keypad_keymatrix_reset();
+
+#endif  // MICROPY_INCLUDED_SHARED_MODULE_KEYPAD_KEYMATRIX_H
diff --git a/shared-module/keypad/Keys.c b/shared-module/keypad/Keys.c
index 582668bce9..d7e0288907 100644
--- a/shared-module/keypad/Keys.c
+++ b/shared-module/keypad/Keys.c
@@ -25,11 +25,15 @@
  */
 
 #include "py/gc.h"
+#include "py/runtime.h"
 #include "shared-bindings/keypad/Event.h"
 #include "shared-bindings/keypad/Keys.h"
 #include "shared-bindings/digitalio/DigitalInOut.h"
-#include "py/runtime.h"
 #include "supervisor/port.h"
+#include "supervisor/shared/lock.h"
+#include "supervisor/shared/tick.h"
+
+static supervisor_lock_t keypad_keys_linked_list_lock;
 
 #define DEBOUNCE_TICKS (20)
 
@@ -58,13 +62,73 @@ void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pin
 
     // Event queue is 16-bit values.
     ringbuf_alloc(self->encoded_events, max_events * 2, false);
+
+    // Add self to the list of active Keys objects.
+
+    supervisor_acquire_lock(&keypad_keys_linked_list_lock);
+    self->next = MP_STATE_VM(keypad_keys_linked_list);
+    MP_STATE_VM(keypad_keys_linked_list) = self;
+    supervisor_release_lock(&keypad_keys_linked_list_lock);
+}
+
+void common_hal_keypad_keys_deinit(keypad_keys_obj_t *self) {
+    if (common_hal_keypad_keys_deinited(self)) {
+        return;
+    }
+
+    for (size_t key = 0; key < common_hal_keypad_keys_num_keys(self); key++) {
+        common_hal_digitalio_digitalinout_deinit(self->digitalinouts->items[key]);
+    }
+    self->digitalinouts = MP_ROM_NONE;
+
+    // Remove self from the list of active Keys objects.
+
+    supervisor_acquire_lock(&keypad_keys_linked_list_lock);
+    if (MP_STATE_VM(keypad_keys_linked_list) == self) {
+        // I'm at the front; splice myself out.
+        MP_STATE_VM(keypad_keys_linked_list) = self->next;
+    } else {
+        keypad_keys_obj_t *current = MP_STATE_VM(keypad_keys_linked_list);
+        while (current) {
+            if (current->next == self) {
+                // Splice myself out.
+                current->next = self->next;
+                break;
+            }
+            current = current->next;
+        }
+    }
+    supervisor_release_lock(&keypad_keys_linked_list_lock);
+}
+
+bool common_hal_keypad_keys_deinited(keypad_keys_obj_t *self) {
+    return self->digitalinouts == MP_ROM_NONE;
 }
 
 size_t common_hal_keypad_keys_num_keys(keypad_keys_obj_t *self) {
     return self->digitalinouts->len;
 }
+bool common_hal_keypad_keys_pressed(keypad_keys_obj_t *self, mp_uint_t key_num) {
+    return self->currently_pressed[key_num];
+}
 
-void keypad_keys_scan(keypad_keys_obj_t *self) {
+mp_obj_t common_hal_keypad_keys_next_event(keypad_keys_obj_t *self) {
+    int encoded_event = ringbuf_get16(self->encoded_events);
+    if (encoded_event == -1) {
+        return MP_ROM_NONE;
+    }
+
+    keypad_event_obj_t *event = m_new_obj(keypad_event_obj_t);
+    self->base.type = &keypad_event_type;
+    common_hal_keypad_event_construct(event, encoded_event & EVENT_KEY_NUM_MASK, encoded_event & EVENT_PRESSED);
+    return MP_OBJ_FROM_PTR(event);
+}
+
+void common_hal_keypad_keys_clear_events(keypad_keys_obj_t *self) {
+    ringbuf_clear(self->encoded_events);
+}
+
+static void keypad_keys_scan(keypad_keys_obj_t *self) {
     uint64_t now = port_get_raw_ticks(NULL);
     if (now - self->last_scan_ticks < DEBOUNCE_TICKS) {
         // Too soon. Wait longer to debounce.
@@ -94,22 +158,27 @@ void keypad_keys_scan(keypad_keys_obj_t *self) {
     }
 }
 
-bool common_hal_keypad_keys_pressed(keypad_keys_obj_t *self, mp_uint_t key_num) {
-    return self->currently_pressed[key_num];
-}
-
-mp_obj_t common_hal_keypad_keys_next_event(keypad_keys_obj_t *self) {
-    int encoded_event = ringbuf_get16(self->encoded_events);
-    if (encoded_event == -1) {
-        return MP_ROM_NONE;
+void keypad_keys_tick(void) {
+    // Fast path.
+    if (!MP_STATE_VM(keypad_keys_linked_list)) {
+        return;
     }
 
-    keypad_event_obj_t *event = m_new_obj(keypad_event_obj_t);
-    self->base.type = &keypad_event_type;
-    common_hal_keypad_event_construct(event, encoded_event & EVENT_KEY_NUM_MASK, encoded_event & EVENT_PRESSED);
-    return MP_OBJ_FROM_PTR(event);
+    if (supervisor_try_lock(&keypad_keys_linked_list_lock)) {
+        keypad_keys_obj_t *keypad_keys = MP_STATE_VM(keypad_keys_linked_list);
+        while (keypad_keys) {
+            keypad_keys_scan(keypad_keys);
+            keypad_keys = keypad_keys->next;
+        }
+        supervisor_release_lock(&keypad_keys_linked_list_lock);
+    }
 }
 
-void common_hal_keypad_keys_clear_events(keypad_keys_obj_t *self) {
-    ringbuf_clear(self->encoded_events);
+void keypad_keys_reset(void) {
+    if (MP_STATE_VM(keypad_keys_linked_list)) {
+        supervisor_disable_tick();
+    }
+
+    MP_STATE_VM(keypad_keys_linked_list) = NULL;
+    keypad_keys_linked_list_lock = false;
 }
diff --git a/shared-module/keypad/Keys.h b/shared-module/keypad/Keys.h
index 67822dd6d9..556f465a98 100644
--- a/shared-module/keypad/Keys.h
+++ b/shared-module/keypad/Keys.h
@@ -33,7 +33,7 @@
 #include "py/objtuple.h"
 #include "py/ringbuf.h"
 
-typedef struct {
+typedef struct _keypad_keys_obj_t {
     mp_obj_base_t base;
     mp_obj_tuple_t *digitalinouts;
     uint64_t last_scan_ticks;
@@ -41,7 +41,11 @@ typedef struct {
     bool *previously_pressed;
     bool *currently_pressed;
     ringbuf_t *encoded_events;
+    // Keep a linked list of active Keys objects.
+    struct _keypad_keys_obj_t *next;
 } keypad_keys_obj_t;
 
+void keypad_keys_tick();
+void keypad_keys_reset();
 
 #endif  // MICROPY_INCLUDED_SHARED_MODULE_KEYPAD_KEYS_H
diff --git a/shared-module/keypad/__init__.c b/shared-module/keypad/__init__.c
index e69de29bb2..9b08dc9bb5 100644
--- a/shared-module/keypad/__init__.c
+++ b/shared-module/keypad/__init__.c
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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 "shared-module/keypad/Keys.h"
+#include "shared-module/keypad/KeyMatrix.h"
+
+void keypad_tick(void) {
+    keypad_keys_tick();
+    keypad_keymatrix_tick();
+}
+
+void keypad_reset(void) {
+    keypad_keys_reset();
+    keypad_keymatrix_reset();
+}
diff --git a/shared-module/keypad/__init__.h b/shared-module/keypad/__init__.h
index 4220a3df63..2dc3fdca8e 100644
--- a/shared-module/keypad/__init__.h
+++ b/shared-module/keypad/__init__.h
@@ -27,4 +27,7 @@
 #ifndef SHARED_MODULE_KEYPAD_H
 #define SHARED_MODULE_KEYPAD_H
 
+void keypad_tick(void);
+void keypad_reset(void);
+
 #endif // SHARED_MODULE_KEYPAD_H
diff --git a/supervisor/shared/lock.c b/supervisor/shared/lock.c
new file mode 100644
index 0000000000..36971badad
--- /dev/null
+++ b/supervisor/shared/lock.c
@@ -0,0 +1,51 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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 "shared-bindings/microcontroller/__init__.h"
+#include "supervisor/shared/lock.h"
+
+void supervisor_acquire_lock(supervisor_lock_t *lock) {
+    while (!supervisor_try_lock(lock)) {
+        RUN_BACKGROUND_TASKS;
+    }
+}
+
+bool supervisor_try_lock(supervisor_lock_t *lock) {
+    bool grabbed_lock = false;
+    common_hal_mcu_disable_interrupts();
+    if (!*lock) {
+        *lock = true;
+        grabbed_lock = true;
+    }
+    common_hal_mcu_enable_interrupts();
+    return grabbed_lock;
+}
+
+void supervisor_release_lock(supervisor_lock_t *lock) {
+    common_hal_mcu_disable_interrupts();
+    *lock = false;
+    common_hal_mcu_enable_interrupts();
+}
diff --git a/supervisor/shared/lock.h b/supervisor/shared/lock.h
new file mode 100644
index 0000000000..89f81cfdfb
--- /dev/null
+++ b/supervisor/shared/lock.h
@@ -0,0 +1,36 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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_SUPERVISOR_LOCK_H
+#define MICROPY_INCLUDED_SUPERVISOR_LOCK_H
+
+typedef volatile bool supervisor_lock_t;
+
+void supervisor_acquire_lock(supervisor_lock_t *lock);
+bool supervisor_try_lock(supervisor_lock_t *lock);
+void supervisor_release_lock(supervisor_lock_t *lock);
+
+#endif // MICROPY_INCLUDED_SUPERVISOR_LOCK_H
diff --git a/supervisor/shared/tick.c b/supervisor/shared/tick.c
index f40151988e..77cdf8aba2 100644
--- a/supervisor/shared/tick.c
+++ b/supervisor/shared/tick.c
@@ -53,6 +53,10 @@
 #include "shared-module/gamepadshift/__init__.h"
 #endif
 
+#if CIRCUITPY_KEYPAD
+#include "shared-module/keypad/__init__.h"
+#endif
+
 #if CIRCUITPY_NETWORK
 #include "shared-module/network/__init__.h"
 #endif
@@ -108,9 +112,11 @@ void supervisor_tick(void) {
     #if CIRCUITPY_FILESYSTEM_FLUSH_INTERVAL_MS > 0
     filesystem_tick();
     #endif
+
     #ifdef CIRCUITPY_AUTORELOAD_DELAY_MS
     autoreload_tick();
     #endif
+
     #ifdef CIRCUITPY_GAMEPAD_TICKS
     if (!(port_get_raw_ticks(NULL) & CIRCUITPY_GAMEPAD_TICKS)) {
         #if CIRCUITPY_GAMEPAD
@@ -121,6 +127,11 @@ void supervisor_tick(void) {
         #endif
     }
     #endif
+
+    #if CIRCUITPY_KEYPAD
+    keypad_tick();
+    #endif
+
     background_callback_add(&tick_callback, supervisor_background_tasks, NULL);
 }
 
diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk
index 0815a9ffc4..d32436cdb0 100644
--- a/supervisor/supervisor.mk
+++ b/supervisor/supervisor.mk
@@ -7,6 +7,7 @@ SRC_SUPERVISOR = \
 	supervisor/shared/cpu.c \
 	supervisor/shared/filesystem.c \
 	supervisor/shared/flash.c \
+	supervisor/shared/lock.c \
         supervisor/shared/memory.c \
 	supervisor/shared/micropython.c \
 	supervisor/shared/safe_mode.c \

From 350652ee214a0c3fed1c6c3394886728a48a9fa8 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Mon, 14 Jun 2021 22:59:17 -0400
Subject: [PATCH 238/349] Keys works; more testing to do

---
 shared-bindings/keypad/Event.c     | 10 +++++++++-
 shared-bindings/keypad/Event.h     |  2 +-
 shared-bindings/keypad/KeyMatrix.c |  6 +++---
 shared-bindings/keypad/Keys.c      |  6 +++---
 shared-module/keypad/Event.c       |  2 +-
 shared-module/keypad/KeyMatrix.c   | 12 ++++++------
 shared-module/keypad/KeyMatrix.h   |  6 +++---
 shared-module/keypad/Keys.c        | 21 ++++++++++++---------
 shared-module/keypad/Keys.h        |  6 +++---
 9 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/shared-bindings/keypad/Event.c b/shared-bindings/keypad/Event.c
index 218da5b82e..787b09d83b 100644
--- a/shared-bindings/keypad/Event.c
+++ b/shared-bindings/keypad/Event.c
@@ -117,9 +117,17 @@ STATIC const mp_rom_map_elem_t keypad_event_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(keypad_event_locals_dict, keypad_event_locals_dict_table);
 
+STATIC void keypad_event_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    keypad_event_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "<Event: keynum %d %s>",
+        common_hal_keypad_event_get_key_num(self),
+        common_hal_keypad_event_get_pressed(self) ? "pressed" : "released");
+}
+
 const mp_obj_type_t keypad_event_type = {
     { &mp_type_type },
-    .name = MP_QSTR_UART,
+    .name = MP_QSTR_Event,
     .make_new = keypad_event_make_new,
+    .print = keypad_event_print,
     .locals_dict = (mp_obj_dict_t *)&keypad_event_locals_dict,
 };
diff --git a/shared-bindings/keypad/Event.h b/shared-bindings/keypad/Event.h
index 03e04eb6ee..23017f1dc5 100644
--- a/shared-bindings/keypad/Event.h
+++ b/shared-bindings/keypad/Event.h
@@ -32,7 +32,7 @@
 
 extern const mp_obj_type_t keypad_event_type;
 
-void common_hal_keypad_event_construct(keypad_event_obj_t *self, uint16_t key_num, bool pressed);
+void common_hal_keypad_event_construct(keypad_event_obj_t *self, mp_uint_t key_num, bool pressed);
 mp_int_t common_hal_keypad_event_get_key_num(keypad_event_obj_t *self);
 bool common_hal_keypad_event_get_pressed(keypad_event_obj_t *self);
 bool common_hal_keypad_event_get_released(keypad_event_obj_t *self);
diff --git a/shared-bindings/keypad/KeyMatrix.c b/shared-bindings/keypad/KeyMatrix.c
index b6b09a9a0a..4e2038aa37 100644
--- a/shared-bindings/keypad/KeyMatrix.c
+++ b/shared-bindings/keypad/KeyMatrix.c
@@ -174,7 +174,7 @@ STATIC mp_obj_t keypad_keymatrix_pressed(mp_obj_t self_in, mp_obj_t key_num_in)
     check_for_deinit(self);
 
     mp_int_t key_num = mp_obj_get_int(key_num_in);
-    if (key_num < 0 || key_num >= common_hal_keypad_keymatrix_num_keys(self)) {
+    if (key_num < 0 || (size_t)key_num >= common_hal_keypad_keymatrix_num_keys(self)) {
         mp_raise_ValueError_varg(translate("%q out of range"), MP_QSTR_key_num);
     }
 
@@ -193,12 +193,12 @@ STATIC mp_obj_t keypad_keymatrix_key_num(mp_obj_t self_in, mp_obj_t row_in, mp_o
     check_for_deinit(self);
 
     const mp_int_t row = mp_obj_get_int(row_in);
-    if (row < 0 || row >= common_hal_keypad_keymatrix_num_rows(self)) {
+    if (row < 0 || (size_t)row >= common_hal_keypad_keymatrix_num_rows(self)) {
         mp_raise_ValueError_varg(translate("%q out of range"), MP_QSTR_row_num);
     }
 
     const mp_int_t col = mp_obj_get_int(col_in);
-    if (col < 0 || col >= common_hal_keypad_keymatrix_num_cols(self)) {
+    if (col < 0 || (size_t)col >= common_hal_keypad_keymatrix_num_cols(self)) {
         mp_raise_ValueError_varg(translate("%q out of range"), MP_QSTR_col_num);
     }
 
diff --git a/shared-bindings/keypad/Keys.c b/shared-bindings/keypad/Keys.c
index a54cff0ba9..849e2a639e 100644
--- a/shared-bindings/keypad/Keys.c
+++ b/shared-bindings/keypad/Keys.c
@@ -141,13 +141,13 @@ STATIC void check_for_deinit(keypad_keys_obj_t *self) {
 //|         """
 //|         ...
 //|
-STATIC mp_obj_t keypad_keys_next_event(mp_obj_t self_in, mp_obj_t event_in) {
+STATIC mp_obj_t keypad_keys_next_event(mp_obj_t self_in) {
     keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
 
     return common_hal_keypad_keys_next_event(self);
 }
-MP_DEFINE_CONST_FUN_OBJ_2(keypad_keys_next_event_obj, keypad_keys_next_event);
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_keys_next_event_obj, keypad_keys_next_event);
 
 //|     def clear_events(self) -> None:
 //|         """Clear any queued key transition events.
@@ -174,7 +174,7 @@ STATIC mp_obj_t keypad_keys_pressed(mp_obj_t self_in, mp_obj_t key_num_in) {
     check_for_deinit(self);
 
     mp_int_t key_num = mp_obj_get_int(key_num_in);
-    if (key_num < 0 || key_num >= common_hal_keypad_keys_num_keys(self)) {
+    if (key_num < 0 || (size_t)key_num >= common_hal_keypad_keys_num_keys(self)) {
         mp_raise_ValueError_varg(translate("%q out of range"), MP_QSTR_key_num);
     }
 
diff --git a/shared-module/keypad/Event.c b/shared-module/keypad/Event.c
index 6556d1f5a3..21b4ad18d3 100644
--- a/shared-module/keypad/Event.c
+++ b/shared-module/keypad/Event.c
@@ -28,7 +28,7 @@
 
 void common_hal_keypad_event_construct(keypad_event_obj_t *self, mp_uint_t key_num, bool pressed) {
     self->key_num = key_num;
-    self->pressed = true;
+    self->pressed = pressed;
 }
 
 mp_int_t common_hal_keypad_event_get_key_num(keypad_event_obj_t *self) {
diff --git a/shared-module/keypad/KeyMatrix.c b/shared-module/keypad/KeyMatrix.c
index 4164de050f..04cb84facb 100644
--- a/shared-module/keypad/KeyMatrix.c
+++ b/shared-module/keypad/KeyMatrix.c
@@ -73,7 +73,7 @@ void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint
     self->previously_pressed = (bool *)gc_alloc(sizeof(bool) * num_row_pins * num_col_pins, false, false);
 
     // Event queue is 16-bit values.
-    ringbuf_alloc(self->encoded_events, max_events * 2, false);
+    ringbuf_alloc(&self->encoded_events, max_events * 2, false);
 
     // Add self to the list of active Keys objects.
 
@@ -139,7 +139,7 @@ bool common_hal_keypad_keymatrix_pressed(keypad_keymatrix_obj_t *self, mp_uint_t
 }
 
 mp_obj_t common_hal_keypad_keymatrix_next_event(keypad_keymatrix_obj_t *self) {
-    int encoded_event = ringbuf_get16(self->encoded_events);
+    int encoded_event = ringbuf_get16(&self->encoded_events);
     if (encoded_event == -1) {
         return MP_ROM_NONE;
     }
@@ -151,7 +151,7 @@ mp_obj_t common_hal_keypad_keymatrix_next_event(keypad_keymatrix_obj_t *self) {
 }
 
 void common_hal_keypad_keymatrix_clear_events(keypad_keymatrix_obj_t *self) {
-    ringbuf_clear(self->encoded_events);
+    ringbuf_clear(&self->encoded_events);
 }
 
 mp_uint_t common_hal_keypad_keymatrix_key_num(keypad_keymatrix_obj_t *self, mp_uint_t row, mp_uint_t col) {
@@ -185,11 +185,11 @@ static void keypad_keymatrix_scan(keypad_keymatrix_obj_t *self) {
 
             // Record any transitions.
             if (previous != current) {
-                if (ringbuf_num_empty(self->encoded_events) == 0) {
+                if (ringbuf_num_empty(&self->encoded_events) == 0) {
                     // Discard oldest if full.
-                    ringbuf_get16(self->encoded_events);
+                    ringbuf_get16(&self->encoded_events);
                 }
-                ringbuf_put16(self->encoded_events, key_num | (current ? EVENT_PRESSED : EVENT_RELEASED));
+                ringbuf_put16(&self->encoded_events, key_num | (current ? EVENT_PRESSED : EVENT_RELEASED));
             }
 
         }
diff --git a/shared-module/keypad/KeyMatrix.h b/shared-module/keypad/KeyMatrix.h
index d598f3941e..2051536898 100644
--- a/shared-module/keypad/KeyMatrix.h
+++ b/shared-module/keypad/KeyMatrix.h
@@ -40,12 +40,12 @@ typedef struct _keypad_keymatrix_obj_t {
     uint64_t last_scan_ticks;
     bool *previously_pressed;
     bool *currently_pressed;
-    ringbuf_t *encoded_events;
+    ringbuf_t encoded_events;
     // Keep a linked list of active KeyMatrix objects.
     struct _keypad_keymatrix_obj_t *next;
 } keypad_keymatrix_obj_t;
 
-void keypad_keymatrix_tick();
-void keypad_keymatrix_reset();
+void keypad_keymatrix_tick(void);
+void keypad_keymatrix_reset(void);
 
 #endif  // MICROPY_INCLUDED_SHARED_MODULE_KEYPAD_KEYMATRIX_H
diff --git a/shared-module/keypad/Keys.c b/shared-module/keypad/Keys.c
index d7e0288907..84e77e91eb 100644
--- a/shared-module/keypad/Keys.c
+++ b/shared-module/keypad/Keys.c
@@ -59,9 +59,10 @@ void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pin
     self->currently_pressed = (bool *)gc_alloc(sizeof(bool) * num_pins, false, false);
     self->previously_pressed = (bool *)gc_alloc(sizeof(bool) * num_pins, false, false);
     self->value_when_pressed = value_when_pressed;
+    self->last_scan_ticks = port_get_raw_ticks(NULL);
 
     // Event queue is 16-bit values.
-    ringbuf_alloc(self->encoded_events, max_events * 2, false);
+    ringbuf_alloc(&self->encoded_events, max_events * 2, false);
 
     // Add self to the list of active Keys objects.
 
@@ -69,6 +70,8 @@ void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pin
     self->next = MP_STATE_VM(keypad_keys_linked_list);
     MP_STATE_VM(keypad_keys_linked_list) = self;
     supervisor_release_lock(&keypad_keys_linked_list_lock);
+
+    supervisor_enable_tick();
 }
 
 void common_hal_keypad_keys_deinit(keypad_keys_obj_t *self) {
@@ -113,19 +116,19 @@ bool common_hal_keypad_keys_pressed(keypad_keys_obj_t *self, mp_uint_t key_num)
 }
 
 mp_obj_t common_hal_keypad_keys_next_event(keypad_keys_obj_t *self) {
-    int encoded_event = ringbuf_get16(self->encoded_events);
+    int encoded_event = ringbuf_get16(&self->encoded_events);
     if (encoded_event == -1) {
         return MP_ROM_NONE;
     }
 
     keypad_event_obj_t *event = m_new_obj(keypad_event_obj_t);
-    self->base.type = &keypad_event_type;
+    event->base.type = &keypad_event_type;
     common_hal_keypad_event_construct(event, encoded_event & EVENT_KEY_NUM_MASK, encoded_event & EVENT_PRESSED);
     return MP_OBJ_FROM_PTR(event);
 }
 
 void common_hal_keypad_keys_clear_events(keypad_keys_obj_t *self) {
-    ringbuf_clear(self->encoded_events);
+    ringbuf_clear(&self->encoded_events);
 }
 
 static void keypad_keys_scan(keypad_keys_obj_t *self) {
@@ -143,17 +146,17 @@ static void keypad_keys_scan(keypad_keys_obj_t *self) {
         self->previously_pressed[key_num] = previous;
 
         // Get the current state.
-        const bool current = common_hal_digitalio_digitalinout_get_value(self->digitalinouts->items[key_num]) ==
+        const bool current =
+            common_hal_digitalio_digitalinout_get_value(self->digitalinouts->items[key_num]) ==
             self->value_when_pressed;
         self->currently_pressed[key_num] = current;
-
         // Record any transitions.
         if (previous != current) {
-            if (ringbuf_num_empty(self->encoded_events) == 0) {
+            if (ringbuf_num_empty(&self->encoded_events) == 0) {
                 // Discard oldest if full.
-                ringbuf_get16(self->encoded_events);
+                ringbuf_get16(&self->encoded_events);
             }
-            ringbuf_put16(self->encoded_events, key_num | (current ? EVENT_PRESSED : EVENT_RELEASED));
+            ringbuf_put16(&self->encoded_events, key_num | (current ? EVENT_PRESSED : EVENT_RELEASED));
         }
     }
 }
diff --git a/shared-module/keypad/Keys.h b/shared-module/keypad/Keys.h
index 556f465a98..ecf8165b9e 100644
--- a/shared-module/keypad/Keys.h
+++ b/shared-module/keypad/Keys.h
@@ -40,12 +40,12 @@ typedef struct _keypad_keys_obj_t {
     bool value_when_pressed;
     bool *previously_pressed;
     bool *currently_pressed;
-    ringbuf_t *encoded_events;
+    ringbuf_t encoded_events;
     // Keep a linked list of active Keys objects.
     struct _keypad_keys_obj_t *next;
 } keypad_keys_obj_t;
 
-void keypad_keys_tick();
-void keypad_keys_reset();
+void keypad_keys_tick(void);
+void keypad_keys_reset(void);
 
 #endif  // MICROPY_INCLUDED_SHARED_MODULE_KEYPAD_KEYS_H

From b0b8ebc4f6e337e18c79367ccc5f379dfa8681d9 Mon Sep 17 00:00:00 2001
From: Mike Teachman <mike.teachman@gmail.com>
Date: Thu, 3 Jun 2021 09:43:56 -0700
Subject: [PATCH 239/349] extmod/uasyncio: Add readinto() method to Stream
 class.

With docs and a multi-test using TCP server/client.

This method is a MicroPython extension, although there is discussion of
adding it to CPython: https://bugs.python.org/issue41305

Signed-off-by: Mike Teachman <mike.teachman@gmail.com>
---
 docs/library/uasyncio.rst                    |  8 ++
 extmod/uasyncio/stream.py                    |  4 +
 tests/multi_net/uasyncio_tcp_readinto.py     | 80 ++++++++++++++++++++
 tests/multi_net/uasyncio_tcp_readinto.py.exp | 11 +++
 4 files changed, 103 insertions(+)
 create mode 100644 tests/multi_net/uasyncio_tcp_readinto.py
 create mode 100644 tests/multi_net/uasyncio_tcp_readinto.py.exp

diff --git a/docs/library/uasyncio.rst b/docs/library/uasyncio.rst
index 1efee56e96..0be3288296 100644
--- a/docs/library/uasyncio.rst
+++ b/docs/library/uasyncio.rst
@@ -240,6 +240,14 @@ TCP stream connections
 
     This is a coroutine.
 
+.. method:: Stream.readinto(buf)
+
+    Read up to n bytes into *buf* with n being equal to the length of *buf*.
+
+    Return the number of bytes read into *buf*.
+
+    This is a coroutine, and a MicroPython extension.
+
 .. method:: Stream.readline()
 
     Read a line and return it.
diff --git a/extmod/uasyncio/stream.py b/extmod/uasyncio/stream.py
index 2a259e618f..3a68881da3 100644
--- a/extmod/uasyncio/stream.py
+++ b/extmod/uasyncio/stream.py
@@ -30,6 +30,10 @@ class Stream:
         yield core._io_queue.queue_read(self.s)
         return self.s.read(n)
 
+    async def readinto(self, buf):
+        yield core._io_queue.queue_read(self.s)
+        return self.s.readinto(buf)
+
     async def readexactly(self, n):
         r = b""
         while n:
diff --git a/tests/multi_net/uasyncio_tcp_readinto.py b/tests/multi_net/uasyncio_tcp_readinto.py
new file mode 100644
index 0000000000..631997652a
--- /dev/null
+++ b/tests/multi_net/uasyncio_tcp_readinto.py
@@ -0,0 +1,80 @@
+# Test uasyncio stream readinto() method using TCP server/client
+
+try:
+    import uasyncio as asyncio
+except ImportError:
+    try:
+        import asyncio
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+try:
+    import uarray as array
+except ImportError:
+    try:
+        import array
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+PORT = 8000
+
+
+async def handle_connection(reader, writer):
+    writer.write(b"ab")
+    await writer.drain()
+
+    writer.write(b"c")
+    await writer.drain()
+
+    print("close")
+    writer.close()
+    await writer.wait_closed()
+
+    print("done")
+    ev.set()
+
+
+async def tcp_server():
+    global ev
+    ev = asyncio.Event()
+    server = await asyncio.start_server(handle_connection, "0.0.0.0", PORT)
+    print("server running")
+    multitest.next()
+    async with server:
+        await asyncio.wait_for(ev.wait(), 10)
+
+
+async def tcp_client():
+    reader, writer = await asyncio.open_connection(IP, PORT)
+
+    ba = bytearray(2)
+    n = await reader.readinto(ba)
+    print(n)
+    print(ba[:n])
+
+    a = array.array("b", [0, 0])
+    n = await reader.readinto(a)
+    print(n)
+    print(a[:n])
+
+    try:
+        n = await reader.readinto(5)
+    except TypeError as er:
+        print("TypeError")
+
+    try:
+        n = await reader.readinto()
+    except TypeError as er:
+        print("TypeError")
+
+
+def instance0():
+    multitest.globals(IP=multitest.get_network_ip())
+    asyncio.run(tcp_server())
+
+
+def instance1():
+    multitest.next()
+    asyncio.run(tcp_client())
diff --git a/tests/multi_net/uasyncio_tcp_readinto.py.exp b/tests/multi_net/uasyncio_tcp_readinto.py.exp
new file mode 100644
index 0000000000..2d40ba1e63
--- /dev/null
+++ b/tests/multi_net/uasyncio_tcp_readinto.py.exp
@@ -0,0 +1,11 @@
+--- instance0 ---
+server running
+close
+done
+--- instance1 ---
+2
+bytearray(b'ab')
+1
+array('b', [99])
+TypeError
+TypeError

From 77c529e8be7302a8436152ead6dacf050c03d601 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 13 Jun 2021 23:55:15 +1000
Subject: [PATCH 240/349] tools/mpremote: Use available ports instead of
 auto-connect list.

Using just the list of available ports, instead of a hard-coded list of
possible ports, means that all ports will be available for auto connection.
And the order that they will be attempted in will match what's printed by
"mpremote connect list" (and will be the same as before, trying ACMx before
USBx).  Auto-connect will also now work on Mac, and will allow all COM
ports on Windows.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/mpremote/main.py | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index 1ce00305eb..121eec3bfa 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -25,21 +25,6 @@ from .console import Console, ConsolePosix
 
 _PROG = "mpremote"
 
-_AUTO_CONNECT_SEARCH_LIST = [
-    "/dev/ttyACM0",
-    "/dev/ttyACM1",
-    "/dev/ttyACM2",
-    "/dev/ttyACM3",
-    "/dev/ttyUSB0",
-    "/dev/ttyUSB1",
-    "/dev/ttyUSB2",
-    "/dev/ttyUSB3",
-    "COM0",
-    "COM1",
-    "COM2",
-    "COM3",
-]
-
 _BUILTIN_COMMAND_EXPANSIONS = {
     # Device connection shortcuts.
     "a0": "connect /dev/ttyACM0",
@@ -187,14 +172,12 @@ def do_connect(args):
             return None
         elif dev == "auto":
             # Auto-detect and auto-connect to the first available device.
-            ports = serial.tools.list_ports.comports()
-            for dev in _AUTO_CONNECT_SEARCH_LIST:
-                if any(p.device == dev for p in ports):
-                    try:
-                        return pyboard.PyboardExtended(dev, baudrate=115200)
-                    except pyboard.PyboardError as er:
-                        if not er.args[0].startswith("failed to access"):
-                            raise er
+            for p in sorted(serial.tools.list_ports.comports()):
+                try:
+                    return pyboard.PyboardExtended(p.device, baudrate=115200)
+                except pyboard.PyboardError as er:
+                    if not er.args[0].startswith("failed to access"):
+                        raise er
             raise pyboard.PyboardError("no device found")
         elif dev.startswith("id:"):
             # Search for a device with the given serial number.

From d2dcd05adc0228dcb46cd31d5cc4751d88460b80 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 13 Jun 2021 23:59:03 +1000
Subject: [PATCH 241/349] tools/mpremote: Use signal to capture and handle
 ctrl-C on Windows.

Now a ctrl-C will not stop mpremote, rather this character will be passed
through to the attached device.

The mpremote version is also increased to 0.0.5.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/mpremote/console.py | 31 +++++++++++++++++++-----------
 tools/mpremote/mpremote/main.py    |  9 ++-------
 tools/mpremote/setup.cfg           |  2 +-
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/tools/mpremote/mpremote/console.py b/tools/mpremote/mpremote/console.py
index 646bbfa22e..2652c7393b 100644
--- a/tools/mpremote/mpremote/console.py
+++ b/tools/mpremote/mpremote/console.py
@@ -1,11 +1,11 @@
-import sys
+import sys, time
 
 try:
     import select, termios
 except ImportError:
     termios = None
     select = None
-    import msvcrt
+    import msvcrt, signal
 
 
 class ConsolePosix:
@@ -31,9 +31,9 @@ class ConsolePosix:
     def exit(self):
         termios.tcsetattr(self.infd, termios.TCSANOW, self.orig_attr)
 
-    def waitchar(self):
-        # TODO pyb.serial might not have fd
-        select.select([console_in.infd, pyb.serial.fd], [], [])
+    def waitchar(self, pyb_serial):
+        # TODO pyb_serial might not have fd
+        select.select([self.infd, pyb_serial.fd], [], [])
 
     def readchar(self):
         res = select.select([self.infd], [], [], 0)
@@ -75,20 +75,29 @@ class ConsoleWindows:
         b"\x94": b"Z",  # Ctrl-Tab = BACKTAB,
     }
 
+    def __init__(self):
+        self.ctrl_c = 0
+
+    def _sigint_handler(self, signo, frame):
+        self.ctrl_c += 1
+
     def enter(self):
-        pass
+        signal.signal(signal.SIGINT, self._sigint_handler)
 
     def exit(self):
-        pass
+        signal.signal(signal.SIGINT, signal.SIG_DFL)
 
     def inWaiting(self):
-        return 1 if msvcrt.kbhit() else 0
+        return 1 if self.ctrl_c or msvcrt.kbhit() else 0
 
-    def waitchar(self):
-        while not (self.inWaiting() or pyb.serial.inWaiting()):
+    def waitchar(self, pyb_serial):
+        while not (self.inWaiting() or pyb_serial.inWaiting()):
             time.sleep(0.01)
 
     def readchar(self):
+        if self.ctrl_c:
+            self.ctrl_c -= 1
+            return b"\x03"
         if msvcrt.kbhit():
             ch = msvcrt.getch()
             while ch in b"\x00\xe0":  # arrow or function key prefix?
@@ -120,7 +129,7 @@ else:
 
     # Windows VT mode ( >= win10 only)
     # https://bugs.python.org/msg291732
-    import ctypes
+    import ctypes, os
     from ctypes import wintypes
 
     kernel32 = ctypes.WinDLL("kernel32", use_last_error=True)
diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index 121eec3bfa..b7c46a1f11 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -17,7 +17,7 @@ MicroPython device over a serial connection.  Commands supported are:
     mpremote repl                    -- enter REPL
 """
 
-import os, select, sys, time
+import os, sys
 import serial.tools.list_ports
 
 from . import pyboardextended as pyboard
@@ -249,12 +249,7 @@ def do_filesystem(pyb, args):
 
 def do_repl_main_loop(pyb, console_in, console_out_write, *, code_to_inject, file_to_inject):
     while True:
-        if isinstance(console_in, ConsolePosix):
-            # TODO pyb.serial might not have fd
-            select.select([console_in.infd, pyb.serial.fd], [], [])
-        else:
-            while not (console_in.inWaiting() or pyb.serial.inWaiting()):
-                time.sleep(0.01)
+        console_in.waitchar(pyb.serial)
         c = console_in.readchar()
         if c:
             if c == b"\x1d":  # ctrl-], quit
diff --git a/tools/mpremote/setup.cfg b/tools/mpremote/setup.cfg
index 4a1bf27c10..4e78d05a94 100644
--- a/tools/mpremote/setup.cfg
+++ b/tools/mpremote/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = mpremote
-version = 0.0.4
+version = 0.0.5
 author = Damien George
 author_email = damien@micropython.org
 description = Tool for interacting remotely with MicroPython

From 1803a6a71d84822d59e0c8fadb613f78675d9549 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Tue, 15 Jun 2021 11:15:09 -0400
Subject: [PATCH 242/349] both Keys and KeyMatrix work

---
 shared-bindings/keypad/Event.c     | 67 ++++++++++++++++++++++++++----
 shared-bindings/keypad/KeyMatrix.c | 39 +++++++++--------
 shared-bindings/keypad/Keys.c      |  8 ++--
 shared-module/keypad/KeyMatrix.c   | 23 +++++-----
 4 files changed, 97 insertions(+), 40 deletions(-)

diff --git a/shared-bindings/keypad/Event.c b/shared-bindings/keypad/Event.c
index 787b09d83b..807f0c6af5 100644
--- a/shared-bindings/keypad/Event.c
+++ b/shared-bindings/keypad/Event.c
@@ -78,7 +78,9 @@ const mp_obj_property_t keypad_event_key_num_obj = {
 };
 
 //|     pressed: bool
-//|     """True if event represents a key down (pressed) transition."""
+//|     """True if event represents a key down (pressed) transition.
+//|     The opposite of `released`.
+//|     """
 //|
 STATIC mp_obj_t keypad_event_obj_get_pressed(mp_obj_t self_in) {
     keypad_event_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -94,7 +96,9 @@ const mp_obj_property_t keypad_event_pressed_obj = {
 };
 
 //|     released: bool
-//|     """True if event represents a key up (released) transition."""
+//|     """True if event represents a key up (released) transition.
+//|     The opposite of `pressed`.
+//|     """
 //|
 STATIC mp_obj_t keypad_event_obj_get_released(mp_obj_t self_in) {
     keypad_event_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -109,13 +113,48 @@ const mp_obj_property_t keypad_event_released_obj = {
               MP_ROM_NONE},
 };
 
-STATIC const mp_rom_map_elem_t keypad_event_locals_dict_table[] = {
-    // Properties
-    { MP_ROM_QSTR(MP_QSTR_key_num),  MP_ROM_PTR(&keypad_event_key_num_obj) },
-    { MP_ROM_QSTR(MP_QSTR_pressed),  MP_ROM_PTR(&keypad_event_pressed_obj) },
-    { MP_ROM_QSTR(MP_QSTR_released), MP_ROM_PTR(&keypad_event_released_obj) },
-};
-STATIC MP_DEFINE_CONST_DICT(keypad_event_locals_dict, keypad_event_locals_dict_table);
+//|     def __eq__(self, other: object) -> bool:
+//|         """Two Event objects are equal if their `key_num`
+//|         and `pressed`/`released` values are equal.
+//|         """
+//|         ...
+//|
+STATIC mp_obj_t keypad_event_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
+    switch (op) {
+        case MP_BINARY_OP_EQUAL:
+            if (mp_obj_is_type(rhs_in, &keypad_event_type)) {
+                keypad_event_obj_t *lhs = MP_OBJ_TO_PTR(lhs_in);
+                keypad_event_obj_t *rhs = MP_OBJ_TO_PTR(rhs_in);
+                return mp_obj_new_bool(
+                    (common_hal_keypad_event_get_key_num(lhs) ==
+                        common_hal_keypad_event_get_key_num(rhs)) &&
+                    (common_hal_keypad_event_get_pressed(lhs) ==
+                        common_hal_keypad_event_get_pressed(rhs)));
+            } else {
+                return mp_const_false;
+            }
+
+        default:
+            return MP_OBJ_NULL; // op not supported
+    }
+}
+
+//|     def __hash__(self) -> int:
+//|         """Returns a hash for the Event, so it can be used in dictionaries, etc.."""
+//|         ...
+//|
+STATIC mp_obj_t keypad_event_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
+    keypad_event_obj_t *self = MP_OBJ_TO_PTR(self);
+    switch (op) {
+        case MP_UNARY_OP_HASH: {
+            const mp_int_t key_num = common_hal_keypad_event_get_key_num(self);
+            const bool pressed = common_hal_keypad_event_get_pressed(self);
+            return MP_OBJ_NEW_SMALL_INT((pressed << 15) + key_num);
+        }
+        default:
+            return MP_OBJ_NULL; // op not supported
+    }
+}
 
 STATIC void keypad_event_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     keypad_event_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -124,10 +163,20 @@ STATIC void keypad_event_print(const mp_print_t *print, mp_obj_t self_in, mp_pri
         common_hal_keypad_event_get_pressed(self) ? "pressed" : "released");
 }
 
+STATIC const mp_rom_map_elem_t keypad_event_locals_dict_table[] = {
+    // Properties
+    { MP_ROM_QSTR(MP_QSTR_key_num),  MP_ROM_PTR(&keypad_event_key_num_obj) },
+    { MP_ROM_QSTR(MP_QSTR_pressed),  MP_ROM_PTR(&keypad_event_pressed_obj) },
+    { MP_ROM_QSTR(MP_QSTR_released), MP_ROM_PTR(&keypad_event_released_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(keypad_event_locals_dict, keypad_event_locals_dict_table);
+
 const mp_obj_type_t keypad_event_type = {
     { &mp_type_type },
     .name = MP_QSTR_Event,
     .make_new = keypad_event_make_new,
     .print = keypad_event_print,
+    .unary_op = keypad_event_unary_op,
+    .binary_op = keypad_event_binary_op,
     .locals_dict = (mp_obj_dict_t *)&keypad_event_locals_dict,
 };
diff --git a/shared-bindings/keypad/KeyMatrix.c b/shared-bindings/keypad/KeyMatrix.c
index 4e2038aa37..5820c9ea39 100644
--- a/shared-bindings/keypad/KeyMatrix.c
+++ b/shared-bindings/keypad/KeyMatrix.c
@@ -34,17 +34,20 @@
 //| class KeyMatrix:
 //|     """Manage a 2D matrix of keys with row and column pins."""
 //|
-//|     def __init__(self, row_pins: Sequence[microcontroller.Pin], col_pins: Sequence[microcontroller.Pin], max_events: int = 16) -> None:
+//|     def __init__(self, row_pins: Sequence[microcontroller.Pin], col_pins: Sequence[microcontroller.Pin], max_events: int = 64) -> None:
 //|         """
-//|         Create a `Keys` object that will scan key matrix attached to the given row and column pins.
+//|         Create a `Keys` object that will scan the key matrix attached to the given row and column pins.
 //|         If the matrix uses diodes, the diode anodes should be connected to the column pins,
-//|         and the cathodes should be connected to the row pins.
+//|         and the cathodes should be connected to the row pins. If your diodes are reversed,
+//|         simply exchange the row and column pin sequences.
 //|
 //|         The keys are numbered sequentially from zero. A key number can be computed
-//|         by ``col * len(row_pins) + row``.
+//|         by ``row * len(col_pins) + col``.
 //|
-//|         :param Sequence[microcontroller.Pin] row_pins: The pins attached to rows.
-//|         :param Sequence[microcontroller.Pin] col_pins: The pins attached to rows.
+//|         The keys are debounced by waiting about 20 msecs before reporting a transition.
+//|
+//|         :param Sequence[microcontroller.Pin] row_pins: The pins attached to the rows.
+//|         :param Sequence[microcontroller.Pin] col_pins: The pins attached to the colums.
 //|         :param int max_events: Size of key event queue:
 //|           maximum number of key transition events that are saved.
 //|           Must be >= 1.
@@ -58,8 +61,8 @@ STATIC mp_obj_t keypad_keymatrix_make_new(const mp_obj_type_t *type, size_t n_ar
     enum { ARG_row_pins, ARG_col_pins, ARG_max_events };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_row_pins, MP_ARG_REQUIRED | MP_ARG_OBJ },
-        { MP_QSTR_col_pins, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_BOOL },
-        { MP_QSTR_max_events, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 16} },
+        { MP_QSTR_col_pins, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_max_events, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 64} },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
@@ -79,16 +82,16 @@ STATIC mp_obj_t keypad_keymatrix_make_new(const mp_obj_type_t *type, size_t n_ar
     mcu_pin_obj_t *row_pins_array[num_row_pins];
     mcu_pin_obj_t *col_pins_array[num_col_pins];
 
-    for (mp_uint_t i = 0; i < num_row_pins; i++) {
+    for (size_t row = 0; row < num_row_pins; row++) {
         mcu_pin_obj_t *pin =
-            validate_obj_is_free_pin(mp_obj_subscr(row_pins, MP_OBJ_NEW_SMALL_INT(i), MP_OBJ_SENTINEL));
-        row_pins_array[i] = pin;
+            validate_obj_is_free_pin(mp_obj_subscr(row_pins, MP_OBJ_NEW_SMALL_INT(row), MP_OBJ_SENTINEL));
+        row_pins_array[row] = pin;
     }
 
-    for (mp_uint_t i = 0; i < num_col_pins; i++) {
+    for (size_t col = 0; col < num_col_pins; col++) {
         mcu_pin_obj_t *pin =
-            validate_obj_is_free_pin(mp_obj_subscr(col_pins, MP_OBJ_NEW_SMALL_INT(i), MP_OBJ_SENTINEL));
-        col_pins_array[i] = pin;
+            validate_obj_is_free_pin(mp_obj_subscr(col_pins, MP_OBJ_NEW_SMALL_INT(col), MP_OBJ_SENTINEL));
+        col_pins_array[col] = pin;
     }
 
     common_hal_keypad_keymatrix_construct(self, num_row_pins, row_pins_array, num_col_pins, col_pins_array, max_events);
@@ -131,7 +134,7 @@ STATIC void check_for_deinit(keypad_keymatrix_obj_t *self) {
 }
 
 //|     def next_event(self) -> Optional[Event]:
-//|         """Return the next key transition event. Return ``None` if no events are pending.
+//|         """Return the next key transition event. Return ``None`` if no events are pending.
 //|
 //|         Note that the queue size is limited; see ``max_events`` in the constructor.
 //|         If a new event arrives when the queue is full, the oldest event is discarded.
@@ -141,13 +144,13 @@ STATIC void check_for_deinit(keypad_keymatrix_obj_t *self) {
 //|         """
 //|         ...
 //|
-STATIC mp_obj_t keypad_keymatrix_next_event(mp_obj_t self_in, mp_obj_t event_in) {
+STATIC mp_obj_t keypad_keymatrix_next_event(mp_obj_t self_in) {
     keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
 
     return common_hal_keypad_keymatrix_next_event(self);
 }
-MP_DEFINE_CONST_FUN_OBJ_2(keypad_keymatrix_next_event_obj, keypad_keymatrix_next_event);
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_keymatrix_next_event_obj, keypad_keymatrix_next_event);
 
 //|     def clear_events(self) -> None:
 //|         """Clear any queued key transition events.
@@ -184,7 +187,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(keypad_keymatrix_pressed_obj, keypad_keymatrix_pressed
 
 //|     def key_num(self, row: int, col: int) -> int:
 //|         """Return the key number for a given row and column.
-//|         The key number is calculated by `row * number_of_columns + col`.
+//|         The key number is calculated by ``row * len(col_pins) + col``.
 //|         """
 //|         ...
 //|
diff --git a/shared-bindings/keypad/Keys.c b/shared-bindings/keypad/Keys.c
index 849e2a639e..ad8a1b9e03 100644
--- a/shared-bindings/keypad/Keys.c
+++ b/shared-bindings/keypad/Keys.c
@@ -34,11 +34,13 @@
 //| class Keys:
 //|     """Manage a set of independent keys."""
 //|
-//|     def __init__(self, pins: Sequence[microcontroller.Pin], *, level_when_pressed: bool, pull: bool = True, max_events: int = 16) -> None:
+//|     def __init__(self, pins: Sequence[microcontroller.Pin], *, level_when_pressed: bool, pull: bool = True, max_events: int = 64) -> None:
 //|         """
 //|         Create a `Keys` object that will scan keys attached to the given sequence of pins.
 //|         Each key is independent and attached to its own pin.
 //|
+//|         The keys are debounced by waiting about 20 msecs before reporting a transition.
+//|
 //|         :param Sequence[microcontroller.Pin] pins: The pins attached to the keys.
 //|           The key numbers correspond to indices into this sequence.
 //|         :param bool value_when_pressed: ``True`` if the pin reads high when the key is pressed.
@@ -65,7 +67,7 @@ STATIC mp_obj_t keypad_keys_make_new(const mp_obj_type_t *type, size_t n_args, c
         { MP_QSTR_pins, MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_value_when_pressed, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_BOOL },
         { MP_QSTR_pull, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} },
-        { MP_QSTR_max_events, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 16} },
+        { MP_QSTR_max_events, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 64} },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
@@ -131,7 +133,7 @@ STATIC void check_for_deinit(keypad_keys_obj_t *self) {
 }
 
 //|     def next_event(self) -> Optional[Event]:
-//|         """Return the next key transition event. Return ``None` if no events are pending.
+//|         """Return the next key transition event. Return ``None`` if no events are pending.
 //|
 //|         Note that the queue size is limited; see ``max_events`` in the constructor.
 //|         If a new event arrives when the queue is full, the oldest event is discarded.
diff --git a/shared-module/keypad/KeyMatrix.c b/shared-module/keypad/KeyMatrix.c
index 04cb84facb..8ad08d0eb8 100644
--- a/shared-module/keypad/KeyMatrix.c
+++ b/shared-module/keypad/KeyMatrix.c
@@ -50,24 +50,24 @@ static mp_uint_t row_col_to_key_num(keypad_keymatrix_obj_t *self, mp_uint_t row,
 void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint_t num_row_pins, mcu_pin_obj_t *row_pins[], mp_uint_t num_col_pins, mcu_pin_obj_t *col_pins[], size_t max_events) {
 
     mp_obj_t row_dios[num_row_pins];
-    for (size_t i = 0; i < num_row_pins; i++) {
+    for (size_t row = 0; row < num_row_pins; row++) {
         digitalio_digitalinout_obj_t *dio = m_new_obj(digitalio_digitalinout_obj_t);
         dio->base.type = &digitalio_digitalinout_type;
-        common_hal_digitalio_digitalinout_construct(dio, row_pins[i]);
+        common_hal_digitalio_digitalinout_construct(dio, row_pins[row]);
         common_hal_digitalio_digitalinout_switch_to_input(dio, PULL_UP);
-        row_dios[i] = dio;
+        row_dios[row] = dio;
     }
-    self->row_digitalinouts = mp_obj_new_tuple(num_col_pins, row_dios);
+    self->row_digitalinouts = mp_obj_new_tuple(num_row_pins, row_dios);
 
     mp_obj_t col_dios[num_col_pins];
-    for (size_t i = 0; i < num_col_pins; i++) {
+    for (size_t col = 0; col < num_col_pins; col++) {
         digitalio_digitalinout_obj_t *dio = m_new_obj(digitalio_digitalinout_obj_t);
         dio->base.type = &digitalio_digitalinout_type;
-        common_hal_digitalio_digitalinout_construct(dio, col_pins[i]);
+        common_hal_digitalio_digitalinout_construct(dio, col_pins[col]);
         common_hal_digitalio_digitalinout_switch_to_input(dio, PULL_UP);
-        col_dios[i] = dio;
+        col_dios[col] = dio;
     }
-    self->col_digitalinouts = mp_obj_new_tuple(num_row_pins, col_dios);
+    self->col_digitalinouts = mp_obj_new_tuple(num_col_pins, col_dios);
 
     self->currently_pressed = (bool *)gc_alloc(sizeof(bool) * num_row_pins * num_col_pins, false, false);
     self->previously_pressed = (bool *)gc_alloc(sizeof(bool) * num_row_pins * num_col_pins, false, false);
@@ -81,6 +81,8 @@ void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint
     self->next = MP_STATE_VM(keypad_keymatrix_linked_list);
     MP_STATE_VM(keypad_keymatrix_linked_list) = self;
     supervisor_release_lock(&keypad_keymatrix_linked_list_lock);
+
+    supervisor_enable_tick();
 }
 
 void common_hal_keypad_keymatrix_deinit(keypad_keymatrix_obj_t *self) {
@@ -145,7 +147,7 @@ mp_obj_t common_hal_keypad_keymatrix_next_event(keypad_keymatrix_obj_t *self) {
     }
 
     keypad_event_obj_t *event = m_new_obj(keypad_event_obj_t);
-    self->base.type = &keypad_event_type;
+    event->base.type = &keypad_event_type;
     common_hal_keypad_event_construct(event, encoded_event & EVENT_KEY_NUM_MASK, encoded_event & EVENT_PRESSED);
     return MP_OBJ_FROM_PTR(event);
 }
@@ -179,8 +181,9 @@ static void keypad_keymatrix_scan(keypad_keymatrix_obj_t *self) {
             self->previously_pressed[key_num] = previous;
 
             // Get the current state, by reading whether the col got pulled down or not.
+            // If low, the key is pressed.
             const bool current =
-                common_hal_digitalio_digitalinout_get_value(self->col_digitalinouts->items[key_num]);
+                !common_hal_digitalio_digitalinout_get_value(self->col_digitalinouts->items[col]);
             self->currently_pressed[key_num] = current;
 
             // Record any transitions.

From 689476c576dc4ea5e944f396bd4bf2b95e08cf70 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 30 May 2021 18:18:33 +0200
Subject: [PATCH 243/349] mimxrt/machine_uart: Add the UART class to the
 machine module.

The implementation uses the LPUARTx devices.  Up to 8 UARTs can be used,
given that the pins are accessible.  E.g. 8 on Teensy 4.1, 5 on
MIMXRT1020_EVK.

For Tennsy 4.0 and 4.1 the UART numbers are as printed on the pinout 1..N.
The MIMXRT10xx-EVK boards have only one UART named, which gets the number
1.  All other UART are assigned to different Pins:

MIMXRT1010-EVK:
    D0/D1   UART 1
    D6/D7   UART 2
    A0/D4   UART 3

MIMXRT1020-EVK:
    D0/D1   UART 1
    D6/D9   UART 2
    D10/D12 UART 3
    D14/D15 UART 4
    A0/A1   UART 5

MIMXRT1050-EVK, MIMXRT1060-EVK, MIMXRT1064-EVK:
    D0/D1   UART 1
    D7/D6   UART 2
    D8/D9   UART 3
    A1/A0   UART 4
---
 ports/mimxrt/Makefile                         |   2 +
 .../boards/MIMXRT1010_EVK/mpconfigboard.h     |  14 +
 ports/mimxrt/boards/MIMXRT1010_EVK/pins.csv   |  21 -
 .../boards/MIMXRT1020_EVK/mpconfigboard.h     |  21 +
 .../boards/MIMXRT1050_EVK/mpconfigboard.h     |  19 +
 ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv   |  20 -
 .../boards/MIMXRT1060_EVK/mpconfigboard.h     |  19 +
 ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv   |  20 -
 .../boards/MIMXRT1064_EVK/mpconfigboard.h     |  20 +-
 ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv   |  20 -
 ports/mimxrt/boards/TEENSY40/mpconfigboard.h  |  14 +
 ports/mimxrt/boards/TEENSY41/mpconfigboard.h  |  14 +
 ports/mimxrt/machine_uart.c                   | 465 ++++++++++++++++++
 ports/mimxrt/modmachine.c                     |   1 +
 ports/mimxrt/modmachine.h                     |   1 +
 15 files changed, 589 insertions(+), 82 deletions(-)
 create mode 100644 ports/mimxrt/machine_uart.c

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index cacbcc1a37..3af2a55472 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -140,6 +140,7 @@ SRC_C = \
 	machine_pin.c \
 	machine_rtc.c \
 	machine_timer.c \
+	machine_uart.c \
 	mimxrt_flash.c \
 	modutime.c \
 	modmachine.c \
@@ -263,6 +264,7 @@ SRC_QSTR += \
 	machine_pin.c \
 	machine_rtc.c \
 	machine_timer.c \
+	machine_uart.c \
 	mimxrt_flash.c \
 	modutime.c \
 	modmachine.c \
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
index 3eb3268125..5a373a3ca6 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
@@ -8,3 +8,17 @@
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1010_flexspi_nor_config.h"
+
+// Define mapping logical UART # to hardware UART #
+// LPUART1 on D0/D1 -> 1
+// LPUART3 on A0/D4 -> 3
+// LPUART4 on D6/D7 -> 2
+
+#define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
+#define MICROPY_HW_UART_INDEX   { 0, 1, 4, 3 }
+
+#define IOMUX_TABLE_UART \
+    { IOMUXC_GPIO_10_LPUART1_TXD }, { IOMUXC_GPIO_09_LPUART1_RXD }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_08_LPUART3_TXD }, { IOMUXC_GPIO_AD_07_LPUART3_RXD }, \
+    { IOMUXC_GPIO_AD_02_LPUART4_TXD }, { IOMUXC_GPIO_AD_01_LPUART4_RXD },
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1010_EVK/pins.csv
index f7fdf39643..1f01215ddd 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/pins.csv
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/pins.csv
@@ -34,24 +34,3 @@ PWM_CB,GPIO_05
 ENC_A,GPIO_AD_05
 ENC_B,GPIO_AD_06
 LED_GREEN,GPIO_11
-GPIO_01,GPIO_01
-GPIO_02,GPIO_02
-GPIO_03,GPIO_03
-GPIO_04,GPIO_04
-GPIO_05,GPIO_05
-GPIO_06,GPIO_06
-GPIO_08,GPIO_08
-GPIO_09,GPIO_09
-GPIO_10,GPIO_10
-GPIO_11,GPIO_11
-GPIO_AD_01,GPIO_AD_01
-GPIO_AD_02,GPIO_AD_02
-GPIO_AD_03,GPIO_AD_03
-GPIO_AD_04,GPIO_AD_04
-GPIO_AD_05,GPIO_AD_05
-GPIO_AD_06,GPIO_AD_06
-GPIO_AD_07,GPIO_AD_07
-GPIO_AD_09,GPIO_AD_09
-GPIO_AD_10,GPIO_AD_10
-GPIO_AD_14,GPIO_AD_14
-GPIO_SD_02,GPIO_SD_02
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
index a025c85bf3..5a595074ad 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
@@ -9,3 +9,24 @@
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1020_flexspi_nor_config.h"
+
+// Define mapping logical UART # to hardware UART #
+// D3/D5   LPUART1  Not usable, Since D3 is blocked.
+// D0/D1   LPUART2 -> 1
+// D6/D9   LPUART3 -> 2
+// D10/D12 LPUART5 -> 3
+// D14/D15 LPUART8 -> 4
+// A0/A1   LPUART4 -> 5
+
+#define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
+#define MICROPY_HW_UART_INDEX   { 0, 2, 3, 5, 8, 4 }
+
+#define IOMUX_TABLE_UART \
+    { IOMUXC_GPIO_AD_B0_06_LPUART1_TX }, { IOMUXC_GPIO_AD_B0_07_LPUART1_RX }, \
+    { IOMUXC_GPIO_AD_B1_08_LPUART2_TX }, { IOMUXC_GPIO_AD_B1_09_LPUART2_RX }, \
+    { IOMUXC_GPIO_AD_B0_14_LPUART3_TX }, { IOMUXC_GPIO_AD_B0_15_LPUART3_RX }, \
+    { IOMUXC_GPIO_AD_B1_10_LPUART4_TX }, { IOMUXC_GPIO_AD_B1_11_LPUART4_RX }, \
+    { IOMUXC_GPIO_AD_B0_10_LPUART5_TX }, { IOMUXC_GPIO_AD_B0_11_LPUART5_RX }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_SD_B1_02_LPUART8_TX }, { IOMUXC_GPIO_SD_B1_03_LPUART8_RX },
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
index 9b7664841e..51e0e2dc47 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
@@ -8,3 +8,22 @@
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1050_flexspi_nor_config.h"
+
+// Define mapping logical UART # to hardware UART #
+// LPUART3 on D0/D1  -> 1
+// LPUART2 on D7/D6  -> 2
+// LPUART6 on D8/D9  -> 3
+// LPUART8 on A1/A0  -> 4
+
+#define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
+#define MICROPY_HW_UART_INDEX   { 0, 3, 2, 6, 8 }
+
+#define IOMUX_TABLE_UART \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B1_02_LPUART2_TX }, { IOMUXC_GPIO_AD_B1_03_LPUART2_RX }, \
+    { IOMUXC_GPIO_AD_B1_06_LPUART3_TX }, { IOMUXC_GPIO_AD_B1_07_LPUART3_RX }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B0_02_LPUART6_TX }, { IOMUXC_GPIO_AD_B0_03_LPUART6_RX }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B1_10_LPUART8_TX }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RX },
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv
index afd63d4f97..366a141ff8 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv
@@ -29,23 +29,3 @@ SDI,GPIO_SD_B0_03
 SDO,GPIO_SD_B0_02
 CS,GPIO_SD_B0_01
 LED_GREEN,GPIO_AD_B0_09
-GPIO_AD_B1_07,GPIO_AD_B1_07
-GPIO_AD_B1_06,GPIO_AD_B1_06
-GPIO_AD_B0_11,GPIO_AD_B0_11
-GPIO_AD_B1_08,GPIO_AD_B1_08
-GPIO_AD_B0_09,GPIO_AD_B0_09
-GPIO_AD_B0_10,GPIO_AD_B0_10
-GPIO_AD_B1_02,GPIO_AD_B1_02
-GPIO_AD_B1_03,GPIO_AD_B1_03
-GPIO_AD_B0_03,GPIO_AD_B0_03
-GPIO_AD_B0_02,GPIO_AD_B0_02
-GPIO_SD_B0_01,GPIO_SD_B0_01
-GPIO_SD_B0_02,GPIO_SD_B0_02
-GPIO_SD_B0_03,GPIO_SD_B0_03
-GPIO_SD_B0_00,GPIO_SD_B0_00
-GPIO_AD_B1_01,GPIO_AD_B1_01
-GPIO_AD_B1_00,GPIO_AD_B1_00
-GPIO_AD_B1_10,GPIO_AD_B1_10
-GPIO_AD_B1_11,GPIO_AD_B1_11
-GPIO_AD_B1_04,GPIO_AD_B1_04
-GPIO_AD_B1_05,GPIO_AD_B1_05
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
index 3974f93257..02372a3c54 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
@@ -8,3 +8,22 @@
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1060_flexspi_nor_config.h"
+
+// Define mapping logical UART # to hardware UART #
+// LPUART3 on D0/D1  -> 1
+// LPUART2 on D7/D6  -> 2
+// LPUART6 on D8/D9  -> 3
+// LPUART8 on A1/A0  -> 4
+
+#define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
+#define MICROPY_HW_UART_INDEX   { 0, 3, 2, 6, 8 }
+
+#define IOMUX_TABLE_UART \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B1_02_LPUART2_TX }, { IOMUXC_GPIO_AD_B1_03_LPUART2_RX }, \
+    { IOMUXC_GPIO_AD_B1_06_LPUART3_TX }, { IOMUXC_GPIO_AD_B1_07_LPUART3_RX }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B0_02_LPUART6_TX }, { IOMUXC_GPIO_AD_B0_03_LPUART6_RX }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B1_10_LPUART8_TX }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RX },
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv
index afd63d4f97..366a141ff8 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv
@@ -29,23 +29,3 @@ SDI,GPIO_SD_B0_03
 SDO,GPIO_SD_B0_02
 CS,GPIO_SD_B0_01
 LED_GREEN,GPIO_AD_B0_09
-GPIO_AD_B1_07,GPIO_AD_B1_07
-GPIO_AD_B1_06,GPIO_AD_B1_06
-GPIO_AD_B0_11,GPIO_AD_B0_11
-GPIO_AD_B1_08,GPIO_AD_B1_08
-GPIO_AD_B0_09,GPIO_AD_B0_09
-GPIO_AD_B0_10,GPIO_AD_B0_10
-GPIO_AD_B1_02,GPIO_AD_B1_02
-GPIO_AD_B1_03,GPIO_AD_B1_03
-GPIO_AD_B0_03,GPIO_AD_B0_03
-GPIO_AD_B0_02,GPIO_AD_B0_02
-GPIO_SD_B0_01,GPIO_SD_B0_01
-GPIO_SD_B0_02,GPIO_SD_B0_02
-GPIO_SD_B0_03,GPIO_SD_B0_03
-GPIO_SD_B0_00,GPIO_SD_B0_00
-GPIO_AD_B1_01,GPIO_AD_B1_01
-GPIO_AD_B1_00,GPIO_AD_B1_00
-GPIO_AD_B1_10,GPIO_AD_B1_10
-GPIO_AD_B1_11,GPIO_AD_B1_11
-GPIO_AD_B1_04,GPIO_AD_B1_04
-GPIO_AD_B1_05,GPIO_AD_B1_05
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
index 01e2e10bb5..e8492c9224 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
@@ -1,9 +1,27 @@
 #define MICROPY_HW_BOARD_NAME "i.MX RT1064 EVK"
 #define MICROPY_HW_MCU_NAME   "MIMXRT1064DVL6A"
 
-
 // MIMXRT1064_EVK has 1 user LED
 #define MICROPY_HW_LED1_PIN (pin_GPIO_AD_B0_09)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1064_flexspi_nor_config.h"
+
+// Define mapping logical UART # to hardware UART #
+// LPUART3 on D0/D1  -> 1
+// LPUART2 on D7/D6  -> 2
+// LPUART6 on D8/D9  -> 3
+// LPUART8 on A1/A0  -> 4
+
+#define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
+#define MICROPY_HW_UART_INDEX   { 0, 3, 2, 6, 8 }
+
+#define IOMUX_TABLE_UART \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B1_02_LPUART2_TX }, { IOMUXC_GPIO_AD_B1_03_LPUART2_RX }, \
+    { IOMUXC_GPIO_AD_B1_06_LPUART3_TX }, { IOMUXC_GPIO_AD_B1_07_LPUART3_RX }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B0_02_LPUART6_TX }, { IOMUXC_GPIO_AD_B0_03_LPUART6_RX }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B1_10_LPUART8_TX }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RX },
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv
index afd63d4f97..366a141ff8 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv
@@ -29,23 +29,3 @@ SDI,GPIO_SD_B0_03
 SDO,GPIO_SD_B0_02
 CS,GPIO_SD_B0_01
 LED_GREEN,GPIO_AD_B0_09
-GPIO_AD_B1_07,GPIO_AD_B1_07
-GPIO_AD_B1_06,GPIO_AD_B1_06
-GPIO_AD_B0_11,GPIO_AD_B0_11
-GPIO_AD_B1_08,GPIO_AD_B1_08
-GPIO_AD_B0_09,GPIO_AD_B0_09
-GPIO_AD_B0_10,GPIO_AD_B0_10
-GPIO_AD_B1_02,GPIO_AD_B1_02
-GPIO_AD_B1_03,GPIO_AD_B1_03
-GPIO_AD_B0_03,GPIO_AD_B0_03
-GPIO_AD_B0_02,GPIO_AD_B0_02
-GPIO_SD_B0_01,GPIO_SD_B0_01
-GPIO_SD_B0_02,GPIO_SD_B0_02
-GPIO_SD_B0_03,GPIO_SD_B0_03
-GPIO_SD_B0_00,GPIO_SD_B0_00
-GPIO_AD_B1_01,GPIO_AD_B1_01
-GPIO_AD_B1_00,GPIO_AD_B1_00
-GPIO_AD_B1_10,GPIO_AD_B1_10
-GPIO_AD_B1_11,GPIO_AD_B1_11
-GPIO_AD_B1_04,GPIO_AD_B1_04
-GPIO_AD_B1_05,GPIO_AD_B1_05
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
index c6f11b51d1..6bbac0a976 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
@@ -8,3 +8,17 @@
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "teensy40_flexspi_nor_config.h"
+
+// UART config: 7 UARTs at the pins for Teensy 4.0
+#define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
+#define MICROPY_HW_UART_INDEX   { 0, 6, 4, 2, 3, 8, 1, 7 }
+
+#define IOMUX_TABLE_UART \
+    { IOMUXC_GPIO_AD_B0_12_LPUART1_TX }, { IOMUXC_GPIO_AD_B0_13_LPUART1_RX }, \
+    { IOMUXC_GPIO_AD_B1_02_LPUART2_TX }, { IOMUXC_GPIO_AD_B1_03_LPUART2_RX }, \
+    { IOMUXC_GPIO_AD_B1_06_LPUART3_TX }, { IOMUXC_GPIO_AD_B1_07_LPUART3_RX }, \
+    { IOMUXC_GPIO_B1_00_LPUART4_TX }, { IOMUXC_GPIO_B1_01_LPUART4_RX }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B0_02_LPUART6_TX }, { IOMUXC_GPIO_AD_B0_03_LPUART6_RX }, \
+    { IOMUXC_GPIO_EMC_31_LPUART7_TX }, { IOMUXC_GPIO_EMC_32_LPUART7_RX }, \
+    { IOMUXC_GPIO_AD_B1_10_LPUART8_TX }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RX },
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
index 6acfa11cdb..1e07cb29ca 100755
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
@@ -8,3 +8,17 @@
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "teensy41_flexspi_nor_config.h"
+
+// UART config: 8 UARTs at the pins for Teensy 4.1
+#define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
+#define MICROPY_HW_UART_INDEX   { 0, 6, 4, 2, 3, 8, 1, 7, 5 }
+
+#define IOMUX_TABLE_UART \
+    { IOMUXC_GPIO_AD_B0_12_LPUART1_TX }, { IOMUXC_GPIO_AD_B0_13_LPUART1_RX }, \
+    { IOMUXC_GPIO_AD_B1_02_LPUART2_TX }, { IOMUXC_GPIO_AD_B1_03_LPUART2_RX }, \
+    { IOMUXC_GPIO_AD_B1_06_LPUART3_TX }, { IOMUXC_GPIO_AD_B1_07_LPUART3_RX }, \
+    { IOMUXC_GPIO_B1_00_LPUART4_TX }, { IOMUXC_GPIO_B1_01_LPUART4_RX }, \
+    { IOMUXC_GPIO_B1_12_LPUART5_TX }, { IOMUXC_GPIO_B1_13_LPUART5_RX }, \
+    { IOMUXC_GPIO_AD_B0_02_LPUART6_TX }, { IOMUXC_GPIO_AD_B0_03_LPUART6_RX }, \
+    { IOMUXC_GPIO_EMC_31_LPUART7_TX }, { IOMUXC_GPIO_EMC_32_LPUART7_RX }, \
+    { IOMUXC_GPIO_AD_B1_10_LPUART8_TX }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RX },
diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
new file mode 100644
index 0000000000..abdb7ed97e
--- /dev/null
+++ b/ports/mimxrt/machine_uart.c
@@ -0,0 +1,465 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ * Copyright (c) 2021 Robert Hammelrath
+ *
+ * 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/runtime.h"
+#include "py/stream.h"
+#include "py/mphal.h"
+#include "ticks.h"
+#include "fsl_common.h"
+#include "fsl_lpuart.h"
+#include "fsl_iomuxc.h"
+
+#define DEFAULT_UART_BAUDRATE (115200)
+#define DEFAULT_BUFFER_SIZE (256)
+#define MIN_BUFFER_SIZE  (32)
+#define MAX_BUFFER_SIZE  (32766)
+
+#define UART_INVERT_TX (1)
+#define UART_INVERT_RX (2)
+#define UART_INVERT_MASK (UART_INVERT_TX | UART_INVERT_RX)
+
+typedef struct _machine_uart_obj_t {
+    mp_obj_base_t base;
+    struct _lpuart_handle handle;
+    lpuart_config_t config;
+    LPUART_Type *lpuart;
+    uint16_t timeout;       // timeout waiting for first char (in ms)
+    uint16_t timeout_char;  // timeout waiting between chars (in ms)
+    uint8_t id;
+    uint8_t invert;
+    uint16_t tx_status;
+    uint8_t *txbuf;
+    uint16_t txbuf_len;
+    bool new;
+} machine_uart_obj_t;
+
+typedef struct _iomux_table_t {
+    uint32_t muxRegister;
+    uint32_t muxMode;
+    uint32_t inputRegister;
+    uint32_t inputDaisy;
+    uint32_t configRegister;
+} iomux_table_t;
+
+extern const mp_obj_type_t machine_uart_type;
+
+STATIC const uint8_t uart_index_table[] = MICROPY_HW_UART_INDEX;
+STATIC LPUART_Type *uart_base_ptr_table[] = LPUART_BASE_PTRS;
+static const iomux_table_t iomux_table_uart[] = {
+    IOMUX_TABLE_UART
+};
+
+STATIC const char *_parity_name[] = {"None", "", "0", "1"};  // Is defined as 0, 2, 3
+STATIC const char *_invert_name[] = {"None", "INV_TX", "INV_RX", "INV_TX|INV_RX"};
+
+#define RX (iomux_table_uart[index + 1])
+#define TX (iomux_table_uart[index])
+
+bool lpuart_set_iomux(int8_t uart) {
+    int index = (uart - 1) * 2;
+
+    if (TX.muxRegister != 0) {
+        IOMUXC_SetPinMux(TX.muxRegister, TX.muxMode, TX.inputRegister, TX.inputDaisy, TX.configRegister, 0U);
+        IOMUXC_SetPinConfig(TX.muxRegister, TX.muxMode, TX.inputRegister, TX.inputDaisy, TX.configRegister, 0x10B0u);
+
+        IOMUXC_SetPinMux(RX.muxRegister, RX.muxMode, RX.inputRegister, RX.inputDaisy, RX.configRegister, 0U);
+        IOMUXC_SetPinConfig(RX.muxRegister, RX.muxMode, RX.inputRegister, RX.inputDaisy, RX.configRegister, 0x10B0u);
+        return true;
+    } else {
+        return false;
+    }
+}
+
+uint32_t UART_SrcFreq(void) {
+    uint32_t freq;
+    // To make it simple, we assume default PLL and divider settings, and the
+    // only variable from application is use PLL3 source or OSC source.
+    if (CLOCK_GetMux(kCLOCK_UartMux) == 0) { // PLL3 div6 80M
+        freq = (CLOCK_GetPllFreq(kCLOCK_PllUsb1) / 6U) / (CLOCK_GetDiv(kCLOCK_UartDiv) + 1U);
+    } else {
+        freq = CLOCK_GetOscFreq() / (CLOCK_GetDiv(kCLOCK_UartDiv) + 1U);
+    }
+    return freq;
+}
+
+void LPUART_UserCallback(LPUART_Type *base, lpuart_handle_t *handle, status_t status, void *userData) {
+    machine_uart_obj_t *self = userData;
+    if (kStatus_LPUART_TxIdle == status) {
+        self->tx_status = kStatus_LPUART_TxIdle;
+    }
+
+    if (kStatus_LPUART_RxRingBufferOverrun == status) {
+        ; // Ringbuffer full, deassert RTS if flow control is enabled
+    }
+}
+
+STATIC void machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "UART(%u, baudrate=%u, bits=%u, parity=%s, stop=%u, "
+        "rxbuf=%d, txbuf=%d, timeout=%u, timeout_char=%u, invert=%s)",
+        self->id, self->config.baudRate_Bps, 8 - self->config.dataBitsCount,
+        _parity_name[self->config.parityMode], self->config.stopBitCount + 1,
+        self->handle.rxRingBufferSize, self->txbuf_len, self->timeout, self->timeout_char,
+        _invert_name[self->invert]);
+}
+
+STATIC mp_obj_t machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_baudrate, ARG_bits, ARG_parity, ARG_stop,
+           ARG_timeout, ARG_timeout_char, ARG_invert, ARG_rxbuf, ARG_txbuf};
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_bits, MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_parity, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_INT(-1)} },
+        { MP_QSTR_stop, MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_timeout_char, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_invert, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_rxbuf, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_txbuf, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+    };
+
+    // Parse args
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // Set baudrate if configured.
+    if (args[ARG_baudrate].u_int > 0) {
+        self->config.baudRate_Bps = args[ARG_baudrate].u_int;
+    }
+
+    // Set bits if configured.
+    if (args[ARG_bits].u_int > 0) {
+        self->config.dataBitsCount = 8 - args[ARG_bits].u_int;
+    }
+
+    // Set parity if configured.
+    if (args[ARG_parity].u_obj != MP_OBJ_NEW_SMALL_INT(-1)) {
+        if (args[ARG_parity].u_obj == mp_const_none) {
+            self->config.parityMode = kLPUART_ParityDisabled;
+        } else if (mp_obj_get_int(args[ARG_parity].u_obj) & 1) {
+            self->config.parityMode = kLPUART_ParityOdd;
+        } else {
+            self->config.parityMode = kLPUART_ParityEven;
+        }
+    }
+
+    // Set stop bits if configured.
+    if (args[ARG_stop].u_int > 0) {
+        self->config.stopBitCount = args[ARG_stop].u_int - 1;
+    }
+
+    // Set timeout if configured.
+    if (args[ARG_timeout].u_int >= 0) {
+        self->timeout = args[ARG_timeout].u_int;
+    }
+
+    // Set timeout_char if configured.
+    if (args[ARG_timeout_char].u_int >= 0) {
+        self->timeout_char = args[ARG_timeout_char].u_int;
+    }
+
+    // Set line inversion if configured.
+    if (args[ARG_invert].u_int >= 0) {
+        if (args[ARG_invert].u_int & ~UART_INVERT_MASK) {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad inversion mask"));
+        }
+        self->invert = args[ARG_invert].u_int;
+    }
+
+    self->tx_status = kStatus_LPUART_TxIdle;
+    self->config.enableTx = true;
+    self->config.enableRx = true;
+
+    // Set the RX buffer size if configured.
+    size_t rxbuf_len = DEFAULT_BUFFER_SIZE;
+    if (args[ARG_rxbuf].u_int > 0) {
+        rxbuf_len = args[ARG_rxbuf].u_int;
+        if (rxbuf_len < MIN_BUFFER_SIZE) {
+            rxbuf_len = MIN_BUFFER_SIZE;
+        } else if (rxbuf_len > MAX_BUFFER_SIZE) {
+            mp_raise_ValueError(MP_ERROR_TEXT("rxbuf too large"));
+        }
+    }
+
+    // Set the TX buffer size if configured.
+    size_t txbuf_len = DEFAULT_BUFFER_SIZE;
+    if (args[ARG_txbuf].u_int > 0) {
+        txbuf_len = args[ARG_txbuf].u_int;
+        if (txbuf_len < MIN_BUFFER_SIZE) {
+            txbuf_len = MIN_BUFFER_SIZE;
+        } else if (txbuf_len > MAX_BUFFER_SIZE) {
+            mp_raise_ValueError(MP_ERROR_TEXT("txbuf too large"));
+        }
+    }
+
+    // Initialise the UART peripheral if any arguments given, or it was not initialised previously.
+    if (n_args > 1 || self->new) {
+        self->new = false;
+        // may be obsolete
+        if (self->config.baudRate_Bps == 0) {
+            self->config.baudRate_Bps = DEFAULT_UART_BAUDRATE;
+        }
+
+        // Make sure timeout_char is at least as long as a whole character (13 bits to be safe).
+        uint32_t min_timeout_char = 13000 / self->config.baudRate_Bps + 1;
+        if (self->timeout_char < min_timeout_char) {
+            self->timeout_char = min_timeout_char;
+        }
+
+        LPUART_Init(self->lpuart, &self->config, UART_SrcFreq()); // ??
+        LPUART_TransferCreateHandle(self->lpuart, &self->handle,  LPUART_UserCallback, self);
+        uint8_t *buffer = m_new(uint8_t, rxbuf_len + 1);
+        LPUART_TransferStartRingBuffer(self->lpuart, &self->handle, buffer, rxbuf_len);
+        self->txbuf = m_new(uint8_t, txbuf_len); // Allocate the TX buffer.
+        self->txbuf_len = txbuf_len;
+
+        // The Uart supports inverting, but not the fsl API, so it has to coded directly
+        // And it has to be done after LPUART_Init.
+        if (self->invert & UART_INVERT_RX) {
+            LPUART_EnableRx(self->lpuart, false);
+            self->lpuart->STAT |= 1 << LPUART_STAT_RXINV_SHIFT;
+            LPUART_EnableRx(self->lpuart, true);
+        }
+        if (self->invert & UART_INVERT_TX) {
+            LPUART_EnableTx(self->lpuart, false);
+            self->lpuart->CTRL |= 1 << LPUART_CTRL_TXINV_SHIFT;
+            LPUART_EnableTx(self->lpuart, true);
+        }
+        // Send long break; drop that code for a shorter break duration
+        LPUART_EnableTx(self->lpuart, false);
+        self->lpuart->STAT |= 1 << LPUART_STAT_BRK13_SHIFT;
+        LPUART_EnableTx(self->lpuart, true);
+
+        // Allocate the TX ring buffer. Not used yet, but maybe later.
+
+        // ringbuf_alloc(&(self->write_buffer), txbuf_len + 1);
+        // MP_STATE_PORT(rp2_uart_tx_buffer[uart_id]) = self->write_buffer.buf;
+
+    }
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
+
+    // Get UART bus.
+    int uart_id = mp_obj_get_int(args[0]);
+    if (uart_id < 1 || uart_id > MICROPY_HW_UART_NUM) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("UART(%d) doesn't exist"), uart_id);
+    }
+
+    // Create the UART object and fill it with defaults.
+    uint8_t uart_hw_id = uart_index_table[uart_id];  // the hw uart number 1..n
+    machine_uart_obj_t *self = m_new_obj(machine_uart_obj_t);
+    self->base.type = &machine_uart_type;
+    self->id = uart_id;
+    self->lpuart = uart_base_ptr_table[uart_hw_id];
+    self->invert = false;
+    self->timeout = 1;
+    self->timeout_char = 1;
+    self->new = true;
+    LPUART_GetDefaultConfig(&self->config);
+
+    // Configure board-specific pin MUX based on the hardware device number.
+    lpuart_set_iomux(uart_hw_id);
+
+    mp_map_t kw_args;
+    mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+    return machine_uart_init_helper(self, n_args - 1, args + 1, &kw_args);
+}
+
+// uart.init(baud, [kwargs])
+STATIC mp_obj_t machine_uart_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    return machine_uart_init_helper(args[0], n_args - 1, args + 1, kw_args);
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(machine_uart_init_obj, 1, machine_uart_init);
+
+STATIC mp_obj_t machine_uart_any(mp_obj_t self_in) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    size_t count = LPUART_TransferGetRxRingBufferLength(self->lpuart, &self->handle);
+    return MP_OBJ_NEW_SMALL_INT(count);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_any_obj, machine_uart_any);
+
+STATIC mp_obj_t machine_uart_sendbreak(mp_obj_t self_in) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    self->lpuart->CTRL |= 1 << LPUART_CTRL_SBK_SHIFT; // Set SBK bit
+    self->lpuart->CTRL &= ~LPUART_CTRL_SBK_MASK; // Clear SBK bit
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_sendbreak_obj, machine_uart_sendbreak);
+
+STATIC const mp_rom_map_elem_t machine_uart_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_uart_init_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_any), MP_ROM_PTR(&machine_uart_any_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
+    { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_sendbreak), MP_ROM_PTR(&machine_uart_sendbreak_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_INV_TX), MP_ROM_INT(UART_INVERT_TX) },
+    { MP_ROM_QSTR(MP_QSTR_INV_RX), MP_ROM_INT(UART_INVERT_RX) },
+
+};
+STATIC MP_DEFINE_CONST_DICT(machine_uart_locals_dict, machine_uart_locals_dict_table);
+
+STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uint64_t t = ticks_us64() + (uint64_t)self->timeout * 1000;
+    uint64_t timeout_char_us = (uint64_t)self->timeout_char * 1000;
+    lpuart_transfer_t xfer;
+    uint8_t *dest = buf_in;
+    size_t avail;
+    size_t nget;
+
+    for (size_t received = 0; received < size;) {
+        // Wait for the first/next character.
+        while ((avail = LPUART_TransferGetRxRingBufferLength(self->lpuart, &self->handle)) <= 0) {
+            if (ticks_us64() > t) { // timed out
+                if (received <= 0) {
+                    *errcode = MP_EAGAIN;
+                    return MP_STREAM_ERROR;
+                } else {
+                    return received;
+                }
+            }
+            MICROPY_EVENT_POLL_HOOK
+        }
+        // Get as many bytes as possible to meet the need.
+        nget = avail < (size - received) ? avail : size - received;
+        xfer.data = dest + received;
+        xfer.dataSize = nget;
+        LPUART_TransferReceiveNonBlocking(self->lpuart, &self->handle, &xfer, NULL);
+        received += nget;
+        t = ticks_us64() + timeout_char_us;
+    }
+    return size;
+}
+
+STATIC mp_uint_t machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    lpuart_transfer_t xfer;
+    uint64_t t;
+    size_t remaining = size;
+    size_t offset = 0;
+    uint8_t fifo_size = FSL_FEATURE_LPUART_FIFO_SIZEn(0);
+
+    // First check if a previous transfer is still ongoing,
+    // then wait at least the number of remaining character times.
+    t = ticks_us64() + (uint64_t)(self->handle.txDataSize + fifo_size) * (13000000 / self->config.baudRate_Bps + 1000);
+    while (self->tx_status != kStatus_LPUART_TxIdle) {
+        if (ticks_us64() > t) { // timed out, hard error
+            *errcode = MP_ETIMEDOUT;
+            return MP_STREAM_ERROR;
+        }
+        MICROPY_EVENT_POLL_HOOK
+    }
+
+    // Check if the first part has to be sent semi-blocking.
+    if (size > self->txbuf_len) {
+        // Send the first block.
+        xfer.data = (uint8_t *)buf_in;
+        offset = xfer.dataSize = size - self->txbuf_len;
+        self->tx_status = kStatus_LPUART_TxBusy;
+        LPUART_TransferSendNonBlocking(self->lpuart, &self->handle, &xfer);
+
+        // Wait at least the number of character times for this chunk.
+        t = ticks_us64() + (uint64_t)xfer.dataSize * (13000000 / self->config.baudRate_Bps + 1000);
+        while (self->handle.txDataSize) {
+            // Wait for the first/next character to be sent.
+            if (ticks_us64() > t) { // timed out
+                if (self->handle.txDataSize >= size) {
+                    *errcode = MP_ETIMEDOUT;
+                    return MP_STREAM_ERROR;
+                } else {
+                    return size - self->handle.txDataSize;
+                }
+            }
+            MICROPY_EVENT_POLL_HOOK
+        }
+        remaining = self->txbuf_len;
+    } else {
+        // The data fits into the tx buffer.
+        offset = 0;
+        remaining = size;
+    }
+
+    // Send the remaining data without waiting for completion.
+    memcpy(self->txbuf, (uint8_t *)buf_in + offset, remaining);
+    xfer.data = self->txbuf;
+    xfer.dataSize = remaining;
+    self->tx_status = kStatus_LPUART_TxBusy;
+    LPUART_TransferSendNonBlocking(self->lpuart, &self->handle, &xfer);
+
+    return size;
+}
+
+STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) {
+    machine_uart_obj_t *self = self_in;
+    mp_uint_t ret;
+    if (request == MP_STREAM_POLL) {
+        uintptr_t flags = arg;
+        ret = 0;
+        if (flags & MP_STREAM_POLL_RD) {
+            uint32_t count;
+            count = LPUART_TransferGetRxRingBufferLength(self->lpuart, &self->handle);
+            if (count > 0) {
+                ret |= MP_STREAM_POLL_RD;
+            }
+        }
+        if ((flags & MP_STREAM_POLL_WR)) {
+            ret |= MP_STREAM_POLL_WR;
+        }
+    } else {
+        *errcode = MP_EINVAL;
+        ret = MP_STREAM_ERROR;
+    }
+    return ret;
+}
+
+STATIC const mp_stream_p_t uart_stream_p = {
+    .read = machine_uart_read,
+    .write = machine_uart_write,
+    .ioctl = machine_uart_ioctl,
+    .is_text = false,
+};
+
+const mp_obj_type_t machine_uart_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_UART,
+    .print = machine_uart_print,
+    .make_new = machine_uart_make_new,
+    .getiter = mp_identity_getiter,
+    .iternext = mp_stream_unbuffered_iter,
+    .protocol = &uart_stream_p,
+    .locals_dict = (mp_obj_dict_t *)&machine_uart_locals_dict,
+};
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index dfee91992d..09aa250c5f 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -65,6 +65,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_Signal),              MP_ROM_PTR(&machine_signal_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
+    { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
 
diff --git a/ports/mimxrt/modmachine.h b/ports/mimxrt/modmachine.h
index a7b577fa79..0b9e89cb23 100644
--- a/ports/mimxrt/modmachine.h
+++ b/ports/mimxrt/modmachine.h
@@ -32,6 +32,7 @@
 extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_timer_type;
 extern const mp_obj_type_t machine_rtc_type;
+extern const mp_obj_type_t machine_uart_type;
 
 void machine_adc_init(void);
 void machine_timer_init_PIT(void);

From 7417c6ac91e47798b9c9eba2e7cd8f3dc1bbcc57 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 5 Jun 2021 14:06:04 +0200
Subject: [PATCH 244/349] mimxrt/machine_pin: Implement pin.irq()
 functionality.

---
 ports/mimxrt/Makefile                         |   2 +
 .../boards/MIMXRT1010_EVK/mpconfigboard.h     |   2 +
 .../boards/MIMXRT1020_EVK/mpconfigboard.h     |   2 +
 .../boards/MIMXRT1050_EVK/mpconfigboard.h     |   2 +
 .../boards/MIMXRT1060_EVK/mpconfigboard.h     |   2 +
 .../boards/MIMXRT1064_EVK/mpconfigboard.h     |   2 +
 ports/mimxrt/boards/TEENSY40/mpconfigboard.h  |   2 +
 ports/mimxrt/boards/TEENSY41/mpconfigboard.h  |   2 +
 ports/mimxrt/machine_pin.c                    | 193 +++++++++++++++++-
 ports/mimxrt/main.c                           |   2 +
 ports/mimxrt/modmachine.h                     |   1 +
 ports/mimxrt/mpconfigport.h                   |   3 +-
 ports/mimxrt/pin.h                            |   7 +
 13 files changed, 220 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 ports/mimxrt/boards/TEENSY41/mpconfigboard.h

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 3af2a55472..638c6b124e 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -151,6 +151,7 @@ SRC_C = \
 	lib/mp-readline/readline.c \
 	lib/libc/string0.c \
 	lib/utils/gchelper_native.c \
+	lib/utils/mpirq.c \
 	lib/utils/printf.c \
 	lib/utils/pyexec.c \
 	lib/utils/stdout_helpers.c \
@@ -271,6 +272,7 @@ SRC_QSTR += \
 	modmimxrt.c \
 	moduos.c \
 	pin.c \
+	lib/utils/mpirq.c \
 	lib/utils/sys_stdio_mphal.c \
 	extmod/modonewire.c \
 	$(GEN_PINS_SRC) \
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
index 5a373a3ca6..fdaeac7eed 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
@@ -9,6 +9,8 @@
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1010_flexspi_nor_config.h"
 
+#define MICROPY_HW_NUM_PIN_IRQS (2 * 32)
+
 // Define mapping logical UART # to hardware UART #
 // LPUART1 on D0/D1 -> 1
 // LPUART3 on A0/D4 -> 3
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
index 5a595074ad..8238762a0b 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
@@ -10,6 +10,8 @@
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1020_flexspi_nor_config.h"
 
+#define MICROPY_HW_NUM_PIN_IRQS (3 * 32)
+
 // Define mapping logical UART # to hardware UART #
 // D3/D5   LPUART1  Not usable, Since D3 is blocked.
 // D0/D1   LPUART2 -> 1
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
index 51e0e2dc47..659c33263e 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
@@ -9,6 +9,8 @@
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1050_flexspi_nor_config.h"
 
+#define MICROPY_HW_NUM_PIN_IRQS (4 * 32 + 3)
+
 // Define mapping logical UART # to hardware UART #
 // LPUART3 on D0/D1  -> 1
 // LPUART2 on D7/D6  -> 2
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
index 02372a3c54..4fcc697e26 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
@@ -9,6 +9,8 @@
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1060_flexspi_nor_config.h"
 
+#define MICROPY_HW_NUM_PIN_IRQS (4 * 32 + 3)
+
 // Define mapping logical UART # to hardware UART #
 // LPUART3 on D0/D1  -> 1
 // LPUART2 on D7/D6  -> 2
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
index e8492c9224..7549899512 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
@@ -7,6 +7,8 @@
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1064_flexspi_nor_config.h"
 
+#define MICROPY_HW_NUM_PIN_IRQS (4 * 32 + 3)
+
 // Define mapping logical UART # to hardware UART #
 // LPUART3 on D0/D1  -> 1
 // LPUART2 on D7/D6  -> 2
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
index 6bbac0a976..316116b2b9 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
@@ -9,6 +9,8 @@
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "teensy40_flexspi_nor_config.h"
 
+#define MICROPY_HW_NUM_PIN_IRQS (4 * 32 + 3)
+
 // UART config: 7 UARTs at the pins for Teensy 4.0
 #define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
 #define MICROPY_HW_UART_INDEX   { 0, 6, 4, 2, 3, 8, 1, 7 }
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
old mode 100755
new mode 100644
index 1e07cb29ca..4bbb41f309
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
@@ -9,6 +9,8 @@
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "teensy41_flexspi_nor_config.h"
 
+#define MICROPY_HW_NUM_PIN_IRQS (4 * 32 + 3)
+
 // UART config: 8 UARTs at the pins for Teensy 4.1
 #define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
 #define MICROPY_HW_UART_INDEX   { 0, 6, 4, 2, 3, 8, 1, 7, 5 }
diff --git a/ports/mimxrt/machine_pin.c b/ports/mimxrt/machine_pin.c
index ebe95059bf..dc26cdfc12 100644
--- a/ports/mimxrt/machine_pin.c
+++ b/ports/mimxrt/machine_pin.c
@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2020 Philipp Ebensberger
+ * Copyright (c) 2021 Robert Hammelrath
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,8 +31,8 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
+#include "lib/utils/mpirq.h"
 #include "pin.h"
-#include "mphalport.h"
 
 // Local functions
 STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
@@ -68,6 +69,95 @@ const mp_obj_type_t machine_pin_board_pins_obj_type = {
     .locals_dict = (mp_obj_t)&machine_pin_board_pins_locals_dict,
 };
 
+STATIC const mp_irq_methods_t machine_pin_irq_methods;
+
+static GPIO_Type *gpiobases[] = GPIO_BASE_PTRS;
+STATIC const uint16_t GPIO_combined_low_irqs[] = GPIO_COMBINED_LOW_IRQS;
+STATIC const uint16_t GPIO_combined_high_irqs[] = GPIO_COMBINED_HIGH_IRQS;
+STATIC const uint16_t IRQ_mapping[] = {kGPIO_NoIntmode, kGPIO_IntRisingEdge, kGPIO_IntFallingEdge, kGPIO_IntRisingOrFallingEdge};
+#define GET_PIN_IRQ_INDEX(gpio_nr, pin) ((gpio_nr - 1) * 32 + pin)
+
+int GPIO_get_instance(GPIO_Type *gpio) {
+    int gpio_nr;
+    for (gpio_nr = 0; gpio_nr < ARRAY_SIZE(gpiobases); gpio_nr++) {
+        if (gpio == gpiobases[gpio_nr]) {
+            return gpio_nr;
+        }
+    }
+    return 0;
+}
+
+void call_handler(GPIO_Type *gpio, int gpio_nr, int pin) {
+    uint32_t mask = 1 << pin;
+    uint32_t isr = gpio->ISR & gpio->IMR;
+    for (int i = 0; i < 16; i++, pin++, mask <<= 1) {
+        // Did the ISR fire? Consider only the bits that are enabled.
+        if (isr & mask) {
+            gpio->ISR = mask; // clear the ISR flag
+            int index = GET_PIN_IRQ_INDEX(gpio_nr, pin);
+            machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_objects[index]);
+            if (irq != NULL) {
+                irq->flags = irq->trigger;
+                mp_irq_handler(&irq->base);
+            }
+        }
+    }
+}
+
+// 10 GPIO IRQ handlers, each covering 16 bits.
+
+void GPIO1_Combined_0_15_IRQHandler(void) {
+    call_handler(gpiobases[1], 1, 0);
+}
+
+void GPIO1_Combined_16_31_IRQHandler(void) {
+    call_handler(gpiobases[1], 1, 16);
+}
+
+void GPIO2_Combined_0_15_IRQHandler(void) {
+    call_handler(gpiobases[2], 2, 0);
+}
+
+void GPIO2_Combined_16_31_IRQHandler(void) {
+    call_handler(gpiobases[2], 2, 16);
+}
+
+void GPIO3_Combined_0_15_IRQHandler(void) {
+    call_handler(gpiobases[3], 3, 0);
+}
+
+void GPIO3_Combined_16_31_IRQHandler(void) {
+    call_handler(gpiobases[3], 3, 16);
+}
+
+void GPIO4_Combined_0_15_IRQHandler(void) {
+    call_handler(gpiobases[4], 4, 0);
+}
+
+void GPIO4_Combined_16_31_IRQHandler(void) {
+    call_handler(gpiobases[4], 4, 16);
+}
+
+void GPIO5_Combined_0_15_IRQHandler(void) {
+    call_handler(gpiobases[5], 5, 0);
+}
+
+void GPIO5_Combined_16_31_IRQHandler(void) {
+    call_handler(gpiobases[5], 5, 16);
+}
+
+// Deinit all pin IRQ handlers.
+void machine_pin_irq_deinit(void) {
+    for (int i = 0; i < ARRAY_SIZE(MP_STATE_PORT(machine_pin_irq_objects)); ++i) {
+        machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_objects[i]);
+        if (irq != NULL) {
+            machine_pin_obj_t *self = MP_OBJ_TO_PTR(irq->base.parent);
+            GPIO_PortDisableInterrupts(self->gpio, 1U << self->pin);
+            MP_STATE_PORT(machine_pin_irq_objects[i]) = NULL;
+        }
+    }
+}
+
 // Simplified mode setting used by the extmod modules
 void machine_pin_set_mode(const machine_pin_obj_t *self, uint8_t mode) {
     gpio_pin_config_t pin_config = {kGPIO_DigitalInput, 1, kGPIO_NoIntmode};
@@ -234,6 +324,69 @@ STATIC mp_obj_t machine_pin_init(size_t n_args, const mp_obj_t *args, mp_map_t *
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_init_obj, 1, machine_pin_init);
 
+// pin.irq(handler=None, trigger=IRQ_FALLING|IRQ_RISING, hard=False)
+STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_handler, ARG_trigger, ARG_hard };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_handler, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_trigger, MP_ARG_INT, {.u_int = 3} },
+        { MP_QSTR_hard, MP_ARG_BOOL, {.u_bool = false} },
+    };
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    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);
+
+    // Get the IRQ object.
+    uint32_t gpio_nr = GPIO_get_instance(self->gpio);
+    uint32_t index = GET_PIN_IRQ_INDEX(gpio_nr, self->pin);
+    if (index >= ARRAY_SIZE(MP_STATE_PORT(machine_pin_irq_objects))) {
+        mp_raise_ValueError(MP_ERROR_TEXT("IRQ not supported on given Pin"));
+    }
+    machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_objects[index]);
+
+    // Allocate the IRQ object if it doesn't already exist.
+    if (irq == NULL) {
+        irq = m_new_obj(machine_pin_irq_obj_t);
+        irq->base.base.type = &mp_irq_type;
+        irq->base.methods = (mp_irq_methods_t *)&machine_pin_irq_methods;
+        irq->base.parent = MP_OBJ_FROM_PTR(self);
+        irq->base.handler = mp_const_none;
+        irq->base.ishard = false;
+        MP_STATE_PORT(machine_pin_irq_objects[index]) = irq;
+    }
+
+    if (n_args > 1 || kw_args->used != 0) {
+        // Configure IRQ.
+        uint32_t irq_num = self->pin < 16 ? GPIO_combined_low_irqs[gpio_nr] : GPIO_combined_high_irqs[gpio_nr];
+
+        // Disable all IRQs from the affected source while data is updated.
+        DisableIRQ(irq_num);
+        GPIO_PortDisableInterrupts(self->gpio, 1U << self->pin);
+
+        // Update IRQ data.
+        irq->base.handler = args[ARG_handler].u_obj;
+        irq->base.ishard = args[ARG_hard].u_bool;
+        irq->flags = 0;
+        if (args[ARG_trigger].u_int >= ARRAY_SIZE(IRQ_mapping)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("IRQ mode not supported"));
+        }
+        irq->trigger = IRQ_mapping[args[ARG_trigger].u_int];
+
+        // Enable IRQ if a handler is given.
+        if (args[ARG_handler].u_obj != mp_const_none) {
+            // Set the pin mode
+            GPIO_PinSetInterruptConfig(self->gpio, self->pin, irq->trigger);
+            // Enable the specific Pin interrupt
+            GPIO_PortEnableInterrupts(self->gpio, 1U << self->pin);
+        }
+        // Enable LEVEL1 interrupt again
+        EnableIRQ(irq_num);
+    }
+
+    return MP_OBJ_FROM_PTR(irq);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_irq_obj, 1, machine_pin_irq);
+
 STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     // instance methods
     { MP_ROM_QSTR(MP_QSTR_off),     MP_ROM_PTR(&machine_pin_off_obj) },
@@ -242,6 +395,7 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_high),    MP_ROM_PTR(&machine_pin_on_obj) },
     { MP_ROM_QSTR(MP_QSTR_value),   MP_ROM_PTR(&machine_pin_value_obj) },
     { MP_ROM_QSTR(MP_QSTR_init),    MP_ROM_PTR(&machine_pin_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_irq),     MP_ROM_PTR(&machine_pin_irq_obj) },
     // class attributes
     { MP_ROM_QSTR(MP_QSTR_board),   MP_ROM_PTR(&machine_pin_board_pins_obj_type) },
     { MP_ROM_QSTR(MP_QSTR_cpu),     MP_ROM_PTR(&machine_pin_cpu_pins_obj_type) },
@@ -265,6 +419,9 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_POWER_5),    MP_ROM_INT(PIN_DRIVE_POWER_5) }, // R0/6
     { MP_ROM_QSTR(MP_QSTR_POWER_6),    MP_ROM_INT(PIN_DRIVE_POWER_6) }, // R0/7
 
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RISING), MP_ROM_INT(1) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_FALLING), MP_ROM_INT(2) },
+
 };
 STATIC MP_DEFINE_CONST_DICT(machine_pin_locals_dict, machine_pin_locals_dict_table);
 
@@ -285,3 +442,37 @@ const mp_obj_type_t machine_pin_af_type = {
     .make_new = mp_pin_make_new,
     .locals_dict = (mp_obj_dict_t *)&machine_pin_locals_dict,
 };
+
+STATIC mp_uint_t machine_pin_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uint32_t gpio_nr = GPIO_get_instance(self->gpio);
+    machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_objects[GET_PIN_IRQ_INDEX(gpio_nr, self->pin)]);
+    uint32_t irq_num = self->pin < 16 ? GPIO_combined_low_irqs[gpio_nr] : GPIO_combined_high_irqs[gpio_nr];
+    DisableIRQ(irq_num);
+    irq->flags = 0;
+    irq->trigger = new_trigger;
+    // Configure the interrupt.
+    GPIO_PinSetInterruptConfig(self->gpio, self->pin, irq->trigger);
+    // Enable LEVEL1 interrupt.
+    EnableIRQ(irq_num);
+    // Enable the specific pin interrupt.
+    GPIO_PortEnableInterrupts(self->gpio, 1U << self->pin);
+    return 0;
+}
+
+STATIC mp_uint_t machine_pin_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uint32_t gpio_nr = GPIO_get_instance(self->gpio);
+    machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_objects[GET_PIN_IRQ_INDEX(gpio_nr, self->pin)]);
+    if (info_type == MP_IRQ_INFO_FLAGS) {
+        return irq->flags;
+    } else if (info_type == MP_IRQ_INFO_TRIGGERS) {
+        return irq->trigger;
+    }
+    return 0;
+}
+
+STATIC const mp_irq_methods_t machine_pin_irq_methods = {
+    .trigger = machine_pin_irq_trigger,
+    .info = machine_pin_irq_info,
+};
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index 74c8a7014b..bd1c3e8884 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -36,6 +36,7 @@
 #include "ticks.h"
 #include "tusb.h"
 #include "led.h"
+#include "modmachine.h"
 
 extern uint8_t _sstack, _estack, _gc_heap_start, _gc_heap_end;
 
@@ -90,6 +91,7 @@ int main(void) {
 
     soft_reset_exit:
         mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n");
+        machine_pin_irq_deinit();
         gc_sweep_all();
         mp_deinit();
     }
diff --git a/ports/mimxrt/modmachine.h b/ports/mimxrt/modmachine.h
index 0b9e89cb23..5ac8655764 100644
--- a/ports/mimxrt/modmachine.h
+++ b/ports/mimxrt/modmachine.h
@@ -35,6 +35,7 @@ extern const mp_obj_type_t machine_rtc_type;
 extern const mp_obj_type_t machine_uart_type;
 
 void machine_adc_init(void);
+void machine_pin_irq_deinit(void);
 void machine_timer_init_PIT(void);
 
 #endif // MICROPY_INCLUDED_MIMXRT_MODMACHINE_H
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 0af87264a5..49953bb57e 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -167,7 +167,8 @@ extern const struct _mp_obj_module_t mp_module_utime;
 
 #define MICROPY_PORT_ROOT_POINTERS \
     const char *readline_hist[8]; \
-    struct _machine_timer_obj_t *timer_table[MICROPY_HW_PIT_NUM_CHANNELS];
+    struct _machine_timer_obj_t *timer_table[MICROPY_HW_PIT_NUM_CHANNELS]; \
+    void *machine_pin_irq_objects[MICROPY_HW_NUM_PIN_IRQS]; \
 
 #define MP_STATE_PORT MP_STATE_VM
 
diff --git a/ports/mimxrt/pin.h b/ports/mimxrt/pin.h
index 7a05d2d64d..ace4d18436 100644
--- a/ports/mimxrt/pin.h
+++ b/ports/mimxrt/pin.h
@@ -29,6 +29,7 @@
 
 #include <stdint.h>
 #include "py/obj.h"
+#include "lib/utils/mpirq.h"
 #include "fsl_gpio.h"
 
 // ------------------------------------------------------------------------------------------------------------------ //
@@ -118,6 +119,12 @@ typedef struct {
     const machine_pin_adc_obj_t *adc_list; // pointer to list with ADC options
 } machine_pin_obj_t;
 
+typedef struct _machine_pin_irq_obj_t {
+    mp_irq_obj_t base;
+    uint32_t flags;
+    uint32_t trigger;
+} machine_pin_irq_obj_t;
+
 // ------------------------------------------------------------------------------------------------------------------ //
 
 extern const mp_obj_type_t machine_pin_type;

From 8edc3aacdda7b65ad6dd6ad4af0bb1a570ef9f47 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 13 Jun 2021 16:42:19 +0200
Subject: [PATCH 245/349] mimxrt/modutime: Extend the time module.

Methods added:
- time.time()
- time.time_ns()
- time.gmtime()
- time.localtime()
- time.mktime()

The rp2 port was uses as the template for the change.
---
 ports/mimxrt/Makefile      |  1 +
 ports/mimxrt/machine_rtc.c |  2 +-
 ports/mimxrt/modutime.c    | 81 ++++++++++++++++++++++++++++++++++++++
 ports/mimxrt/mphalport.c   |  9 +++++
 ports/mimxrt/mphalport.h   |  4 --
 5 files changed, 92 insertions(+), 5 deletions(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 638c6b124e..3b530a9700 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -150,6 +150,7 @@ SRC_C = \
 	hal/flexspi_nor_flash.c \
 	lib/mp-readline/readline.c \
 	lib/libc/string0.c \
+	lib/timeutils/timeutils.c \
 	lib/utils/gchelper_native.c \
 	lib/utils/mpirq.c \
 	lib/utils/printf.c \
diff --git a/ports/mimxrt/machine_rtc.c b/ports/mimxrt/machine_rtc.c
index 4de3419c1c..76f414925e 100644
--- a/ports/mimxrt/machine_rtc.c
+++ b/ports/mimxrt/machine_rtc.c
@@ -42,7 +42,7 @@ uint32_t us_offset = 0;
 // Calculate the weekday from the date.
 // The result is zero based with 0 = Monday.
 // by Michael Keith and Tom Craver, 1990.
-static int calc_weekday(int y, int m, int d) {
+int calc_weekday(int y, int m, int d) {
     return ((d += m < 3 ? y-- : y - 2, 23 * m / 9 + d + 4 + y / 4 - y / 100 + y / 400) + 6) % 7;
 }
 
diff --git a/ports/mimxrt/modutime.c b/ports/mimxrt/modutime.c
index bbdbda44e2..a47bc073f2 100644
--- a/ports/mimxrt/modutime.c
+++ b/ports/mimxrt/modutime.c
@@ -25,11 +25,92 @@
  * THE SOFTWARE.
  */
 
+#include "py/runtime.h"
+#include "lib/timeutils/timeutils.h"
 #include "extmod/utime_mphal.h"
+#include "fsl_snvs_lp.h"
+
+extern int calc_weekday(int y, int m, int d);
+
+// localtime([secs])
+// Convert a time expressed in seconds since the Epoch into an 8-tuple which
+// contains: (year, month, mday, hour, minute, second, weekday, yearday)
+// If secs is not provided or None, then the current time from the RTC is used.
+STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
+    if (n_args == 0 || args[0] == mp_const_none) {
+        // Get current date and time.
+        snvs_lp_srtc_datetime_t t;
+        SNVS_LP_SRTC_GetDatetime(SNVS, &t);
+        mp_obj_t tuple[8] = {
+            mp_obj_new_int(t.year),
+            mp_obj_new_int(t.month),
+            mp_obj_new_int(t.day),
+            mp_obj_new_int(t.hour),
+            mp_obj_new_int(t.minute),
+            mp_obj_new_int(t.second),
+            mp_obj_new_int(calc_weekday(t.year, t.month, t.day)),
+            mp_obj_new_int(timeutils_year_day(t.year, t.month, t.day)),
+        };
+        return mp_obj_new_tuple(8, tuple);
+    } else {
+        // Convert given seconds to tuple.
+        mp_int_t seconds = mp_obj_get_int(args[0]);
+        timeutils_struct_time_t tm;
+        timeutils_seconds_since_epoch_to_struct_time(seconds, &tm);
+        mp_obj_t tuple[8] = {
+            tuple[0] = mp_obj_new_int(tm.tm_year),
+            tuple[1] = mp_obj_new_int(tm.tm_mon),
+            tuple[2] = mp_obj_new_int(tm.tm_mday),
+            tuple[3] = mp_obj_new_int(tm.tm_hour),
+            tuple[4] = mp_obj_new_int(tm.tm_min),
+            tuple[5] = mp_obj_new_int(tm.tm_sec),
+            tuple[6] = mp_obj_new_int(tm.tm_wday),
+            tuple[7] = mp_obj_new_int(tm.tm_yday),
+        };
+        return mp_obj_new_tuple(8, tuple);
+    }
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(time_localtime_obj, 0, 1, time_localtime);
+
+// mktime()
+// This is inverse function of localtime. It's argument is a full 8-tuple
+// which expresses a time as per localtime. It returns an integer which is
+// the number of seconds since the Epoch.
+STATIC mp_obj_t time_mktime(mp_obj_t tuple) {
+    size_t len;
+    mp_obj_t *elem;
+    mp_obj_get_array(tuple, &len, &elem);
+
+    // localtime generates a tuple of len 8. CPython uses 9, so we accept both.
+    if (len < 8 || len > 9) {
+        mp_raise_TypeError(MP_ERROR_TEXT("mktime needs a tuple of length 8 or 9"));
+    }
+
+    return mp_obj_new_int_from_uint(timeutils_mktime(mp_obj_get_int(elem[0]),
+        mp_obj_get_int(elem[1]), mp_obj_get_int(elem[2]), mp_obj_get_int(elem[3]),
+        mp_obj_get_int(elem[4]), mp_obj_get_int(elem[5])));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(time_mktime_obj, time_mktime);
+
+// time()
+// Return the number of seconds since the Epoch.
+STATIC mp_obj_t time_time(void) {
+    snvs_lp_srtc_datetime_t t;
+    SNVS_LP_SRTC_GetDatetime(SNVS, &t);
+    return mp_obj_new_int_from_ull(timeutils_seconds_since_epoch(t.year, t.month, t.day, t.hour, t.minute, t.second));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);
 
 STATIC const mp_rom_map_elem_t time_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_utime) },
 
+    { MP_ROM_QSTR(MP_QSTR_gmtime), MP_ROM_PTR(&time_localtime_obj) },
+    { MP_ROM_QSTR(MP_QSTR_localtime), MP_ROM_PTR(&time_localtime_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mktime), MP_ROM_PTR(&time_mktime_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&time_time_obj) },
+    { MP_ROM_QSTR(MP_QSTR_time_ns), MP_ROM_PTR(&mp_utime_time_ns_obj) },
+
     { MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&mp_utime_sleep_obj) },
     { MP_ROM_QSTR(MP_QSTR_sleep_ms), MP_ROM_PTR(&mp_utime_sleep_ms_obj) },
     { MP_ROM_QSTR(MP_QSTR_sleep_us), MP_ROM_PTR(&mp_utime_sleep_us_obj) },
diff --git a/ports/mimxrt/mphalport.c b/ports/mimxrt/mphalport.c
index faecafbbcd..942deae5b7 100644
--- a/ports/mimxrt/mphalport.c
+++ b/ports/mimxrt/mphalport.c
@@ -28,8 +28,10 @@
 #include "py/runtime.h"
 #include "py/stream.h"
 #include "py/mphal.h"
+#include "lib/timeutils/timeutils.h"
 #include "ticks.h"
 #include "tusb.h"
+#include "fsl_snvs_lp.h"
 
 #include CPU_HEADER_H
 
@@ -94,3 +96,10 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
     //     USARTx->USART.DATA.bit.DATA = *str++;
     // }
 }
+
+uint64_t mp_hal_time_ns(void) {
+    snvs_lp_srtc_datetime_t t;
+    SNVS_LP_SRTC_GetDatetime(SNVS, &t);
+    uint64_t s = timeutils_seconds_since_epoch(t.year, t.month, t.day, t.hour, t.minute, t.second);
+    return s * 1000000000ULL;
+}
diff --git a/ports/mimxrt/mphalport.h b/ports/mimxrt/mphalport.h
index 0db11836f8..94f43001d0 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -76,9 +76,5 @@ static inline mp_uint_t mp_hal_ticks_cpu(void) {
     return 0;
 }
 
-static inline uint64_t mp_hal_time_ns(void) {
-    // TODO: Implement this function.
-    return 0UL;
-}
 
 #endif // MICROPY_INCLUDED_MIMXRT_MPHALPORT_H

From f97e0ec631835ef59f2b6a54575154893e8b0aa3 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Tue, 15 Jun 2021 11:39:40 -0400
Subject: [PATCH 246/349] fix ulab commit

---
 extmod/ulab                                   |  2 +-
 lib/utils/linked_list.h                       | 36 -------------------
 locale/circuitpython.pot                      | 17 ++++-----
 .../stm/boards/espruino_pico/mpconfigboard.mk |  1 -
 supervisor/supervisor.mk                      |  2 +-
 5 files changed, 11 insertions(+), 47 deletions(-)
 delete mode 100644 lib/utils/linked_list.h

diff --git a/extmod/ulab b/extmod/ulab
index e3bf07cabb..161a728848 160000
--- a/extmod/ulab
+++ b/extmod/ulab
@@ -1 +1 @@
-Subproject commit e3bf07cabb728ecfa2b78ea5e468179f94dbf933
+Subproject commit 161a7288482200c884623ed3cb59dd91f53be91a
diff --git a/lib/utils/linked_list.h b/lib/utils/linked_list.h
deleted file mode 100644
index cd5ea0fc7c..0000000000
--- a/lib/utils/linked_list.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2021 Dan Halbert 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_LINKED_LIST_H
-#define MICROPY_INCLUDED_LINKED_LIST_H
-
-#define LINKED_LIST_PREPEND(LIST_HEAD, OBJECT, NEXT_FIELD) \
-    OBJECT->NEXT_FIELD = LIST_HEAD; \
-    LIST_HEAD = OBJECT;
-
-#define LINKED_LIST_DELETE(LIST_HEAD, OBJECT,
-
-#endif // MICROPY_INCLUDED_LINKED_LIST_H
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 906c51b698..d2c2dbe8b4 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -3058,6 +3058,10 @@ msgstr ""
 msgid "first argument to super() must be type"
 msgstr ""
 
+#: extmod/ulab/code/scipy/linalg/linalg.c
+msgid "first two arguments must be ndarrays"
+msgstr ""
+
 #: extmod/ulab/code/ndarray.c
 msgid "flattening order must be either 'C', or 'F'"
 msgstr ""
@@ -3237,10 +3241,11 @@ msgid "input matrix is asymmetric"
 msgstr ""
 
 #: extmod/ulab/code/numpy/linalg/linalg.c
+#: extmod/ulab/code/scipy/linalg/linalg.c
 msgid "input matrix is singular"
 msgstr ""
 
-#: extmod/ulab/code/user/user.c
+#: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c
 msgid "input must be a dense ndarray"
 msgstr ""
 
@@ -3281,7 +3286,7 @@ msgid "integer required"
 msgstr ""
 
 #: extmod/ulab/code/numpy/approx/approx.c
-msgid "interp is defined for 1D arrays of equal length"
+msgid "interp is defined for 1D iterables of equal length"
 msgstr ""
 
 #: shared-bindings/_bleio/Adapter.c
@@ -4137,11 +4142,11 @@ msgid "too many values to unpack (expected %d)"
 msgstr ""
 
 #: extmod/ulab/code/numpy/approx/approx.c
-msgid "trapz is defined for 1D arrays"
+msgid "trapz is defined for 1D arrays of equal length"
 msgstr ""
 
 #: extmod/ulab/code/numpy/approx/approx.c
-msgid "trapz is defined for 1D arrays of equal length"
+msgid "trapz is defined for 1D iterables"
 msgstr ""
 
 #: py/obj.c
@@ -4324,10 +4329,6 @@ msgstr ""
 msgid "wrong number of values to unpack"
 msgstr ""
 
-#: extmod/ulab/code/ndarray.c
-msgid "wrong operand type"
-msgstr ""
-
 #: extmod/ulab/code/numpy/vector/vector.c
 msgid "wrong output type"
 msgstr ""
diff --git a/ports/stm/boards/espruino_pico/mpconfigboard.mk b/ports/stm/boards/espruino_pico/mpconfigboard.mk
index 3f3e81d553..bc415f07ec 100644
--- a/ports/stm/boards/espruino_pico/mpconfigboard.mk
+++ b/ports/stm/boards/espruino_pico/mpconfigboard.mk
@@ -22,7 +22,6 @@ CIRCUITPY_AUDIOPWMIO = 0
 CIRCUITPY_BUSDEVICE = 0
 CIRCUITPY_BITMAPTOOLS = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
-CIRCUITPY_KEYPAD = 0
 CIRCUITPY_MIDI = 0
 CIRCUITPY_MSGPACK = 0
 CIRCUITPY_ULAB = 0
diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk
index d32436cdb0..d36b975c21 100644
--- a/supervisor/supervisor.mk
+++ b/supervisor/supervisor.mk
@@ -8,7 +8,7 @@ SRC_SUPERVISOR = \
 	supervisor/shared/filesystem.c \
 	supervisor/shared/flash.c \
 	supervisor/shared/lock.c \
-        supervisor/shared/memory.c \
+	supervisor/shared/memory.c \
 	supervisor/shared/micropython.c \
 	supervisor/shared/safe_mode.c \
 	supervisor/shared/stack.c \

From 4655a71793eee46d567c7be63646ddf27d7d54eb Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Tue, 15 Jun 2021 14:11:04 -0400
Subject: [PATCH 247/349] Turn off keypad on some builds to avoid overflow

---
 .../boards/circuitplayground_express_crickit/mpconfigboard.mk   | 1 +
 .../boards/circuitplayground_express_displayio/mpconfigboard.mk | 1 +
 ports/atmel-samd/boards/stringcar_m0_express/mpconfigboard.mk   | 2 ++
 ports/nrf/boards/pca10100/mpconfigboard.mk                      | 1 +
 ports/stm/boards/espruino_pico/mpconfigboard.mk                 | 1 +
 ports/stm/boards/pyb_nano_v2/mpconfigboard.mk                   | 1 +
 ports/stm/boards/stm32f411ve_discovery/mpconfigboard.mk         | 1 +
 7 files changed, 8 insertions(+)

diff --git a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk
index 902e9594e3..fb65d7cd0a 100644
--- a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk
@@ -14,6 +14,7 @@ LONGINT_IMPL = NONE
 
 CIRCUITPY_BUSDEVICE = 1
 CIRCUITPY_DISPLAYIO = 0
+CIRCUITPY_KEYPAD = 0
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground
diff --git a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk
index 68fb51ab00..3a97c39830 100644
--- a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk
@@ -11,6 +11,7 @@ EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"
 
 # Turn off features and optimizations for displayio build to make room for additional frozen libs.
 LONGINT_IMPL = NONE
+CIRCUITPY_KEYPAD = 0
 CIRCUITPY_PIXELBUF = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 0
diff --git a/ports/atmel-samd/boards/stringcar_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/stringcar_m0_express/mpconfigboard.mk
index 53aeda3c50..a863248ca7 100644
--- a/ports/atmel-samd/boards/stringcar_m0_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/stringcar_m0_express/mpconfigboard.mk
@@ -11,4 +11,6 @@ SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = AT25SF161
 LONGINT_IMPL = MPZ
 
+CIRCUITPY_KEYPAD = 0
+
 CIRCUITPY_BITBANG_APA102 = 1
diff --git a/ports/nrf/boards/pca10100/mpconfigboard.mk b/ports/nrf/boards/pca10100/mpconfigboard.mk
index 9fae5ccc4d..3a7407861b 100644
--- a/ports/nrf/boards/pca10100/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10100/mpconfigboard.mk
@@ -18,6 +18,7 @@ CIRCUITPY_FRAMEBUFFERIO = 0
 CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_JSON = 0
+CIRCUITPY_KEYPAD = 0
 CIRCUITPY_MSGPACK = 0
 CIRCUITPY_NEOPIXEL_WRITE = 0
 CIRCUITPY_NVM = 0
diff --git a/ports/stm/boards/espruino_pico/mpconfigboard.mk b/ports/stm/boards/espruino_pico/mpconfigboard.mk
index bc415f07ec..3f3e81d553 100644
--- a/ports/stm/boards/espruino_pico/mpconfigboard.mk
+++ b/ports/stm/boards/espruino_pico/mpconfigboard.mk
@@ -22,6 +22,7 @@ CIRCUITPY_AUDIOPWMIO = 0
 CIRCUITPY_BUSDEVICE = 0
 CIRCUITPY_BITMAPTOOLS = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
+CIRCUITPY_KEYPAD = 0
 CIRCUITPY_MIDI = 0
 CIRCUITPY_MSGPACK = 0
 CIRCUITPY_ULAB = 0
diff --git a/ports/stm/boards/pyb_nano_v2/mpconfigboard.mk b/ports/stm/boards/pyb_nano_v2/mpconfigboard.mk
index 99af948d7b..d1a627569c 100644
--- a/ports/stm/boards/pyb_nano_v2/mpconfigboard.mk
+++ b/ports/stm/boards/pyb_nano_v2/mpconfigboard.mk
@@ -16,5 +16,6 @@ LD_FILE = boards/STM32F411_fs.ld
 # Too big for the flash
 CIRCUITPY_AUDIOCORE = 0
 CIRCUITPY_AUDIOPWMIO = 0
+CIRCUITPY_KEYPAD = 0
 CIRCUITPY_MIDI = 0
 CIRCUITPY_MSGPACK = 0
diff --git a/ports/stm/boards/stm32f411ve_discovery/mpconfigboard.mk b/ports/stm/boards/stm32f411ve_discovery/mpconfigboard.mk
index 04c8cc2d45..c8dc80a70c 100644
--- a/ports/stm/boards/stm32f411ve_discovery/mpconfigboard.mk
+++ b/ports/stm/boards/stm32f411ve_discovery/mpconfigboard.mk
@@ -15,5 +15,6 @@ LD_FILE = boards/STM32F411_fs.ld
 # Too big for the flash
 CIRCUITPY_AUDIOCORE = 0
 CIRCUITPY_AUDIOPWMIO = 0
+CIRCUITPY_KEYPAD = 0
 CIRCUITPY_MIDI = 0
 CIRCUITPY_MSGPACK = 0

From 514bf1a1911ac9173a00820b7e09dfb387e6b941 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 14 Jun 2021 22:32:51 +1000
Subject: [PATCH 248/349] extmod/uasyncio: Fix race with cancelled task waiting
 on finished task.

This commit fixes a problem with a race between cancellation of task A and
completion of task B, when A waits on B.  If task B completes just before
task A is cancelled then the cancellation of A does not work.  Instead,
the CancelledError meant to cancel A gets passed through to B (that's
expected behaviour) but B handles it as a "Task exception wasn't retrieved"
scenario, printing out such a message (this is because finished tasks point
their "coro" attribute to themselves to indicate they are done, and
implement the throw() method, but that method inadvertently catches the
CancelledError).  The correct behaviour is for B to bounce that
CancelledError back out.

This bug is mainly seen when wait_for() is used, and in that context the
symptoms are:
- occurs when using wait_for(T, S), if the task T being waited on finishes
  at exactly the same time as the wait-for timeout S expires
- task T will have run to completion
- the "Task exception wasn't retrieved message" is printed with
  "<class 'CancelledError'>" as the error (ie no traceback)
- the wait_for(T, S) call never returns (it's never put back on the
  uasyncio run queue) and all tasks waiting on this are blocked forever
  from running
- uasyncio otherwise continues to function and other tasks continue to be
  scheduled as normal

The fix here reworks the "waiting" attribute of Task to be called "state"
and uses it to indicate whether a task is: running and not awaited on,
running and awaited on, finished and not awaited on, or finished and
awaited on.  This means the task does not need to point "coro" to itself to
indicate finished, and also allows removal of the throw() method.

A benefit of this is that "Task exception wasn't retrieved" messages can go
back to being able to print the name of the coroutine function.

Fixes issue #7386.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/moduasyncio.c                          | 69 ++++++-------------
 extmod/uasyncio/core.py                       | 46 ++++++++-----
 extmod/uasyncio/task.py                       | 31 +++------
 .../uasyncio_cancel_wait_on_finished.py       | 41 +++++++++++
 .../uasyncio_cancel_wait_on_finished.py.exp   |  7 ++
 5 files changed, 111 insertions(+), 83 deletions(-)
 create mode 100644 tests/extmod/uasyncio_cancel_wait_on_finished.py
 create mode 100644 tests/extmod/uasyncio_cancel_wait_on_finished.py.exp

diff --git a/extmod/moduasyncio.c b/extmod/moduasyncio.c
index fe0f748cac..9717e38567 100644
--- a/extmod/moduasyncio.c
+++ b/extmod/moduasyncio.c
@@ -31,12 +31,19 @@
 
 #if MICROPY_PY_UASYNCIO
 
+#define TASK_STATE_RUNNING_NOT_WAITED_ON (mp_const_true)
+#define TASK_STATE_DONE_NOT_WAITED_ON (mp_const_none)
+#define TASK_STATE_DONE_WAS_WAITED_ON (mp_const_false)
+
+#define TASK_IS_DONE(task) ( \
+    (task)->state == TASK_STATE_DONE_NOT_WAITED_ON \
+    || (task)->state == TASK_STATE_DONE_WAS_WAITED_ON)
+
 typedef struct _mp_obj_task_t {
     mp_pairheap_t pairheap;
     mp_obj_t coro;
     mp_obj_t data;
-    mp_obj_t waiting;
-
+    mp_obj_t state;
     mp_obj_t ph_key;
 } mp_obj_task_t;
 
@@ -146,9 +153,6 @@ STATIC const mp_obj_type_t task_queue_type = {
 /******************************************************************************/
 // Task class
 
-// For efficiency, the task object is stored to the coro entry when the task is done.
-#define TASK_IS_DONE(task) ((task)->coro == MP_OBJ_FROM_PTR(task))
-
 // This is the core uasyncio context with cur_task, _task_queue and CancelledError.
 STATIC mp_obj_t uasyncio_context = MP_OBJ_NULL;
 
@@ -159,7 +163,7 @@ STATIC mp_obj_t task_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     mp_pairheap_init_node(task_lt, &self->pairheap);
     self->coro = args[0];
     self->data = mp_const_none;
-    self->waiting = mp_const_none;
+    self->state = TASK_STATE_RUNNING_NOT_WAITED_ON;
     self->ph_key = MP_OBJ_NEW_SMALL_INT(0);
     if (n_args == 2) {
         uasyncio_context = args[1];
@@ -218,24 +222,6 @@ STATIC mp_obj_t task_cancel(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(task_cancel_obj, task_cancel);
 
-STATIC mp_obj_t task_throw(mp_obj_t self_in, mp_obj_t value_in) {
-    // This task raised an exception which was uncaught; handle that now.
-    mp_obj_task_t *self = MP_OBJ_TO_PTR(self_in);
-    // Set the data because it was cleared by the main scheduling loop.
-    self->data = value_in;
-    if (self->waiting == mp_const_none) {
-        // Nothing await'ed on the task so call the exception handler.
-        mp_obj_t _exc_context = mp_obj_dict_get(uasyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR__exc_context));
-        mp_obj_dict_store(_exc_context, MP_OBJ_NEW_QSTR(MP_QSTR_exception), value_in);
-        mp_obj_dict_store(_exc_context, MP_OBJ_NEW_QSTR(MP_QSTR_future), self_in);
-        mp_obj_t Loop = mp_obj_dict_get(uasyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR_Loop));
-        mp_obj_t call_exception_handler = mp_load_attr(Loop, MP_QSTR_call_exception_handler);
-        mp_call_function_1(call_exception_handler, _exc_context);
-    }
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(task_throw_obj, task_throw);
-
 STATIC void task_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     mp_obj_task_t *self = MP_OBJ_TO_PTR(self_in);
     if (dest[0] == MP_OBJ_NULL) {
@@ -244,32 +230,24 @@ STATIC void task_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
             dest[0] = self->coro;
         } else if (attr == MP_QSTR_data) {
             dest[0] = self->data;
-        } else if (attr == MP_QSTR_waiting) {
-            if (self->waiting != mp_const_none && self->waiting != mp_const_false) {
-                dest[0] = self->waiting;
-            }
+        } else if (attr == MP_QSTR_state) {
+            dest[0] = self->state;
         } else if (attr == MP_QSTR_done) {
             dest[0] = MP_OBJ_FROM_PTR(&task_done_obj);
             dest[1] = self_in;
         } else if (attr == MP_QSTR_cancel) {
             dest[0] = MP_OBJ_FROM_PTR(&task_cancel_obj);
             dest[1] = self_in;
-        } else if (attr == MP_QSTR_throw) {
-            dest[0] = MP_OBJ_FROM_PTR(&task_throw_obj);
-            dest[1] = self_in;
         } else if (attr == MP_QSTR_ph_key) {
             dest[0] = self->ph_key;
         }
     } else if (dest[1] != MP_OBJ_NULL) {
         // Store
-        if (attr == MP_QSTR_coro) {
-            self->coro = dest[1];
-            dest[0] = MP_OBJ_NULL;
-        } else if (attr == MP_QSTR_data) {
+        if (attr == MP_QSTR_data) {
             self->data = dest[1];
             dest[0] = MP_OBJ_NULL;
-        } else if (attr == MP_QSTR_waiting) {
-            self->waiting = dest[1];
+        } else if (attr == MP_QSTR_state) {
+            self->state = dest[1];
             dest[0] = MP_OBJ_NULL;
         }
     }
@@ -278,15 +256,12 @@ STATIC void task_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
 STATIC mp_obj_t task_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
     (void)iter_buf;
     mp_obj_task_t *self = MP_OBJ_TO_PTR(self_in);
-    if (self->waiting == mp_const_none) {
-        // The is the first access of the "waiting" entry.
-        if (TASK_IS_DONE(self)) {
-            // Signal that the completed-task has been await'ed on.
-            self->waiting = mp_const_false;
-        } else {
-            // Lazily allocate the waiting queue.
-            self->waiting = task_queue_make_new(&task_queue_type, 0, 0, NULL);
-        }
+    if (TASK_IS_DONE(self)) {
+        // Signal that the completed-task has been await'ed on.
+        self->state = TASK_STATE_DONE_WAS_WAITED_ON;
+    } else if (self->state == TASK_STATE_RUNNING_NOT_WAITED_ON) {
+        // Allocate the waiting queue.
+        self->state = task_queue_make_new(&task_queue_type, 0, 0, NULL);
     }
     return self_in;
 }
@@ -299,7 +274,7 @@ STATIC mp_obj_t task_iternext(mp_obj_t self_in) {
     } else {
         // Put calling task on waiting queue.
         mp_obj_t cur_task = mp_obj_dict_get(uasyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR_cur_task));
-        mp_obj_t args[2] = { self->waiting, cur_task };
+        mp_obj_t args[2] = { self->state, cur_task };
         task_queue_push_sorted(2, args);
         // Set calling task's data to this task that it waits on, to double-link it.
         ((mp_obj_task_t *)MP_OBJ_TO_PTR(cur_task))->data = self_in;
diff --git a/extmod/uasyncio/core.py b/extmod/uasyncio/core.py
index d74763f6a6..12833cf0cd 100644
--- a/extmod/uasyncio/core.py
+++ b/extmod/uasyncio/core.py
@@ -175,6 +175,10 @@ def run_until_complete(main_task=None):
             if not exc:
                 t.coro.send(None)
             else:
+                # If the task is finished and on the run queue and gets here, then it
+                # had an exception and was not await'ed on.  Throwing into it now will
+                # raise StopIteration and the code below will catch this and run the
+                # call_exception_handler function.
                 t.data = None
                 t.coro.throw(exc)
         except excs_all as er:
@@ -185,22 +189,32 @@ def run_until_complete(main_task=None):
                 if isinstance(er, StopIteration):
                     return er.value
                 raise er
-            # Schedule any other tasks waiting on the completion of this task
-            waiting = False
-            if hasattr(t, "waiting"):
-                while t.waiting.peek():
-                    _task_queue.push_head(t.waiting.pop_head())
-                    waiting = True
-                t.waiting = None  # Free waiting queue head
-            if not waiting and not isinstance(er, excs_stop):
-                # An exception ended this detached task, so queue it for later
-                # execution to handle the uncaught exception if no other task retrieves
-                # the exception in the meantime (this is handled by Task.throw).
-                _task_queue.push_head(t)
-            # Indicate task is done by setting coro to the task object itself
-            t.coro = t
-            # Save return value of coro to pass up to caller
-            t.data = er
+            if t.state:
+                # Task was running but is now finished.
+                waiting = False
+                if t.state is True:
+                    # "None" indicates that the task is complete and not await'ed on (yet).
+                    t.state = None
+                else:
+                    # Schedule any other tasks waiting on the completion of this task.
+                    while t.state.peek():
+                        _task_queue.push_head(t.state.pop_head())
+                        waiting = True
+                    # "False" indicates that the task is complete and has been await'ed on.
+                    t.state = False
+                if not waiting and not isinstance(er, excs_stop):
+                    # An exception ended this detached task, so queue it for later
+                    # execution to handle the uncaught exception if no other task retrieves
+                    # the exception in the meantime (this is handled by Task.throw).
+                    _task_queue.push_head(t)
+                # Save return value of coro to pass up to caller.
+                t.data = er
+            elif t.state is None:
+                # Task is already finished and nothing await'ed on the task,
+                # so call the exception handler.
+                _exc_context["exception"] = exc
+                _exc_context["future"] = t
+                Loop.call_exception_handler(_exc_context)
 
 
 # Create a new task from a coroutine and run it until it finishes
diff --git a/extmod/uasyncio/task.py b/extmod/uasyncio/task.py
index 68ddf496f0..26df7b1725 100644
--- a/extmod/uasyncio/task.py
+++ b/extmod/uasyncio/task.py
@@ -123,6 +123,7 @@ class Task:
     def __init__(self, coro, globals=None):
         self.coro = coro  # Coroutine of this Task
         self.data = None  # General data for queue it is waiting on
+        self.state = True  # None, False, True or a TaskQueue instance
         self.ph_key = 0  # Pairing heap
         self.ph_child = None  # Paring heap
         self.ph_child_last = None  # Paring heap
@@ -130,30 +131,30 @@ class Task:
         self.ph_rightmost_parent = None  # Paring heap
 
     def __iter__(self):
-        if self.coro is self:
-            # Signal that the completed-task has been await'ed on.
-            self.waiting = None
-        elif not hasattr(self, "waiting"):
-            # Lazily allocated head of linked list of Tasks waiting on completion of this task.
-            self.waiting = TaskQueue()
+        if not self.state:
+            # Task finished, signal that is has been await'ed on.
+            self.state = False
+        elif self.state is True:
+            # Allocated head of linked list of Tasks waiting on completion of this task.
+            self.state = TaskQueue()
         return self
 
     def __next__(self):
-        if self.coro is self:
+        if not self.state:
             # Task finished, raise return value to caller so it can continue.
             raise self.data
         else:
             # Put calling task on waiting queue.
-            self.waiting.push_head(core.cur_task)
+            self.state.push_head(core.cur_task)
             # Set calling task's data to this task that it waits on, to double-link it.
             core.cur_task.data = self
 
     def done(self):
-        return self.coro is self
+        return not self.state
 
     def cancel(self):
         # Check if task is already finished.
-        if self.coro is self:
+        if not self.state:
             return False
         # Can't cancel self (not supported yet).
         if self is core.cur_task:
@@ -172,13 +173,3 @@ class Task:
             core._task_queue.push_head(self)
         self.data = core.CancelledError
         return True
-
-    def throw(self, value):
-        # This task raised an exception which was uncaught; handle that now.
-        # Set the data because it was cleared by the main scheduling loop.
-        self.data = value
-        if not hasattr(self, "waiting"):
-            # Nothing await'ed on the task so call the exception handler.
-            core._exc_context["exception"] = value
-            core._exc_context["future"] = self
-            core.Loop.call_exception_handler(core._exc_context)
diff --git a/tests/extmod/uasyncio_cancel_wait_on_finished.py b/tests/extmod/uasyncio_cancel_wait_on_finished.py
new file mode 100644
index 0000000000..66b36dd60d
--- /dev/null
+++ b/tests/extmod/uasyncio_cancel_wait_on_finished.py
@@ -0,0 +1,41 @@
+# Test cancelling a task that is waiting on a task that just finishes.
+
+try:
+    import uasyncio as asyncio
+except ImportError:
+    try:
+        import asyncio
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+
+async def sleep_task():
+    print("sleep_task sleep")
+    await asyncio.sleep(0)
+    print("sleep_task wake")
+
+
+async def wait_task(t):
+    print("wait_task wait")
+    await t
+    print("wait_task wake")
+
+
+async def main():
+    waiting_task = asyncio.create_task(wait_task(asyncio.create_task(sleep_task())))
+
+    print("main sleep")
+    await asyncio.sleep(0)
+    print("main sleep")
+    await asyncio.sleep(0)
+
+    waiting_task.cancel()
+    print("main wait")
+    try:
+        await waiting_task
+    except asyncio.CancelledError as er:
+        print(repr(er))
+
+
+asyncio.run(main())
diff --git a/tests/extmod/uasyncio_cancel_wait_on_finished.py.exp b/tests/extmod/uasyncio_cancel_wait_on_finished.py.exp
new file mode 100644
index 0000000000..60e871bfe5
--- /dev/null
+++ b/tests/extmod/uasyncio_cancel_wait_on_finished.py.exp
@@ -0,0 +1,7 @@
+main sleep
+sleep_task sleep
+wait_task wait
+main sleep
+sleep_task wake
+main wait
+CancelledError()

From 3d18c5c3272e8d19d7ea80b5e017595b3b4a972f Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Wed, 16 Jun 2021 13:29:38 -0400
Subject: [PATCH 249/349] Use a single list of keypad scanners

---
 py/circuitpy_mpconfig.h          |  4 +-
 shared-module/keypad/KeyMatrix.c | 61 ++++-------------------------
 shared-module/keypad/KeyMatrix.h | 14 +++----
 shared-module/keypad/Keys.c      | 60 ++++------------------------
 shared-module/keypad/Keys.h      | 16 ++++----
 shared-module/keypad/__init__.c  | 67 +++++++++++++++++++++++++++++---
 shared-module/keypad/__init__.h  | 14 +++++++
 7 files changed, 105 insertions(+), 131 deletions(-)

diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index 4b6585c2a4..fdb78d885c 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -533,9 +533,7 @@ extern const struct _mp_obj_module_t ipaddress_module;
 #if CIRCUITPY_KEYPAD
 extern const struct _mp_obj_module_t keypad_module;
 #define KEYPAD_MODULE        { MP_OBJ_NEW_QSTR(MP_QSTR_keypad), (mp_obj_t)&keypad_module },
-#define KEYPAD_ROOT_POINTERS \
-    mp_obj_t keypad_keys_linked_list; \
-    mp_obj_t keypad_keymatrix_linked_list;
+#define KEYPAD_ROOT_POINTERS mp_obj_t keypad_scanners_linked_list;
 #else
 #define KEYPAD_MODULE
 #define KEYPAD_ROOT_POINTERS
diff --git a/shared-module/keypad/KeyMatrix.c b/shared-module/keypad/KeyMatrix.c
index 8ad08d0eb8..c7c7d60cc1 100644
--- a/shared-module/keypad/KeyMatrix.c
+++ b/shared-module/keypad/KeyMatrix.c
@@ -26,16 +26,14 @@
 
 #include "py/gc.h"
 #include "py/runtime.h"
+#include "shared-bindings/keypad/__init__.h"
 #include "shared-bindings/keypad/Event.h"
 #include "shared-bindings/keypad/KeyMatrix.h"
 #include "shared-bindings/digitalio/DigitalInOut.h"
 #include "shared-bindings/util.h"
 #include "supervisor/port.h"
-#include "supervisor/shared/lock.h"
 #include "supervisor/shared/tick.h"
 
-static supervisor_lock_t keypad_keymatrix_linked_list_lock;
-
 #define DEBOUNCE_TICKS (20)
 
 // Top bit of 16-bit event indicates pressed or released. Rest is key_num.
@@ -75,12 +73,8 @@ void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint
     // Event queue is 16-bit values.
     ringbuf_alloc(&self->encoded_events, max_events * 2, false);
 
-    // Add self to the list of active Keys objects.
-
-    supervisor_acquire_lock(&keypad_keymatrix_linked_list_lock);
-    self->next = MP_STATE_VM(keypad_keymatrix_linked_list);
-    MP_STATE_VM(keypad_keymatrix_linked_list) = self;
-    supervisor_release_lock(&keypad_keymatrix_linked_list_lock);
+    // Add self to the list of active keypad scanners.
+    keypad_register_scanner((keypad_scanner_obj_t *)self);
 
     supervisor_enable_tick();
 }
@@ -90,6 +84,9 @@ void common_hal_keypad_keymatrix_deinit(keypad_keymatrix_obj_t *self) {
         return;
     }
 
+    // Remove self from the list of active keypad scanners first.
+    keypad_deregister_scanner((keypad_scanner_obj_t *)self);
+
     for (size_t row = 0; row < common_hal_keypad_keymatrix_num_rows(self); row++) {
         common_hal_digitalio_digitalinout_deinit(self->row_digitalinouts->items[row]);
     }
@@ -99,25 +96,6 @@ void common_hal_keypad_keymatrix_deinit(keypad_keymatrix_obj_t *self) {
         common_hal_digitalio_digitalinout_deinit(self->col_digitalinouts->items[col]);
     }
     self->col_digitalinouts = MP_ROM_NONE;
-
-    // Remove self from the list of active KeyMatrix objects.
-
-    supervisor_acquire_lock(&keypad_keymatrix_linked_list_lock);
-    if (MP_STATE_VM(keypad_keymatrix_linked_list) == self) {
-        // I'm at the front; splice myself out.
-        MP_STATE_VM(keypad_keymatrix_linked_list) = self->next;
-    } else {
-        keypad_keymatrix_obj_t *current = MP_STATE_VM(keypad_keymatrix_linked_list);
-        while (current) {
-            if (current->next == self) {
-                // Splice myself out.
-                current->next = self->next;
-                break;
-            }
-            current = current->next;
-        }
-    }
-    supervisor_release_lock(&keypad_keymatrix_linked_list_lock);
 }
 
 bool common_hal_keypad_keymatrix_deinited(keypad_keymatrix_obj_t *self) {
@@ -160,7 +138,7 @@ mp_uint_t common_hal_keypad_keymatrix_key_num(keypad_keymatrix_obj_t *self, mp_u
     return row_col_to_key_num(self, row, col);
 }
 
-static void keypad_keymatrix_scan(keypad_keymatrix_obj_t *self) {
+void keypad_keymatrix_scan(keypad_keymatrix_obj_t *self) {
     uint64_t now = port_get_raw_ticks(NULL);
     if (now - self->last_scan_ticks < DEBOUNCE_TICKS) {
         // Too soon. Wait longer to debounce.
@@ -201,28 +179,3 @@ static void keypad_keymatrix_scan(keypad_keymatrix_obj_t *self) {
         common_hal_digitalio_digitalinout_switch_to_input(self->row_digitalinouts->items[row], PULL_UP);
     }
 }
-
-void keypad_keymatrix_tick(void) {
-    // Fast path.
-    if (!MP_STATE_VM(keypad_keymatrix_linked_list)) {
-        return;
-    }
-
-    if (supervisor_try_lock(&keypad_keymatrix_linked_list_lock)) {
-        keypad_keymatrix_obj_t *keypad_keymatrix = MP_STATE_VM(keypad_keymatrix_linked_list);
-        while (keypad_keymatrix) {
-            keypad_keymatrix_scan(keypad_keymatrix);
-            keypad_keymatrix = keypad_keymatrix->next;
-        }
-        supervisor_release_lock(&keypad_keymatrix_linked_list_lock);
-    }
-}
-
-void keypad_keymatrix_reset(void) {
-    if (MP_STATE_VM(keypad_keymatrix_linked_list)) {
-        supervisor_disable_tick();
-    }
-
-    MP_STATE_VM(keypad_keys_linked_list) = NULL;
-    keypad_keymatrix_linked_list_lock = false;
-}
diff --git a/shared-module/keypad/KeyMatrix.h b/shared-module/keypad/KeyMatrix.h
index 2051536898..e25f23b0fc 100644
--- a/shared-module/keypad/KeyMatrix.h
+++ b/shared-module/keypad/KeyMatrix.h
@@ -27,25 +27,25 @@
 #ifndef MICROPY_INCLUDED_SHARED_MODULE_KEYPAD_KEYMATRIX_H
 #define MICROPY_INCLUDED_SHARED_MODULE_KEYPAD_KEYMATRIX_H
 
-#include "common-hal/digitalio/DigitalInOut.h"
-
 #include "py/obj.h"
 #include "py/objtuple.h"
 #include "py/ringbuf.h"
 
-typedef struct _keypad_keymatrix_obj_t {
+#include "common-hal/digitalio/DigitalInOut.h"
+#include "shared-module/keypad/__init__.h"
+
+typedef struct {
     mp_obj_base_t base;
+    // All scanners have a next field here, to keep a linked list of active scanners.
+    keypad_scanner_obj_t *next;
     mp_obj_tuple_t *row_digitalinouts;
     mp_obj_tuple_t *col_digitalinouts;
     uint64_t last_scan_ticks;
     bool *previously_pressed;
     bool *currently_pressed;
     ringbuf_t encoded_events;
-    // Keep a linked list of active KeyMatrix objects.
-    struct _keypad_keymatrix_obj_t *next;
 } keypad_keymatrix_obj_t;
 
-void keypad_keymatrix_tick(void);
-void keypad_keymatrix_reset(void);
+void keypad_keymatrix_scan(keypad_keymatrix_obj_t *self);
 
 #endif  // MICROPY_INCLUDED_SHARED_MODULE_KEYPAD_KEYMATRIX_H
diff --git a/shared-module/keypad/Keys.c b/shared-module/keypad/Keys.c
index 84e77e91eb..bc8549b55b 100644
--- a/shared-module/keypad/Keys.c
+++ b/shared-module/keypad/Keys.c
@@ -26,15 +26,13 @@
 
 #include "py/gc.h"
 #include "py/runtime.h"
+#include "shared-bindings/keypad/__init__.h"
 #include "shared-bindings/keypad/Event.h"
 #include "shared-bindings/keypad/Keys.h"
 #include "shared-bindings/digitalio/DigitalInOut.h"
 #include "supervisor/port.h"
-#include "supervisor/shared/lock.h"
 #include "supervisor/shared/tick.h"
 
-static supervisor_lock_t keypad_keys_linked_list_lock;
-
 #define DEBOUNCE_TICKS (20)
 
 // Top bit of 16-bit event indicates pressed or released. Rest is key_num.
@@ -64,12 +62,8 @@ void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pin
     // Event queue is 16-bit values.
     ringbuf_alloc(&self->encoded_events, max_events * 2, false);
 
-    // Add self to the list of active Keys objects.
-
-    supervisor_acquire_lock(&keypad_keys_linked_list_lock);
-    self->next = MP_STATE_VM(keypad_keys_linked_list);
-    MP_STATE_VM(keypad_keys_linked_list) = self;
-    supervisor_release_lock(&keypad_keys_linked_list_lock);
+    // Add self to the list of active keypad scanners.
+    keypad_register_scanner((keypad_scanner_obj_t *)self);
 
     supervisor_enable_tick();
 }
@@ -79,29 +73,14 @@ void common_hal_keypad_keys_deinit(keypad_keys_obj_t *self) {
         return;
     }
 
+    // Remove self from the list of active keypad scanners first.
+    keypad_deregister_scanner((keypad_scanner_obj_t *)self);
+
     for (size_t key = 0; key < common_hal_keypad_keys_num_keys(self); key++) {
         common_hal_digitalio_digitalinout_deinit(self->digitalinouts->items[key]);
     }
     self->digitalinouts = MP_ROM_NONE;
 
-    // Remove self from the list of active Keys objects.
-
-    supervisor_acquire_lock(&keypad_keys_linked_list_lock);
-    if (MP_STATE_VM(keypad_keys_linked_list) == self) {
-        // I'm at the front; splice myself out.
-        MP_STATE_VM(keypad_keys_linked_list) = self->next;
-    } else {
-        keypad_keys_obj_t *current = MP_STATE_VM(keypad_keys_linked_list);
-        while (current) {
-            if (current->next == self) {
-                // Splice myself out.
-                current->next = self->next;
-                break;
-            }
-            current = current->next;
-        }
-    }
-    supervisor_release_lock(&keypad_keys_linked_list_lock);
 }
 
 bool common_hal_keypad_keys_deinited(keypad_keys_obj_t *self) {
@@ -131,7 +110,7 @@ void common_hal_keypad_keys_clear_events(keypad_keys_obj_t *self) {
     ringbuf_clear(&self->encoded_events);
 }
 
-static void keypad_keys_scan(keypad_keys_obj_t *self) {
+void keypad_keys_scan(keypad_keys_obj_t *self) {
     uint64_t now = port_get_raw_ticks(NULL);
     if (now - self->last_scan_ticks < DEBOUNCE_TICKS) {
         // Too soon. Wait longer to debounce.
@@ -160,28 +139,3 @@ static void keypad_keys_scan(keypad_keys_obj_t *self) {
         }
     }
 }
-
-void keypad_keys_tick(void) {
-    // Fast path.
-    if (!MP_STATE_VM(keypad_keys_linked_list)) {
-        return;
-    }
-
-    if (supervisor_try_lock(&keypad_keys_linked_list_lock)) {
-        keypad_keys_obj_t *keypad_keys = MP_STATE_VM(keypad_keys_linked_list);
-        while (keypad_keys) {
-            keypad_keys_scan(keypad_keys);
-            keypad_keys = keypad_keys->next;
-        }
-        supervisor_release_lock(&keypad_keys_linked_list_lock);
-    }
-}
-
-void keypad_keys_reset(void) {
-    if (MP_STATE_VM(keypad_keys_linked_list)) {
-        supervisor_disable_tick();
-    }
-
-    MP_STATE_VM(keypad_keys_linked_list) = NULL;
-    keypad_keys_linked_list_lock = false;
-}
diff --git a/shared-module/keypad/Keys.h b/shared-module/keypad/Keys.h
index ecf8165b9e..03eb65d635 100644
--- a/shared-module/keypad/Keys.h
+++ b/shared-module/keypad/Keys.h
@@ -27,25 +27,25 @@
 #ifndef MICROPY_INCLUDED_SHARED_MODULE_KEYPAD_KEYS_H
 #define MICROPY_INCLUDED_SHARED_MODULE_KEYPAD_KEYS_H
 
-#include "common-hal/digitalio/DigitalInOut.h"
-
 #include "py/obj.h"
 #include "py/objtuple.h"
 #include "py/ringbuf.h"
 
-typedef struct _keypad_keys_obj_t {
+#include "common-hal/digitalio/DigitalInOut.h"
+#include "shared-module/keypad/__init__.h"
+
+typedef struct {
     mp_obj_base_t base;
+    // All scanners have a next field here, to keep a linked list of active scanners.
+    keypad_scanner_obj_t *next;
     mp_obj_tuple_t *digitalinouts;
     uint64_t last_scan_ticks;
-    bool value_when_pressed;
     bool *previously_pressed;
     bool *currently_pressed;
     ringbuf_t encoded_events;
-    // Keep a linked list of active Keys objects.
-    struct _keypad_keys_obj_t *next;
+    bool value_when_pressed;
 } keypad_keys_obj_t;
 
-void keypad_keys_tick(void);
-void keypad_keys_reset(void);
+void keypad_keys_scan(keypad_keys_obj_t *self);
 
 #endif  // MICROPY_INCLUDED_SHARED_MODULE_KEYPAD_KEYS_H
diff --git a/shared-module/keypad/__init__.c b/shared-module/keypad/__init__.c
index 9b08dc9bb5..f29f126c3f 100644
--- a/shared-module/keypad/__init__.c
+++ b/shared-module/keypad/__init__.c
@@ -24,15 +24,70 @@
  * THE SOFTWARE.
  */
 
-#include "shared-module/keypad/Keys.h"
-#include "shared-module/keypad/KeyMatrix.h"
+#include "shared-bindings/keypad/Keys.h"
+#include "shared-bindings/keypad/KeyMatrix.h"
+#include "supervisor/shared/lock.h"
+#include "supervisor/shared/tick.h"
+
+static supervisor_lock_t keypad_scanners_linked_list_lock;
 
 void keypad_tick(void) {
-    keypad_keys_tick();
-    keypad_keymatrix_tick();
+    // Fast path. Return immediately if there are no scanners.
+    if (!MP_STATE_VM(keypad_scanners_linked_list)) {
+        return;
+    }
+
+    // Skip scanning if someone else has the lock. Don't wait for the lock.
+    if (supervisor_try_lock(&keypad_scanners_linked_list_lock)) {
+        mp_obj_t scanner = MP_STATE_VM(keypad_scanners_linked_list);
+        while (scanner) {
+            if (mp_obj_is_type(scanner, &keypad_keys_type)) {
+                keypad_keys_scan((keypad_keys_obj_t *)scanner);
+            } else if (mp_obj_is_type(scanner, &keypad_keymatrix_type)) {
+                keypad_keymatrix_scan((keypad_keymatrix_obj_t *)scanner);
+            }
+
+            scanner = ((keypad_scanner_obj_t *)scanner)->next;
+        }
+        supervisor_release_lock(&keypad_scanners_linked_list_lock);
+    }
 }
 
 void keypad_reset(void) {
-    keypad_keys_reset();
-    keypad_keymatrix_reset();
+    if (MP_STATE_VM(keypad_scanners_linked_list)) {
+        supervisor_disable_tick();
+    }
+
+    MP_STATE_VM(keypad_scanners_linked_list) = NULL;
+    keypad_scanners_linked_list_lock = false;
+}
+
+// Register a Keys, KeyMatrix, etc. that will be scanned in the background
+void keypad_register_scanner(keypad_scanner_obj_t *scanner) {
+    supervisor_acquire_lock(&keypad_scanners_linked_list_lock);
+    scanner->next = MP_STATE_VM(keypad_scanners_linked_list);
+    MP_STATE_VM(keypad_scanners_linked_list) = scanner;
+    supervisor_release_lock(&keypad_scanners_linked_list_lock);
+}
+
+// Remove scanner from the list of active scanners.
+void keypad_deregister_scanner(keypad_scanner_obj_t *scanner) {
+    supervisor_acquire_lock(&keypad_scanners_linked_list_lock);
+    if (MP_STATE_VM(keypad_scanners_linked_list) == scanner) {
+        // Scanner is at the front; splice it out.
+        MP_STATE_VM(keypad_scanners_linked_list) = scanner->next;
+        scanner->next = NULL;
+    } else {
+        keypad_scanner_obj_t *current = MP_STATE_VM(keypad_scanners_linked_list);
+        while (current) {
+            if (current->next == scanner) {
+                // Splice myself out.
+                current->next = scanner->next;
+                scanner->next = NULL;
+                break;
+            }
+            current = current->next;
+        }
+    }
+    supervisor_release_lock(&keypad_scanners_linked_list_lock);
 }
diff --git a/shared-module/keypad/__init__.h b/shared-module/keypad/__init__.h
index 2dc3fdca8e..de89c310a5 100644
--- a/shared-module/keypad/__init__.h
+++ b/shared-module/keypad/__init__.h
@@ -27,7 +27,21 @@
 #ifndef SHARED_MODULE_KEYPAD_H
 #define SHARED_MODULE_KEYPAD_H
 
+#include "py/obj.h"
+
+// All scanners must have a next field immediately following base.
+// This is an ad hoc "superclass" struct for scanners, though they do
+// not actually have a superclass relationship.
+typedef struct _keypad_scanner_obj_t {
+    mp_obj_base_t base;
+    struct _keypad_scanner_obj_t *next;
+} keypad_scanner_obj_t;
+
 void keypad_tick(void);
 void keypad_reset(void);
 
+void keypad_register_scanner(keypad_scanner_obj_t *scanner);
+void keypad_deregister_scanner(keypad_scanner_obj_t *scanner);
+
+
 #endif // SHARED_MODULE_KEYPAD_H

From cd31136c30791ced328eb132676382c21c09b5e9 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Wed, 16 Jun 2021 15:27:59 -0400
Subject: [PATCH 250/349] factor out keypad.EventQueue

---
 py/circuitpy_defns.mk               |   1 +
 shared-bindings/keypad/Event.c      |  20 +++---
 shared-bindings/keypad/EventQueue.c | 105 ++++++++++++++++++++++++++++
 shared-bindings/keypad/EventQueue.h |  41 +++++++++++
 shared-bindings/keypad/KeyMatrix.c  |  61 +++++++---------
 shared-bindings/keypad/KeyMatrix.h  |   4 +-
 shared-bindings/keypad/Keys.c       |  70 ++++++++-----------
 shared-bindings/keypad/Keys.h       |   5 +-
 shared-bindings/keypad/__init__.c   |  10 +--
 shared-module/keypad/EventQueue.c   |  66 +++++++++++++++++
 shared-module/keypad/EventQueue.h   |  40 +++++++++++
 shared-module/keypad/KeyMatrix.c    |  45 ++++--------
 shared-module/keypad/KeyMatrix.h    |   4 +-
 shared-module/keypad/Keys.c         |  40 +++--------
 shared-module/keypad/Keys.h         |   4 +-
 15 files changed, 352 insertions(+), 164 deletions(-)
 create mode 100644 shared-bindings/keypad/EventQueue.c
 create mode 100644 shared-bindings/keypad/EventQueue.h
 create mode 100644 shared-module/keypad/EventQueue.c
 create mode 100644 shared-module/keypad/EventQueue.h

diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index 43ae46ac00..aa06434368 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -517,6 +517,7 @@ SRC_SHARED_MODULE_ALL = \
 	ipaddress/__init__.c \
 	keypad/__init__.c \
 	keypad/Event.c \
+	keypad/EventQueue.c \
 	keypad/KeyMatrix.c \
 	keypad/Keys.c \
 	sdcardio/SDCard.c \
diff --git a/shared-bindings/keypad/Event.c b/shared-bindings/keypad/Event.c
index 807f0c6af5..7abd75e54d 100644
--- a/shared-bindings/keypad/Event.c
+++ b/shared-bindings/keypad/Event.c
@@ -64,11 +64,11 @@ STATIC mp_obj_t keypad_event_make_new(const mp_obj_type_t *type, size_t n_args,
 //|     key_num: int
 //|     """The key number."""
 //|
-STATIC mp_obj_t keypad_event_obj_get_key_num(mp_obj_t self_in) {
+STATIC mp_obj_t keypad_event_get_key_num(mp_obj_t self_in) {
     keypad_event_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_NEW_SMALL_INT(common_hal_keypad_event_get_key_num(self));
 }
-MP_DEFINE_CONST_FUN_OBJ_1(keypad_event_get_key_num_obj, keypad_event_obj_get_key_num);
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_event_get_key_num_obj, keypad_event_get_key_num);
 
 const mp_obj_property_t keypad_event_key_num_obj = {
     .base.type = &mp_type_property,
@@ -78,15 +78,15 @@ const mp_obj_property_t keypad_event_key_num_obj = {
 };
 
 //|     pressed: bool
-//|     """True if event represents a key down (pressed) transition.
+//|     """``True`` if the event represents a key down (pressed) transition.
 //|     The opposite of `released`.
 //|     """
 //|
-STATIC mp_obj_t keypad_event_obj_get_pressed(mp_obj_t self_in) {
+STATIC mp_obj_t keypad_event_get_pressed(mp_obj_t self_in) {
     keypad_event_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_bool(common_hal_keypad_event_get_pressed(self));
 }
-MP_DEFINE_CONST_FUN_OBJ_1(keypad_event_get_pressed_obj, keypad_event_obj_get_pressed);
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_event_get_pressed_obj, keypad_event_get_pressed);
 
 const mp_obj_property_t keypad_event_pressed_obj = {
     .base.type = &mp_type_property,
@@ -96,15 +96,15 @@ const mp_obj_property_t keypad_event_pressed_obj = {
 };
 
 //|     released: bool
-//|     """True if event represents a key up (released) transition.
+//|     """``True`` if the event represents a key up (released) transition.
 //|     The opposite of `pressed`.
 //|     """
 //|
-STATIC mp_obj_t keypad_event_obj_get_released(mp_obj_t self_in) {
+STATIC mp_obj_t keypad_event_get_released(mp_obj_t self_in) {
     keypad_event_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_bool(common_hal_keypad_event_get_released(self));
 }
-MP_DEFINE_CONST_FUN_OBJ_1(keypad_event_get_released_obj, keypad_event_obj_get_released);
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_event_get_released_obj, keypad_event_get_released);
 
 const mp_obj_property_t keypad_event_released_obj = {
     .base.type = &mp_type_property,
@@ -114,7 +114,7 @@ const mp_obj_property_t keypad_event_released_obj = {
 };
 
 //|     def __eq__(self, other: object) -> bool:
-//|         """Two Event objects are equal if their `key_num`
+//|         """Two `Event` objects are equal if their `key_num`
 //|         and `pressed`/`released` values are equal.
 //|         """
 //|         ...
@@ -140,7 +140,7 @@ STATIC mp_obj_t keypad_event_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_ob
 }
 
 //|     def __hash__(self) -> int:
-//|         """Returns a hash for the Event, so it can be used in dictionaries, etc.."""
+//|         """Returns a hash for the `Event`, so it can be used in dictionaries, etc.."""
 //|         ...
 //|
 STATIC mp_obj_t keypad_event_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
diff --git a/shared-bindings/keypad/EventQueue.c b/shared-bindings/keypad/EventQueue.c
new file mode 100644
index 0000000000..9ffebf3662
--- /dev/null
+++ b/shared-bindings/keypad/EventQueue.c
@@ -0,0 +1,105 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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/runtime.h"
+#include "shared-bindings/keypad/EventQueue.h"
+
+//| class EventQueue:
+//|     """A queue of `Event` objects, filled by a `keypad` scanner such as `Keys` or `KeyMatrix`.
+//|
+//|     You cannot create an instance of `EventQueue` directly. Each scanner creates an
+//|     instance when it is created.
+//|     """
+//|     ...
+
+//|     def next(self) -> Optional[Event]:
+//|         """Return the next key transition event. Return ``None`` if no events are pending.
+//|
+//|         Note that the queue size is limited; see ``max_events`` in the constructor of
+//|         a scanner such as `Keys` or `KeyMatrix`.
+//|         If a new event arrives when the queue is full, the oldest event is discarded.
+//|
+//|         :return: the next queued key transition `Event`
+//|         :rtype: Optional[Event]
+//|         """
+//|         ...
+//|
+STATIC mp_obj_t keypad_eventqueue_next(mp_obj_t self_in) {
+    keypad_eventqueue_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    return common_hal_keypad_eventqueue_next(self);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_eventqueue_next_obj, keypad_eventqueue_next);
+
+//|     def clear(self) -> None:
+//|         """Clear any queued key transition events.
+//|         """
+//|         ...
+//|
+STATIC mp_obj_t keypad_eventqueue_clear(mp_obj_t self_in) {
+    keypad_eventqueue_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    common_hal_keypad_eventqueue_clear(self);
+    return MP_ROM_NONE;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_eventqueue_clear_obj, keypad_eventqueue_clear);
+
+//|     def __bool__(self) -> bool:
+//|         """``True`` if `len()` is greater than zero.
+//|         This is an easy way to check if the queue is empty.
+//|         """
+//|         ...
+//|
+//|     def __len__(self) -> int:
+//|         """Return the number of events currently in the queue. Used to implement ``len()``."""
+//|         ...
+//|
+STATIC mp_obj_t keypad_eventqueue_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
+    keypad_eventqueue_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uint16_t len = common_hal_keypad_eventqueue_get_length(self);
+    switch (op) {
+        case MP_UNARY_OP_BOOL:
+            return mp_obj_new_bool(len != 0);
+        case MP_UNARY_OP_LEN:
+            return MP_OBJ_NEW_SMALL_INT(len);
+        default:
+            return MP_OBJ_NULL;      // op not supported
+    }
+}
+
+STATIC const mp_rom_map_elem_t keypad_eventqueue_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_clear), MP_ROM_PTR(&keypad_eventqueue_clear_obj) },
+    { MP_ROM_QSTR(MP_QSTR_next),  MP_ROM_PTR(&keypad_eventqueue_next_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(keypad_eventqueue_locals_dict, keypad_eventqueue_locals_dict_table);
+
+const mp_obj_type_t keypad_eventqueue_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Keys,
+    .unary_op = keypad_eventqueue_unary_op,
+    .locals_dict = (mp_obj_t)&keypad_eventqueue_locals_dict,
+};
diff --git a/shared-bindings/keypad/EventQueue.h b/shared-bindings/keypad/EventQueue.h
new file mode 100644
index 0000000000..d6b2ac32c6
--- /dev/null
+++ b/shared-bindings/keypad/EventQueue.h
@@ -0,0 +1,41 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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_KEYPAD_EVENTQUEUE_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_EVENTQUEUE_H
+
+#include "py/objlist.h"
+#include "shared-module/keypad/Keys.h"
+
+extern const mp_obj_type_t keypad_eventqueue_type;
+
+void common_hal_keypad_eventqueue_construct(keypad_eventqueue_obj_t *self, size_t max_events);
+
+void common_hal_keypad_eventqueue_clear(keypad_eventqueue_obj_t *self);
+size_t common_hal_keypad_eventqueue_get_length(keypad_eventqueue_obj_t *self);
+mp_obj_t common_hal_keypad_eventqueue_next(keypad_eventqueue_obj_t *self);
+
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_EVENTQUEUE_H
diff --git a/shared-bindings/keypad/KeyMatrix.c b/shared-bindings/keypad/KeyMatrix.c
index 5820c9ea39..75e434ac3e 100644
--- a/shared-bindings/keypad/KeyMatrix.c
+++ b/shared-bindings/keypad/KeyMatrix.c
@@ -25,6 +25,7 @@
  */
 
 #include "lib/utils/context_manager_helpers.h"
+#include "py/objproperty.h"
 #include "py/runtime.h"
 #include "shared-bindings/keypad/Event.h"
 #include "shared-bindings/keypad/KeyMatrix.h"
@@ -44,11 +45,13 @@
 //|         The keys are numbered sequentially from zero. A key number can be computed
 //|         by ``row * len(col_pins) + col``.
 //|
+//|         An `EventQueue` is created when this object is created and is available in the `events` attribute.
+//|
 //|         The keys are debounced by waiting about 20 msecs before reporting a transition.
 //|
 //|         :param Sequence[microcontroller.Pin] row_pins: The pins attached to the rows.
 //|         :param Sequence[microcontroller.Pin] col_pins: The pins attached to the colums.
-//|         :param int max_events: Size of key event queue:
+//|         :param int max_events: maximum size of `events` `EventQueue`:
 //|           maximum number of key transition events that are saved.
 //|           Must be >= 1.
 //|           If a new event arrives when the queue is full, the oldest event is discarded.
@@ -133,42 +136,10 @@ STATIC void check_for_deinit(keypad_keymatrix_obj_t *self) {
     }
 }
 
-//|     def next_event(self) -> Optional[Event]:
-//|         """Return the next key transition event. Return ``None`` if no events are pending.
-//|
-//|         Note that the queue size is limited; see ``max_events`` in the constructor.
-//|         If a new event arrives when the queue is full, the oldest event is discarded.
-//|
-//|         :return: the next queued key transition `Event`
-//|         :rtype: Optional[Event]
-//|         """
-//|         ...
-//|
-STATIC mp_obj_t keypad_keymatrix_next_event(mp_obj_t self_in) {
-    keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-
-    return common_hal_keypad_keymatrix_next_event(self);
-}
-MP_DEFINE_CONST_FUN_OBJ_1(keypad_keymatrix_next_event_obj, keypad_keymatrix_next_event);
-
-//|     def clear_events(self) -> None:
-//|         """Clear any queued key transition events.
-//|         """
-//|         ...
-//|
-STATIC mp_obj_t keypad_keymatrix_clear_events(mp_obj_t self_in) {
-    keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-
-    common_hal_keypad_keymatrix_clear_events(self);
-    return MP_ROM_NONE;
-}
-MP_DEFINE_CONST_FUN_OBJ_1(keypad_keymatrix_clear_events_obj, keypad_keymatrix_clear_events);
 
 //|     def pressed(self, key_num: int) -> None:
 //|         """Return ``True`` if the given key is pressed. This is a debounced read
-//|         of the key state which bypasses the event queue.
+//|         of the key state which bypasses the `events` `EventQueue`.
 //|         """
 //|         ...
 //|
@@ -210,14 +181,30 @@ STATIC mp_obj_t keypad_keymatrix_key_num(mp_obj_t self_in, mp_obj_t row_in, mp_o
 }
 MP_DEFINE_CONST_FUN_OBJ_3(keypad_keymatrix_key_num_obj, keypad_keymatrix_key_num);
 
+//|     events: EventQueue
+//|     """The `EventQueue` associated with this `Keys` object. (read-only)
+//|     """
+//|
+STATIC mp_obj_t keypad_keymatrix_get_events(mp_obj_t self_in) {
+    keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return common_hal_keypad_keymatrix_get_events(self);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_keymatrix_get_events_obj, keypad_keymatrix_get_events);
+
+const mp_obj_property_t keypad_keymatrix_events_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&keypad_keymatrix_get_events_obj,
+              MP_ROM_NONE,
+              MP_ROM_NONE},
+};
+
 STATIC const mp_rom_map_elem_t keypad_keymatrix_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_deinit),      MP_ROM_PTR(&keypad_keymatrix_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR___enter__),   MP_ROM_PTR(&default___enter___obj) },
     { MP_ROM_QSTR(MP_QSTR___exit__),    MP_ROM_PTR(&keypad_keymatrix___exit___obj) },
 
-    { MP_ROM_QSTR(MP_QSTR_clear_events), MP_ROM_PTR(&keypad_keymatrix_clear_events_obj) },
+    { MP_ROM_QSTR(MP_QSTR_events),       MP_ROM_PTR(&keypad_keymatrix_events_obj) },
     { MP_ROM_QSTR(MP_QSTR_key_num),      MP_ROM_PTR(&keypad_keymatrix_key_num_obj) },
-    { MP_ROM_QSTR(MP_QSTR_next_event),   MP_ROM_PTR(&keypad_keymatrix_next_event_obj) },
     { MP_ROM_QSTR(MP_QSTR_pressed),      MP_ROM_PTR(&keypad_keymatrix_pressed_obj) },
 };
 
@@ -225,7 +212,7 @@ STATIC MP_DEFINE_CONST_DICT(keypad_keymatrix_locals_dict, keypad_keymatrix_local
 
 const mp_obj_type_t keypad_keymatrix_type = {
     { &mp_type_type },
-    .name = MP_QSTR_Keys,
+    .name = MP_QSTR_KeyMatrix,
     .make_new = keypad_keymatrix_make_new,
     .locals_dict = (mp_obj_t)&keypad_keymatrix_locals_dict,
 };
diff --git a/shared-bindings/keypad/KeyMatrix.h b/shared-bindings/keypad/KeyMatrix.h
index f0ce8761bc..d6a2cbb074 100644
--- a/shared-bindings/keypad/KeyMatrix.h
+++ b/shared-bindings/keypad/KeyMatrix.h
@@ -33,6 +33,7 @@
 extern const mp_obj_type_t keypad_keymatrix_type;
 
 void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint_t num_row_pins, mcu_pin_obj_t *row_pins[], mp_uint_t num_col_pins, mcu_pin_obj_t *col_pins[], size_t max_events);
+
 void common_hal_keypad_keymatrix_deinit(keypad_keymatrix_obj_t *self);
 bool common_hal_keypad_keymatrix_deinited(keypad_keymatrix_obj_t *self);
 
@@ -42,8 +43,7 @@ mp_uint_t common_hal_keypad_keymatrix_num_keys(keypad_keymatrix_obj_t *self);
 mp_uint_t common_hal_keypad_keymatrix_num_cols(keypad_keymatrix_obj_t *self);
 mp_uint_t common_hal_keypad_keymatrix_num_rows(keypad_keymatrix_obj_t *self);
 
+mp_obj_t common_hal_keypad_keymatrix_get_events(keypad_keymatrix_obj_t *self);
 bool common_hal_keypad_keymatrix_pressed(keypad_keymatrix_obj_t *self, mp_uint_t key_num);
-mp_obj_t common_hal_keypad_keymatrix_next_event(keypad_keymatrix_obj_t *self);
-void common_hal_keypad_keymatrix_clear_events(keypad_keymatrix_obj_t *self);
 
 #endif  // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_KEYMATRIX_H
diff --git a/shared-bindings/keypad/Keys.c b/shared-bindings/keypad/Keys.c
index ad8a1b9e03..35a9c0e09b 100644
--- a/shared-bindings/keypad/Keys.c
+++ b/shared-bindings/keypad/Keys.c
@@ -25,6 +25,7 @@
  */
 
 #include "lib/utils/context_manager_helpers.h"
+#include "py/objproperty.h"
 #include "py/runtime.h"
 #include "shared-bindings/keypad/Event.h"
 #include "shared-bindings/keypad/Keys.h"
@@ -39,6 +40,8 @@
 //|         Create a `Keys` object that will scan keys attached to the given sequence of pins.
 //|         Each key is independent and attached to its own pin.
 //|
+//|         An `EventQueue` is created when this object is created and is available in the `events` attribute.
+//|
 //|         The keys are debounced by waiting about 20 msecs before reporting a transition.
 //|
 //|         :param Sequence[microcontroller.Pin] pins: The pins attached to the keys.
@@ -52,7 +55,7 @@
 //|           If an external pull is already provided for all the pins, you can set ``pull`` to ``False``.
 //|           However, enabling an internal pull when an external one is already present is not a problem;
 //|           it simply uses slightly more current.
-//|         :param int max_events: Size of key event queue:
+//|         :param int max_events: maximum size of `events` `EventQueue`:
 //|           maximum number of key transition events that are saved.
 //|           Must be >= 1.
 //|           If a new event arrives when the queue is full, the oldest event is discarded.
@@ -132,42 +135,9 @@ STATIC void check_for_deinit(keypad_keys_obj_t *self) {
     }
 }
 
-//|     def next_event(self) -> Optional[Event]:
-//|         """Return the next key transition event. Return ``None`` if no events are pending.
-//|
-//|         Note that the queue size is limited; see ``max_events`` in the constructor.
-//|         If a new event arrives when the queue is full, the oldest event is discarded.
-//|
-//|         :return: the next queued key transition `Event`
-//|         :rtype: Optional[Event]
-//|         """
-//|         ...
-//|
-STATIC mp_obj_t keypad_keys_next_event(mp_obj_t self_in) {
-    keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-
-    return common_hal_keypad_keys_next_event(self);
-}
-MP_DEFINE_CONST_FUN_OBJ_1(keypad_keys_next_event_obj, keypad_keys_next_event);
-
-//|     def clear_events(self) -> None:
-//|         """Clear any queued key transition events.
-//|         """
-//|         ...
-//|
-STATIC mp_obj_t keypad_keys_clear_events(mp_obj_t self_in) {
-    keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-
-    common_hal_keypad_keys_clear_events(self);
-    return MP_ROM_NONE;
-}
-MP_DEFINE_CONST_FUN_OBJ_1(keypad_keys_clear_events_obj, keypad_keys_clear_events);
-
 //|     def pressed(self, key_num: int) -> None:
 //|         """Return ``True`` if the given key is pressed. This is a debounced read
-//|         of the key state which bypasses the event queue.
+//|         of the key state which bypasses the `events` `EventQueue`.
 //|         """
 //|         ...
 //|
@@ -184,14 +154,30 @@ STATIC mp_obj_t keypad_keys_pressed(mp_obj_t self_in, mp_obj_t key_num_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(keypad_keys_pressed_obj, keypad_keys_pressed);
 
-STATIC const mp_rom_map_elem_t keypad_keys_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_deinit),      MP_ROM_PTR(&keypad_keys_deinit_obj) },
-    { MP_ROM_QSTR(MP_QSTR___enter__),   MP_ROM_PTR(&default___enter___obj) },
-    { MP_ROM_QSTR(MP_QSTR___exit__),    MP_ROM_PTR(&keypad_keys___exit___obj) },
+//|     events: EventQueue
+//|     """The `EventQueue` associated with this `Keys` object. (read-only)
+//|     """
+//|
+STATIC mp_obj_t keypad_keys_get_events(mp_obj_t self_in) {
+    keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return common_hal_keypad_keys_get_events(self);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_keys_get_events_obj, keypad_keys_get_events);
 
-    { MP_ROM_QSTR(MP_QSTR_clear_events), MP_ROM_PTR(&keypad_keys_clear_events_obj) },
-    { MP_ROM_QSTR(MP_QSTR_next_event),   MP_ROM_PTR(&keypad_keys_next_event_obj) },
-    { MP_ROM_QSTR(MP_QSTR_pressed),      MP_ROM_PTR(&keypad_keys_pressed_obj) },
+const mp_obj_property_t keypad_keys_events_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&keypad_keys_get_events_obj,
+              MP_ROM_NONE,
+              MP_ROM_NONE},
+};
+
+STATIC const mp_rom_map_elem_t keypad_keys_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_deinit),    MP_ROM_PTR(&keypad_keys_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) },
+    { MP_ROM_QSTR(MP_QSTR___exit__),  MP_ROM_PTR(&keypad_keys___exit___obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_events),    MP_ROM_PTR(&keypad_keys_events_obj) },
+    { MP_ROM_QSTR(MP_QSTR_pressed),   MP_ROM_PTR(&keypad_keys_pressed_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(keypad_keys_locals_dict, keypad_keys_locals_dict_table);
diff --git a/shared-bindings/keypad/Keys.h b/shared-bindings/keypad/Keys.h
index f7ec2302d8..81fc36d3cb 100644
--- a/shared-bindings/keypad/Keys.h
+++ b/shared-bindings/keypad/Keys.h
@@ -33,13 +33,12 @@
 extern const mp_obj_type_t keypad_keys_type;
 
 void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pins, mcu_pin_obj_t *pins[], bool value_when_pressed,  bool pull, size_t max_events);
+
 void common_hal_keypad_keys_deinit(keypad_keys_obj_t *self);
 bool common_hal_keypad_keys_deinited(keypad_keys_obj_t *self);
 
+mp_obj_t common_hal_keypad_keys_get_events(keypad_keys_obj_t *self);
 mp_uint_t common_hal_keypad_keys_num_keys(keypad_keys_obj_t *self);
 bool common_hal_keypad_keys_pressed(keypad_keys_obj_t *self, mp_uint_t key_num);
 
-mp_obj_t common_hal_keypad_keys_next_event(keypad_keys_obj_t *self);
-void common_hal_keypad_keys_clear_events(keypad_keys_obj_t *self);
-
 #endif  // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_KEYS_H
diff --git a/shared-bindings/keypad/__init__.c b/shared-bindings/keypad/__init__.c
index 20f60a5137..5f6177576e 100644
--- a/shared-bindings/keypad/__init__.c
+++ b/shared-bindings/keypad/__init__.c
@@ -28,6 +28,7 @@
 
 #include "shared-bindings/keypad/__init__.h"
 #include "shared-bindings/keypad/Event.h"
+#include "shared-bindings/keypad/EventQueue.h"
 #include "shared-bindings/keypad/KeyMatrix.h"
 #include "shared-bindings/keypad/Keys.h"
 
@@ -39,10 +40,11 @@
 //|
 
 STATIC mp_map_elem_t keypad_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__),  MP_OBJ_NEW_QSTR(MP_QSTR_keypad) },
-    { MP_ROM_QSTR(MP_QSTR_Event),     MP_OBJ_FROM_PTR(&keypad_event_type) },
-    { MP_ROM_QSTR(MP_QSTR_KeyMatrix), MP_OBJ_FROM_PTR(&keypad_keymatrix_type) },
-    { MP_ROM_QSTR(MP_QSTR_Keys),      MP_OBJ_FROM_PTR(&keypad_keys_type) },
+    { MP_ROM_QSTR(MP_QSTR___name__),   MP_OBJ_NEW_QSTR(MP_QSTR_keypad) },
+    { MP_ROM_QSTR(MP_QSTR_Event),      MP_OBJ_FROM_PTR(&keypad_event_type) },
+    { MP_ROM_QSTR(MP_QSTR_EventQueue), MP_OBJ_FROM_PTR(&keypad_eventqueue_type) },
+    { MP_ROM_QSTR(MP_QSTR_KeyMatrix),  MP_OBJ_FROM_PTR(&keypad_keymatrix_type) },
+    { MP_ROM_QSTR(MP_QSTR_Keys),       MP_OBJ_FROM_PTR(&keypad_keys_type) },
 };
 
 STATIC MP_DEFINE_MUTABLE_DICT(keypad_module_globals, keypad_module_globals_table);
diff --git a/shared-module/keypad/EventQueue.c b/shared-module/keypad/EventQueue.c
new file mode 100644
index 0000000000..e75d93106a
--- /dev/null
+++ b/shared-module/keypad/EventQueue.c
@@ -0,0 +1,66 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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 "shared-bindings/keypad/Event.h"
+#include "shared-module/keypad/EventQueue.h"
+
+// Top bit of 16-bit event indicates pressed or released. Rest is key_num.
+#define EVENT_PRESSED (1 << 15)
+#define EVENT_RELEASED (0)
+#define EVENT_KEY_NUM_MASK (~EVENT_PRESSED)
+
+void common_hal_keypad_eventqueue_construct(keypad_eventqueue_obj_t *self, size_t max_events) {
+    // Event queue is 16-bit values.
+    ringbuf_alloc(&self->encoded_events, max_events * 2, false);
+}
+
+mp_obj_t common_hal_keypad_eventqueue_next(keypad_eventqueue_obj_t *self) {
+    int encoded_event = ringbuf_get16(&self->encoded_events);
+    if (encoded_event == -1) {
+        return MP_ROM_NONE;
+    }
+
+    keypad_event_obj_t *event = m_new_obj(keypad_event_obj_t);
+    event->base.type = &keypad_event_type;
+    common_hal_keypad_event_construct(event, encoded_event & EVENT_KEY_NUM_MASK, encoded_event & EVENT_PRESSED);
+    return MP_OBJ_FROM_PTR(event);
+}
+
+void common_hal_keypad_eventqueue_clear(keypad_eventqueue_obj_t *self) {
+    ringbuf_clear(&self->encoded_events);
+}
+
+size_t common_hal_keypad_eventqueue_get_length(keypad_eventqueue_obj_t *self) {
+    return ringbuf_num_filled(&self->encoded_events);
+}
+
+void keypad_eventqueue_record(keypad_eventqueue_obj_t *self, mp_uint_t key_num, bool pressed) {
+    if (ringbuf_num_empty(&self->encoded_events) == 0) {
+        // Discard oldest if full.
+        ringbuf_get16(&self->encoded_events);
+    }
+    ringbuf_put16(&self->encoded_events, key_num | (pressed ? EVENT_PRESSED : EVENT_RELEASED));
+}
diff --git a/shared-module/keypad/EventQueue.h b/shared-module/keypad/EventQueue.h
new file mode 100644
index 0000000000..88e585b23b
--- /dev/null
+++ b/shared-module/keypad/EventQueue.h
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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_MODULE_KEYPAD_EVENTQUEUE_H
+#define MICROPY_INCLUDED_SHARED_MODULE_KEYPAD_EVENTQUEUE_H
+
+#include "py/obj.h"
+#include "py/ringbuf.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    ringbuf_t encoded_events;
+} keypad_eventqueue_obj_t;
+
+void keypad_eventqueue_record(keypad_eventqueue_obj_t *self, mp_uint_t key_num, bool pressed);
+
+#endif  // MICROPY_INCLUDED_SHARED_MODULE_KEYPAD_EVENTQUEUE_H
diff --git a/shared-module/keypad/KeyMatrix.c b/shared-module/keypad/KeyMatrix.c
index c7c7d60cc1..441f78a448 100644
--- a/shared-module/keypad/KeyMatrix.c
+++ b/shared-module/keypad/KeyMatrix.c
@@ -26,21 +26,16 @@
 
 #include "py/gc.h"
 #include "py/runtime.h"
-#include "shared-bindings/keypad/__init__.h"
-#include "shared-bindings/keypad/Event.h"
-#include "shared-bindings/keypad/KeyMatrix.h"
 #include "shared-bindings/digitalio/DigitalInOut.h"
+#include "shared-bindings/keypad/EventQueue.h"
+#include "shared-bindings/keypad/KeyMatrix.h"
+#include "shared-bindings/keypad/__init__.h"
 #include "shared-bindings/util.h"
 #include "supervisor/port.h"
 #include "supervisor/shared/tick.h"
 
 #define DEBOUNCE_TICKS (20)
 
-// Top bit of 16-bit event indicates pressed or released. Rest is key_num.
-#define EVENT_PRESSED (1 << 15)
-#define EVENT_RELEASED (0)
-#define EVENT_KEY_NUM_MASK (~EVENT_PRESSED)
-
 static mp_uint_t row_col_to_key_num(keypad_keymatrix_obj_t *self, mp_uint_t row, mp_uint_t col) {
     return row * self->col_digitalinouts->len + col;
 }
@@ -70,8 +65,10 @@ void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint
     self->currently_pressed = (bool *)gc_alloc(sizeof(bool) * num_row_pins * num_col_pins, false, false);
     self->previously_pressed = (bool *)gc_alloc(sizeof(bool) * num_row_pins * num_col_pins, false, false);
 
-    // Event queue is 16-bit values.
-    ringbuf_alloc(&self->encoded_events, max_events * 2, false);
+    keypad_eventqueue_obj_t *events = m_new_obj(keypad_eventqueue_obj_t);
+    events->base.type = &keypad_eventqueue_type;
+    common_hal_keypad_eventqueue_construct(events, max_events);
+    self->events = events;
 
     // Add self to the list of active keypad scanners.
     keypad_register_scanner((keypad_scanner_obj_t *)self);
@@ -117,27 +114,14 @@ size_t common_hal_keypad_keymatrix_num_cols(keypad_keymatrix_obj_t *self) {
 bool common_hal_keypad_keymatrix_pressed(keypad_keymatrix_obj_t *self, mp_uint_t key_num) {
     return self->currently_pressed[key_num];
 }
-
-mp_obj_t common_hal_keypad_keymatrix_next_event(keypad_keymatrix_obj_t *self) {
-    int encoded_event = ringbuf_get16(&self->encoded_events);
-    if (encoded_event == -1) {
-        return MP_ROM_NONE;
-    }
-
-    keypad_event_obj_t *event = m_new_obj(keypad_event_obj_t);
-    event->base.type = &keypad_event_type;
-    common_hal_keypad_event_construct(event, encoded_event & EVENT_KEY_NUM_MASK, encoded_event & EVENT_PRESSED);
-    return MP_OBJ_FROM_PTR(event);
-}
-
-void common_hal_keypad_keymatrix_clear_events(keypad_keymatrix_obj_t *self) {
-    ringbuf_clear(&self->encoded_events);
-}
-
 mp_uint_t common_hal_keypad_keymatrix_key_num(keypad_keymatrix_obj_t *self, mp_uint_t row, mp_uint_t col) {
     return row_col_to_key_num(self, row, col);
 }
 
+mp_obj_t common_hal_keypad_keymatrix_get_events(keypad_keymatrix_obj_t *self) {
+    return MP_OBJ_FROM_PTR(self->events);
+}
+
 void keypad_keymatrix_scan(keypad_keymatrix_obj_t *self) {
     uint64_t now = port_get_raw_ticks(NULL);
     if (now - self->last_scan_ticks < DEBOUNCE_TICKS) {
@@ -166,13 +150,8 @@ void keypad_keymatrix_scan(keypad_keymatrix_obj_t *self) {
 
             // Record any transitions.
             if (previous != current) {
-                if (ringbuf_num_empty(&self->encoded_events) == 0) {
-                    // Discard oldest if full.
-                    ringbuf_get16(&self->encoded_events);
-                }
-                ringbuf_put16(&self->encoded_events, key_num | (current ? EVENT_PRESSED : EVENT_RELEASED));
+                keypad_eventqueue_record(self->events, key_num, current);
             }
-
         }
 
         // Switch the row back to an input, pulled up.
diff --git a/shared-module/keypad/KeyMatrix.h b/shared-module/keypad/KeyMatrix.h
index e25f23b0fc..253067890a 100644
--- a/shared-module/keypad/KeyMatrix.h
+++ b/shared-module/keypad/KeyMatrix.h
@@ -29,10 +29,10 @@
 
 #include "py/obj.h"
 #include "py/objtuple.h"
-#include "py/ringbuf.h"
 
 #include "common-hal/digitalio/DigitalInOut.h"
 #include "shared-module/keypad/__init__.h"
+#include "shared-module/keypad/EventQueue.h"
 
 typedef struct {
     mp_obj_base_t base;
@@ -43,7 +43,7 @@ typedef struct {
     uint64_t last_scan_ticks;
     bool *previously_pressed;
     bool *currently_pressed;
-    ringbuf_t encoded_events;
+    keypad_eventqueue_obj_t *events;
 } keypad_keymatrix_obj_t;
 
 void keypad_keymatrix_scan(keypad_keymatrix_obj_t *self);
diff --git a/shared-module/keypad/Keys.c b/shared-module/keypad/Keys.c
index bc8549b55b..19fd2acd5c 100644
--- a/shared-module/keypad/Keys.c
+++ b/shared-module/keypad/Keys.c
@@ -26,20 +26,15 @@
 
 #include "py/gc.h"
 #include "py/runtime.h"
-#include "shared-bindings/keypad/__init__.h"
-#include "shared-bindings/keypad/Event.h"
-#include "shared-bindings/keypad/Keys.h"
 #include "shared-bindings/digitalio/DigitalInOut.h"
+#include "shared-bindings/keypad/EventQueue.h"
+#include "shared-bindings/keypad/Keys.h"
+#include "shared-bindings/keypad/__init__.h"
 #include "supervisor/port.h"
 #include "supervisor/shared/tick.h"
 
 #define DEBOUNCE_TICKS (20)
 
-// Top bit of 16-bit event indicates pressed or released. Rest is key_num.
-#define EVENT_PRESSED (1 << 15)
-#define EVENT_RELEASED (0)
-#define EVENT_KEY_NUM_MASK (~EVENT_PRESSED)
-
 void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pins, mcu_pin_obj_t *pins[], bool value_when_pressed, bool pull, size_t max_events) {
     mp_obj_t dios[num_pins];
 
@@ -59,8 +54,10 @@ void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pin
     self->value_when_pressed = value_when_pressed;
     self->last_scan_ticks = port_get_raw_ticks(NULL);
 
-    // Event queue is 16-bit values.
-    ringbuf_alloc(&self->encoded_events, max_events * 2, false);
+    keypad_eventqueue_obj_t *events = m_new_obj(keypad_eventqueue_obj_t);
+    events->base.type = &keypad_eventqueue_type;
+    common_hal_keypad_eventqueue_construct(events, max_events);
+    self->events = events;
 
     // Add self to the list of active keypad scanners.
     keypad_register_scanner((keypad_scanner_obj_t *)self);
@@ -94,20 +91,8 @@ bool common_hal_keypad_keys_pressed(keypad_keys_obj_t *self, mp_uint_t key_num)
     return self->currently_pressed[key_num];
 }
 
-mp_obj_t common_hal_keypad_keys_next_event(keypad_keys_obj_t *self) {
-    int encoded_event = ringbuf_get16(&self->encoded_events);
-    if (encoded_event == -1) {
-        return MP_ROM_NONE;
-    }
-
-    keypad_event_obj_t *event = m_new_obj(keypad_event_obj_t);
-    event->base.type = &keypad_event_type;
-    common_hal_keypad_event_construct(event, encoded_event & EVENT_KEY_NUM_MASK, encoded_event & EVENT_PRESSED);
-    return MP_OBJ_FROM_PTR(event);
-}
-
-void common_hal_keypad_keys_clear_events(keypad_keys_obj_t *self) {
-    ringbuf_clear(&self->encoded_events);
+mp_obj_t common_hal_keypad_keys_get_events(keypad_keys_obj_t *self) {
+    return MP_OBJ_FROM_PTR(self->events);
 }
 
 void keypad_keys_scan(keypad_keys_obj_t *self) {
@@ -129,13 +114,10 @@ void keypad_keys_scan(keypad_keys_obj_t *self) {
             common_hal_digitalio_digitalinout_get_value(self->digitalinouts->items[key_num]) ==
             self->value_when_pressed;
         self->currently_pressed[key_num] = current;
+
         // Record any transitions.
         if (previous != current) {
-            if (ringbuf_num_empty(&self->encoded_events) == 0) {
-                // Discard oldest if full.
-                ringbuf_get16(&self->encoded_events);
-            }
-            ringbuf_put16(&self->encoded_events, key_num | (current ? EVENT_PRESSED : EVENT_RELEASED));
+            keypad_eventqueue_record(self->events, key_num, current);
         }
     }
 }
diff --git a/shared-module/keypad/Keys.h b/shared-module/keypad/Keys.h
index 03eb65d635..7aea31bc50 100644
--- a/shared-module/keypad/Keys.h
+++ b/shared-module/keypad/Keys.h
@@ -29,10 +29,10 @@
 
 #include "py/obj.h"
 #include "py/objtuple.h"
-#include "py/ringbuf.h"
 
 #include "common-hal/digitalio/DigitalInOut.h"
 #include "shared-module/keypad/__init__.h"
+#include "shared-module/keypad/EventQueue.h"
 
 typedef struct {
     mp_obj_base_t base;
@@ -42,7 +42,7 @@ typedef struct {
     uint64_t last_scan_ticks;
     bool *previously_pressed;
     bool *currently_pressed;
-    ringbuf_t encoded_events;
+    keypad_eventqueue_obj_t *events;
     bool value_when_pressed;
 } keypad_keys_obj_t;
 

From 8107c9b75bb5b4936fe68edaa6f65fb3de8904bc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 17 Jun 2021 12:22:18 +1000
Subject: [PATCH 251/349] extmod/nimble: Remove TODO comment about
 notify_custom freeing om.

The comments in NimBLE for ble_gattc_notify_custom() state that "This
function consumes the supplied mbuf regardless of the outcome.".  And
inspection of NimBLE code shows that this is the case.  So the comment can
be removed.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/nimble/modbluetooth_nimble.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index e3a2f872e5..f4b9ccb600 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -1030,7 +1030,6 @@ int mp_bluetooth_gatts_notify_send(uint16_t conn_handle, uint16_t value_handle,
     if (om == NULL) {
         return MP_ENOMEM;
     }
-    // TODO: check that notify_custom takes ownership of om, if not os_mbuf_free_chain(om).
     return ble_hs_err_to_errno(ble_gattc_notify_custom(conn_handle, value_handle, om));
 }
 

From 48437cec4547a21af73102c1ccdf079f63fff534 Mon Sep 17 00:00:00 2001
From: Tobias Eydam <eydam-prototyping@outlook.com>
Date: Sun, 18 Apr 2021 21:38:36 +0200
Subject: [PATCH 252/349] esp32/network_lan: Add Ethernet support for IDF v4.1
 and above.

Ethernet-PHYs from ESP-IDF (LAN8720, IP101, RTL8201, DP83848) are now
supported in IDF v4.1 and above.  PHY_KSZ8041 is only for ESP-IDF 4.3 and
above.  ESP32S2 is not supported.

Signed-off-by: Tobias Eydam <eydam-prototyping@outlook.com>
---
 ports/esp32/modnetwork.c  |  33 +++---
 ports/esp32/modnetwork.h  |   3 +-
 ports/esp32/network_lan.c | 239 ++++++++++++++++++++++++++------------
 3 files changed, 179 insertions(+), 96 deletions(-)

diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c
index f772fa2cf6..9a8d5b2e13 100644
--- a/ports/esp32/modnetwork.c
+++ b/ports/esp32/modnetwork.c
@@ -666,13 +666,6 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
                 case WIFI_IF_STA:
                     ESP_EXCEPTIONS(esp_wifi_get_mac(self->if_id, mac));
                     return mp_obj_new_bytes(mac, sizeof(mac));
-
-                #if !MICROPY_ESP_IDF_4
-                case ESP_IF_ETH:
-                    esp_eth_get_mac(mac);
-                    return mp_obj_new_bytes(mac, sizeof(mac));
-                #endif
-
                 default:
                     goto unknown;
             }
@@ -753,12 +746,12 @@ STATIC mp_obj_t esp_phy_mode(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_phy_mode_obj, 0, 1, esp_phy_mode);
 
-
 STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_network) },
     { MP_ROM_QSTR(MP_QSTR___init__), MP_ROM_PTR(&esp_initialize_obj) },
     { MP_ROM_QSTR(MP_QSTR_WLAN), MP_ROM_PTR(&get_wlan_obj) },
-    #if !MICROPY_ESP_IDF_4
+
+    #if (ESP_IDF_VERSION_MAJOR == 4) && (ESP_IDF_VERSION_MINOR >= 1) && (CONFIG_IDF_TARGET_ESP32)
     { MP_ROM_QSTR(MP_QSTR_LAN), MP_ROM_PTR(&get_lan_obj) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_PPP), MP_ROM_PTR(&ppp_make_new_obj) },
@@ -784,18 +777,22 @@ STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = {
     #endif
     { MP_ROM_QSTR(MP_QSTR_AUTH_MAX), MP_ROM_INT(WIFI_AUTH_MAX) },
 
+    #if (ESP_IDF_VERSION_MAJOR == 4) && (ESP_IDF_VERSION_MINOR >= 1) && (CONFIG_IDF_TARGET_ESP32)
     { MP_ROM_QSTR(MP_QSTR_PHY_LAN8720), MP_ROM_INT(PHY_LAN8720) },
-    { MP_ROM_QSTR(MP_QSTR_PHY_TLK110), MP_ROM_INT(PHY_TLK110) },
     { MP_ROM_QSTR(MP_QSTR_PHY_IP101), MP_ROM_INT(PHY_IP101) },
+    { MP_ROM_QSTR(MP_QSTR_PHY_RTL8201), MP_ROM_INT(PHY_RTL8201) },
+    { MP_ROM_QSTR(MP_QSTR_PHY_DP83848), MP_ROM_INT(PHY_DP83848) },
+    #if ESP_IDF_VERSION_MINOR >= 3
+    // PHY_KSZ8041 is new in ESP-IDF v4.3
+    { MP_ROM_QSTR(MP_QSTR_PHY_KSZ8041), MP_ROM_INT(PHY_KSZ8041) },
+    #endif
 
-    // ETH Clock modes from ESP-IDF
-    #if !MICROPY_ESP_IDF_4
-    { MP_ROM_QSTR(MP_QSTR_ETH_CLOCK_GPIO0_IN), MP_ROM_INT(ETH_CLOCK_GPIO0_IN) },
-    // Disabled at Aug 22nd 2018, reenabled Jan 28th 2019 in ESP-IDF
-    // Because we use older SDK, it's currently disabled
-    // { MP_ROM_QSTR(MP_QSTR_ETH_CLOCK_GPIO0_OUT), MP_ROM_INT(ETH_CLOCK_GPIO0_OUT) },
-    { MP_ROM_QSTR(MP_QSTR_ETH_CLOCK_GPIO16_OUT), MP_ROM_INT(ETH_CLOCK_GPIO16_OUT) },
-    { MP_ROM_QSTR(MP_QSTR_ETH_CLOCK_GPIO17_OUT), MP_ROM_INT(ETH_CLOCK_GPIO17_OUT) },
+    { MP_ROM_QSTR(MP_QSTR_ETH_INITIALIZED), MP_ROM_INT(ETH_INITIALIZED)},
+    { MP_ROM_QSTR(MP_QSTR_ETH_STARTED), MP_ROM_INT(ETH_STARTED)},
+    { MP_ROM_QSTR(MP_QSTR_ETH_STOPPED), MP_ROM_INT(ETH_STOPPED)},
+    { MP_ROM_QSTR(MP_QSTR_ETH_CONNECTED), MP_ROM_INT(ETH_CONNECTED)},
+    { MP_ROM_QSTR(MP_QSTR_ETH_DISCONNECTED), MP_ROM_INT(ETH_DISCONNECTED)},
+    { MP_ROM_QSTR(MP_QSTR_ETH_GOT_IP), MP_ROM_INT(ETH_GOT_IP)},
     #endif
 
     { MP_ROM_QSTR(MP_QSTR_STAT_IDLE), MP_ROM_INT(STAT_IDLE)},
diff --git a/ports/esp32/modnetwork.h b/ports/esp32/modnetwork.h
index db1b3d1300..be6aa67068 100644
--- a/ports/esp32/modnetwork.h
+++ b/ports/esp32/modnetwork.h
@@ -26,7 +26,8 @@
 #ifndef MICROPY_INCLUDED_ESP32_MODNETWORK_H
 #define MICROPY_INCLUDED_ESP32_MODNETWORK_H
 
-enum { PHY_LAN8720, PHY_TLK110, PHY_IP101 };
+enum { PHY_LAN8720, PHY_IP101, PHY_RTL8201, PHY_DP83848, PHY_KSZ8041 };
+enum { ETH_INITIALIZED, ETH_STARTED, ETH_STOPPED, ETH_CONNECTED, ETH_DISCONNECTED, ETH_GOT_IP };
 
 MP_DECLARE_CONST_FUN_OBJ_KW(get_lan_obj);
 MP_DECLARE_CONST_FUN_OBJ_1(ppp_make_new_obj);
diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index 7a4ad49e01..34e5cba258 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2017 "Eric Poulsen" <eric@zyxod.com>
+ * Copyright (c) 2021 "Tobias Eydam" <tobiaseydam@hotmail.com>
  *
  * Based on the ESP IDF example code which is Public Domain / CC0
  *
@@ -26,15 +27,19 @@
  * THE SOFTWARE.
  */
 
-#if !MICROPY_ESP_IDF_4
 #include "py/runtime.h"
 #include "py/mphal.h"
 
-#include "eth_phy/phy.h"
-#include "eth_phy/phy_tlk110.h"
-#include "eth_phy/phy_lan8720.h"
-#include "eth_phy/phy_ip101.h"
-#include "tcpip_adapter.h"
+#include "esp_idf_version.h"
+
+// LAN only for ESP32 (not ESP32S2) and only for ESP-IDF v4.1 and higher
+#if (ESP_IDF_VERSION_MAJOR == 4) && (ESP_IDF_VERSION_MINOR >= 1) && (CONFIG_IDF_TARGET_ESP32)
+
+#include "esp_eth.h"
+#include "esp_eth_mac.h"
+#include "esp_event.h"
+#include "esp_log.h"
+#include "esp_netif.h"
 
 #include "modnetwork.h"
 
@@ -48,47 +53,43 @@ typedef struct _lan_if_obj_t {
     int8_t phy_power_pin;
     uint8_t phy_addr;
     uint8_t phy_type;
-    eth_phy_check_link_func link_func;
-    eth_phy_power_enable_func power_func;
+    esp_eth_phy_t *phy;
+    esp_netif_t *eth_netif;
+    esp_eth_handle_t eth_handle;
 } lan_if_obj_t;
 
 const mp_obj_type_t lan_if_type;
 STATIC lan_if_obj_t lan_obj = {{&lan_if_type}, ESP_IF_ETH, false, false};
+STATIC uint8_t eth_status = 0;
 
-STATIC void phy_power_enable(bool enable) {
-    lan_if_obj_t *self = &lan_obj;
-
-    if (self->phy_power_pin != -1) {
-
-        if (!enable) {
-            // Do the PHY-specific power_enable(false) function before powering down
-            self->power_func(false);
-        }
-
-        gpio_pad_select_gpio(self->phy_power_pin);
-        gpio_set_direction(self->phy_power_pin, GPIO_MODE_OUTPUT);
-        if (enable) {
-            gpio_set_level(self->phy_power_pin, 1);
-        } else {
-            gpio_set_level(self->phy_power_pin, 0);
-        }
-
-        // Allow the power up/down to take effect, min 300us
-        vTaskDelay(1);
-
-        if (enable) {
-            // Run the PHY-specific power on operations now the PHY has power
-            self->power_func(true);
-        }
+static void eth_event_handler(void *arg, esp_event_base_t event_base,
+    int32_t event_id, void *event_data) {
+    switch (event_id) {
+        case ETHERNET_EVENT_CONNECTED:
+            eth_status = ETH_CONNECTED;
+            ESP_LOGI("ethernet", "Ethernet Link Up");
+            break;
+        case ETHERNET_EVENT_DISCONNECTED:
+            eth_status = ETH_DISCONNECTED;
+            ESP_LOGI("ethernet", "Ethernet Link Down");
+            break;
+        case ETHERNET_EVENT_START:
+            eth_status = ETH_STARTED;
+            ESP_LOGI("ethernet", "Ethernet Started");
+            break;
+        case ETHERNET_EVENT_STOP:
+            eth_status = ETH_STOPPED;
+            ESP_LOGI("ethernet", "Ethernet Stopped");
+            break;
+        case IP_EVENT_ETH_GOT_IP:
+            eth_status = ETH_GOT_IP;
+            ESP_LOGI("ethernet", "Ethernet Got IP");
+            break;
+        default:
+            break;
     }
 }
 
-STATIC void init_lan_rmii() {
-    lan_if_obj_t *self = &lan_obj;
-    phy_rmii_configure_data_interface_pins();
-    phy_rmii_smi_configure_pins(self->mdc_pin, self->mdio_pin);
-}
-
 STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     lan_if_obj_t *self = &lan_obj;
 
@@ -96,7 +97,7 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
         return MP_OBJ_FROM_PTR(&lan_obj);
     }
 
-    enum { ARG_id, ARG_mdc, ARG_mdio, ARG_power, ARG_phy_addr, ARG_phy_type, ARG_clock_mode };
+    enum { ARG_id, ARG_mdc, ARG_mdio, ARG_power, ARG_phy_addr, ARG_phy_type };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id,           MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_mdc,          MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ },
@@ -104,7 +105,6 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
         { MP_QSTR_power,        MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_phy_addr,     MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT },
         { MP_QSTR_phy_type,     MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT },
-        { MP_QSTR_clock_mode,   MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
     };
 
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -123,56 +123,91 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
     if (args[ARG_phy_addr].u_int < 0x00 || args[ARG_phy_addr].u_int > 0x1f) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid phy address"));
     }
+    self->phy_addr = args[ARG_phy_addr].u_int;
 
     if (args[ARG_phy_type].u_int != PHY_LAN8720 &&
-        args[ARG_phy_type].u_int != PHY_TLK110 &&
-        args[ARG_phy_type].u_int != PHY_IP101) {
+        args[ARG_phy_type].u_int != PHY_IP101 &&
+        args[ARG_phy_type].u_int != PHY_RTL8201 &&
+        #if ESP_IDF_VERSION_MINOR >= 3      // KSZ8041 is new in ESP-IDF v4.3
+        args[ARG_phy_type].u_int != PHY_KSZ8041 &&
+        #endif
+        args[ARG_phy_type].u_int != PHY_DP83848) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid phy type"));
     }
 
-    if (args[ARG_clock_mode].u_int != -1 &&
-        args[ARG_clock_mode].u_int != ETH_CLOCK_GPIO0_IN &&
-        // Disabled due ESP-IDF (see modnetwork.c note)
-        // args[ARG_clock_mode].u_int != ETH_CLOCK_GPIO0_OUT &&
-        args[ARG_clock_mode].u_int != ETH_CLOCK_GPIO16_OUT &&
-        args[ARG_clock_mode].u_int != ETH_CLOCK_GPIO17_OUT) {
-        mp_raise_ValueError(MP_ERROR_TEXT("invalid clock mode"));
-    }
+    eth_mac_config_t mac_config = ETH_MAC_DEFAULT_CONFIG();
+    mac_config.smi_mdc_gpio_num = self->mdc_pin;
+    mac_config.smi_mdio_gpio_num = self->mdio_pin;
+    esp_eth_mac_t *mac = esp_eth_mac_new_esp32(&mac_config);
 
-    eth_config_t config;
+    eth_phy_config_t phy_config = ETH_PHY_DEFAULT_CONFIG();
+    phy_config.phy_addr = self->phy_addr;
+    phy_config.reset_gpio_num = self->phy_power_pin;
+    self->phy = NULL;
 
     switch (args[ARG_phy_type].u_int) {
-        case PHY_TLK110:
-            config = phy_tlk110_default_ethernet_config;
-            break;
         case PHY_LAN8720:
-            config = phy_lan8720_default_ethernet_config;
+            self->phy = esp_eth_phy_new_lan8720(&phy_config);
             break;
         case PHY_IP101:
-            config = phy_ip101_default_ethernet_config;
+            self->phy = esp_eth_phy_new_ip101(&phy_config);
             break;
+        case PHY_RTL8201:
+            self->phy = esp_eth_phy_new_rtl8201(&phy_config);
+            break;
+        case PHY_DP83848:
+            self->phy = esp_eth_phy_new_dp83848(&phy_config);
+            break;
+        case PHY_KSZ8041:
+            #if ESP_IDF_VERSION_MINOR >= 3      // KSZ8041 is new in ESP-IDF v4.3
+            self->phy = esp_eth_phy_new_ksz8041(&phy_config);
+            break;
+            #endif
+        default:
+            mp_raise_ValueError(MP_ERROR_TEXT("unknown phy"));
     }
 
-    self->link_func = config.phy_check_link;
-
-    // Replace default power func with our own
-    self->power_func = config.phy_power_enable;
-    config.phy_power_enable = phy_power_enable;
-
-    config.phy_addr = args[ARG_phy_addr].u_int;
-    config.gpio_config = init_lan_rmii;
-    config.tcpip_input = tcpip_adapter_eth_input;
-
-    if (args[ARG_clock_mode].u_int != -1) {
-        config.clock_mode = args[ARG_clock_mode].u_int;
+    if (esp_netif_init() != ESP_OK) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("esp_netif_init failed"));
     }
 
-    if (esp_eth_init(&config) == ESP_OK) {
+    esp_netif_config_t cfg = ESP_NETIF_DEFAULT_ETH();
+    self->eth_netif = esp_netif_new(&cfg);
+
+    if (esp_eth_set_default_handlers(self->eth_netif) != ESP_OK) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("esp_eth_set_default_handlers failed (invalid parameter)"));
+    }
+
+    if (esp_event_handler_register(ETH_EVENT, ESP_EVENT_ANY_ID, &eth_event_handler, NULL) != ESP_OK) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("esp_event_handler_register failed"));
+    }
+
+    if (esp_event_handler_register(IP_EVENT, ESP_EVENT_ANY_ID, &eth_event_handler, NULL) != ESP_OK) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("esp_event_handler_register failed"));
+    }
+
+    esp_eth_config_t config = ETH_DEFAULT_CONFIG(mac, self->phy);
+
+    esp_err_t esp_err = esp_eth_driver_install(&config, &self->eth_handle);
+    if (esp_err == ESP_OK) {
         self->active = false;
         self->initialized = true;
     } else {
-        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("esp_eth_init() failed"));
+        if (esp_err == ESP_ERR_INVALID_ARG) {
+            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("esp_eth_driver_install failed with invalid argument"));
+        } else if (esp_err == ESP_ERR_NO_MEM) {
+            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("esp_eth_driver_install failed with no memory for driver"));
+        } else {
+            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("esp_eth_driver_install failed"));
+        }
     }
+
+    if (esp_netif_attach(self->eth_netif, esp_eth_new_netif_glue(self->eth_handle)) != ESP_OK) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("esp_netif_attach failed"));
+    }
+
+    eth_status = ETH_INITIALIZED;
+
     return MP_OBJ_FROM_PTR(&lan_obj);
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(get_lan_obj, 0, get_lan);
@@ -182,37 +217,87 @@ STATIC mp_obj_t lan_active(size_t n_args, const mp_obj_t *args) {
 
     if (n_args > 1) {
         if (mp_obj_is_true(args[1])) {
-            self->active = (esp_eth_enable() == ESP_OK);
+            self->active = (esp_eth_start(self->eth_handle) == ESP_OK);
             if (!self->active) {
                 mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("ethernet enable failed"));
             }
         } else {
-            self->active = !(esp_eth_disable() == ESP_OK);
+            self->active = !(esp_eth_stop(self->eth_handle) == ESP_OK);
             if (self->active) {
                 mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("ethernet disable failed"));
             }
         }
     }
+
     return mp_obj_new_bool(self->active);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(lan_active_obj, 1, 2, lan_active);
 
 STATIC mp_obj_t lan_status(mp_obj_t self_in) {
-    return mp_const_none;
+    return MP_OBJ_NEW_SMALL_INT(eth_status);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(lan_status_obj, lan_status);
 
 STATIC mp_obj_t lan_isconnected(mp_obj_t self_in) {
     lan_if_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return self->active ? mp_obj_new_bool(self->link_func()) : mp_const_false;
+    return self->active ? mp_obj_new_bool(self->phy->get_link(self->phy) == ETH_LINK_UP) : mp_const_false;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(lan_isconnected_obj, lan_isconnected);
 
+STATIC mp_obj_t lan_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    if (n_args != 1 && kwargs->used != 0) {
+        mp_raise_TypeError(MP_ERROR_TEXT("either pos or kw args are allowed"));
+    }
+    lan_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    #define QS(x) (uintptr_t)MP_OBJ_NEW_QSTR(x)
+
+    if (kwargs->used != 0) {
+
+        for (size_t i = 0; i < kwargs->alloc; i++) {
+            if (mp_map_slot_is_filled(kwargs, i)) {
+                switch ((uintptr_t)kwargs->table[i].key) {
+                    case QS(MP_QSTR_mac): {
+                        mp_buffer_info_t bufinfo;
+                        mp_get_buffer_raise(kwargs->table[i].value, &bufinfo, MP_BUFFER_READ);
+                        if (bufinfo.len != 6) {
+                            mp_raise_ValueError(MP_ERROR_TEXT("invalid buffer length"));
+                        }
+                        esp_eth_ioctl(self->eth_handle, ETH_CMD_S_MAC_ADDR, bufinfo.buf);
+                        break;
+                    }
+                    default:
+                        break;
+                }
+            }
+        }
+        return mp_const_none;
+    }
+
+    if (n_args != 2) {
+        mp_raise_TypeError(MP_ERROR_TEXT("can query only one param"));
+    }
+
+    mp_obj_t val = mp_const_none;
+
+    switch ((uintptr_t)args[1]) {
+        case QS(MP_QSTR_mac): {
+            uint8_t mac[6];
+            esp_eth_ioctl(self->eth_handle, ETH_CMD_G_MAC_ADDR, mac);
+            return mp_obj_new_bytes(mac, sizeof(mac));
+        }
+        default:
+            mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
+    }
+
+    return val;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(lan_config_obj, 1, lan_config);
+
 STATIC const mp_rom_map_elem_t lan_if_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_active), MP_ROM_PTR(&lan_active_obj) },
     { MP_ROM_QSTR(MP_QSTR_isconnected), MP_ROM_PTR(&lan_isconnected_obj) },
     { MP_ROM_QSTR(MP_QSTR_status), MP_ROM_PTR(&lan_status_obj) },
-    { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&esp_config_obj) },
+    { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&lan_config_obj) },
     { MP_ROM_QSTR(MP_QSTR_ifconfig), MP_ROM_PTR(&esp_ifconfig_obj) },
 };
 
@@ -224,4 +309,4 @@ const mp_obj_type_t lan_if_type = {
     .locals_dict = (mp_obj_dict_t *)&lan_if_locals_dict,
 };
 
-#endif // !MICROPY_ESP_IDF_4
+#endif

From 060066804a4543e79c0bdc60a1221bb8628982e9 Mon Sep 17 00:00:00 2001
From: Thomas Wenrich <twenrich@gmail.com>
Date: Sun, 13 Jun 2021 16:22:49 +0200
Subject: [PATCH 253/349] esp32/modnetwork: Add "reconnects" option to WLAN STA
 interface.

This adds a wlan.config(reconnects=N) option to set the number of reconnect
attempts that will be made if the WLAN connection goes down.  The default
is N=-1 (infinite retries, current behavior).  Setting
wlan.config(reconnects=0) will disable the reconnect attempts.

A nice side effect of reconnects=0 is that wlan.status() will report the
disconnect reason now.  See related issue #5326.
---
 ports/esp32/modnetwork.c | 44 ++++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c
index 9a8d5b2e13..e2bd20a1a9 100644
--- a/ports/esp32/modnetwork.c
+++ b/ports/esp32/modnetwork.c
@@ -142,12 +142,16 @@ static uint8_t wifi_sta_disconn_reason = 0;
 static bool mdns_initialised = false;
 #endif
 
+static uint8_t conf_wifi_sta_reconnects = 0;
+static uint8_t wifi_sta_reconnects;
+
 // This function is called by the system-event task and so runs in a different
 // thread to the main MicroPython task.  It must not raise any Python exceptions.
 static esp_err_t event_handler(void *ctx, system_event_t *event) {
     switch (event->event_id) {
         case SYSTEM_EVENT_STA_START:
             ESP_LOGI("wifi", "STA_START");
+            wifi_sta_reconnects = 0;
             break;
         case SYSTEM_EVENT_STA_CONNECTED:
             ESP_LOGI("network", "CONNECTED");
@@ -199,15 +203,23 @@ static esp_err_t event_handler(void *ctx, system_event_t *event) {
             wifi_sta_connected = false;
             if (wifi_sta_connect_requested) {
                 wifi_mode_t mode;
-                if (esp_wifi_get_mode(&mode) == ESP_OK) {
-                    if (mode & WIFI_MODE_STA) {
-                        // STA is active so attempt to reconnect.
-                        esp_err_t e = esp_wifi_connect();
-                        if (e != ESP_OK) {
-                            ESP_LOGI("wifi", "error attempting to reconnect: 0x%04x", e);
-                        }
+                if (esp_wifi_get_mode(&mode) != ESP_OK) {
+                    break;
+                }
+                if (!(mode & WIFI_MODE_STA)) {
+                    break;
+                }
+                if (conf_wifi_sta_reconnects) {
+                    ESP_LOGI("wifi", "reconnect counter=%d, max=%d",
+                        wifi_sta_reconnects, conf_wifi_sta_reconnects);
+                    if (++wifi_sta_reconnects >= conf_wifi_sta_reconnects) {
+                        break;
                     }
                 }
+                esp_err_t e = esp_wifi_connect();
+                if (e != ESP_OK) {
+                    ESP_LOGI("wifi", "error attempting to reconnect: 0x%04x", e);
+                }
             }
             break;
         }
@@ -361,6 +373,7 @@ STATIC mp_obj_t esp_connect(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
         ESP_EXCEPTIONS(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_sta_config));
     }
 
+    wifi_sta_reconnects = 0;
     // connect to the WiFi AP
     MP_THREAD_GIL_EXIT();
     ESP_EXCEPTIONS(esp_wifi_connect());
@@ -395,7 +408,9 @@ STATIC mp_obj_t esp_status(size_t n_args, const mp_obj_t *args) {
             if (wifi_sta_connected) {
                 // Happy path, connected with IP
                 return MP_OBJ_NEW_SMALL_INT(STAT_GOT_IP);
-            } else if (wifi_sta_connect_requested) {
+            } else if (wifi_sta_connect_requested
+                       && (conf_wifi_sta_reconnects == 0
+                           || wifi_sta_reconnects < conf_wifi_sta_reconnects)) {
                 // No connection or error, but is requested = Still connecting
                 return MP_OBJ_NEW_SMALL_INT(STAT_CONNECTING);
             } else if (wifi_sta_disconn_reason == 0) {
@@ -633,6 +648,14 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
                         cfg.ap.max_connection = mp_obj_get_int(kwargs->table[i].value);
                         break;
                     }
+                    case QS(MP_QSTR_reconnects): {
+                        int reconnects = mp_obj_get_int(kwargs->table[i].value);
+                        req_if = WIFI_IF_STA;
+                        // parameter reconnects == -1 means to retry forever.
+                        // here means conf_wifi_sta_reconnects == 0 to retry forever.
+                        conf_wifi_sta_reconnects = (reconnects == -1) ? 0 : reconnects + 1;
+                        break;
+                    }
                     default:
                         goto unknown;
                 }
@@ -704,6 +727,11 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
             val = MP_OBJ_NEW_SMALL_INT(cfg.ap.max_connection);
             break;
         }
+        case QS(MP_QSTR_reconnects):
+            req_if = WIFI_IF_STA;
+            int rec = conf_wifi_sta_reconnects - 1;
+            val = MP_OBJ_NEW_SMALL_INT(rec);
+            break;
         default:
             goto unknown;
     }

From 364670ecf10b2f31e9a207bc440cfb731dcfa603 Mon Sep 17 00:00:00 2001
From: Thomas Wenrich <twenrich@gmail.com>
Date: Sun, 13 Jun 2021 16:23:53 +0200
Subject: [PATCH 254/349] docs/esp32: Document WLAN "reconnects" config option.

---
 docs/esp32/quickref.rst       | 8 ++++++++
 docs/library/network.WLAN.rst | 1 +
 2 files changed, 9 insertions(+)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 1709891265..77c7027c40 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -102,6 +102,14 @@ Once the network is established the :mod:`socket <usocket>` module can be used
 to create and use TCP/UDP sockets as usual, and the ``urequests`` module for
 convenient HTTP requests.
 
+After a call to ``wlan.connect()``, the device will by default retry to connect
+**forever**, even when the authentication failed or no AP is in range.
+``wlan.status()`` will return ``network.STAT_CONNECTING`` in this state until a
+connection succeeds or the interface gets disabled.  This can be changed by
+calling ``wlan.config(reconnects=n)``, where n are the number of desired reconnect
+attempts (0 means it won't retry, -1 will restore the default behaviour of trying
+to reconnect forever).
+
 Delay and timing
 ----------------
 
diff --git a/docs/library/network.WLAN.rst b/docs/library/network.WLAN.rst
index fcdaa41b36..88bd3a3707 100644
--- a/docs/library/network.WLAN.rst
+++ b/docs/library/network.WLAN.rst
@@ -129,4 +129,5 @@ Methods
    authmode       Authentication mode supported (enumeration, see module constants)
    password       Access password (string)
    dhcp_hostname  The DHCP hostname to use
+   reconnects     Number of reconnect attempts to make (integer, 0=none, -1=unlimited)
    =============  ===========

From 89945b1989dfa412e263389ea837aa6ad64fc596 Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Wed, 16 Jun 2021 13:31:46 +0100
Subject: [PATCH 255/349] esp32/machine_hw_spi: Allow None for unused pins in
 initializer.

Make the hardware SPI initializer method match the `init()` method by
allowing `None` to be given for `sck`/`mosi`/`miso` to specify an unused
signal.
---
 ports/esp32/machine_hw_spi.c | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index a49a58035a..98c0abaefd 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -411,6 +411,32 @@ mp_obj_t machine_hw_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_
     }
     self->base.type = &machine_hw_spi_type;
 
+    int8_t sck, mosi, miso;
+
+    if (args[ARG_sck].u_obj == MP_OBJ_NULL) {
+        sck = default_pins->sck;
+    } else if (args[ARG_sck].u_obj == mp_const_none) {
+        sck = -1;
+    } else {
+        sck = machine_pin_get_id(args[ARG_sck].u_obj);
+    }
+
+    if (args[ARG_mosi].u_obj == MP_OBJ_NULL) {
+        mosi = default_pins->mosi;
+    } else if (args[ARG_mosi].u_obj == mp_const_none) {
+        mosi = -1;
+    } else {
+        mosi = machine_pin_get_id(args[ARG_mosi].u_obj);
+    }
+
+    if (args[ARG_miso].u_obj == MP_OBJ_NULL) {
+        miso = default_pins->miso;
+    } else if (args[ARG_miso].u_obj == mp_const_none) {
+        miso = -1;
+    } else {
+        miso = machine_pin_get_id(args[ARG_miso].u_obj);
+    }
+
     machine_hw_spi_init_internal(
         self,
         args[ARG_id].u_int,
@@ -419,9 +445,9 @@ mp_obj_t machine_hw_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_
         args[ARG_phase].u_int,
         args[ARG_bits].u_int,
         args[ARG_firstbit].u_int,
-        args[ARG_sck].u_obj == MP_OBJ_NULL ? default_pins->sck : machine_pin_get_id(args[ARG_sck].u_obj),
-        args[ARG_mosi].u_obj == MP_OBJ_NULL ? default_pins->mosi : machine_pin_get_id(args[ARG_mosi].u_obj),
-        args[ARG_miso].u_obj == MP_OBJ_NULL ? default_pins->miso : machine_pin_get_id(args[ARG_miso].u_obj));
+        sck,
+        mosi,
+        miso);
 
     return MP_OBJ_FROM_PTR(self);
 }

From bc7822d8e95c40a9d5e403fd22c82b1bbad53b8b Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Thu, 17 Jun 2021 12:49:14 +1000
Subject: [PATCH 256/349] drivers/display/ssd1306.py: Add support for 72x40
 displays.

The 72x40 OLED requires selecting the internal IREF, as opposed to the
default external IREF.  This is an undocumented feature in the SSD1306
datasheet, but is present in the SSD1315 datasheet.  It's possible the
72x40 OLED is actually using the newer SSD1315 controller.  Sending the
IREF select command to SSD1306 displays has no effect on them, so it's
added to the init_display() instead of wrapping in an "if width = 72".

Also tested on a 128x64 OLED using the SSD1315 controller (smaller ribbon
cable) and the proposed change has no effect on the display, as the module
comes with the correct current limiting resistor.  Internal and external
IREF work the same.

Fixes issue #7281.
---
 drivers/display/ssd1306.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/display/ssd1306.py b/drivers/display/ssd1306.py
index 85e2bf0cb5..a504cdadcc 100644
--- a/drivers/display/ssd1306.py
+++ b/drivers/display/ssd1306.py
@@ -15,6 +15,7 @@ SET_PAGE_ADDR = const(0x22)
 SET_DISP_START_LINE = const(0x40)
 SET_SEG_REMAP = const(0xA0)
 SET_MUX_RATIO = const(0xA8)
+SET_IREF_SELECT = const(0xAD)
 SET_COM_OUT_DIR = const(0xC0)
 SET_DISP_OFFSET = const(0xD3)
 SET_COM_PIN_CFG = const(0xDA)
@@ -63,6 +64,8 @@ class SSD1306(framebuf.FrameBuffer):
             0xFF,  # maximum
             SET_ENTIRE_ON,  # output follows RAM contents
             SET_NORM_INV,  # not inverted
+            SET_IREF_SELECT,
+            0x30,  # enable internal IREF during display on
             # charge pump
             SET_CHARGE_PUMP,
             0x10 if self.external_vcc else 0x14,
@@ -92,10 +95,11 @@ class SSD1306(framebuf.FrameBuffer):
     def show(self):
         x0 = 0
         x1 = self.width - 1
-        if self.width == 64:
-            # displays with width of 64 pixels are shifted by 32
-            x0 += 32
-            x1 += 32
+        if self.width != 128:
+            # narrow displays use centred columns
+            col_offset = (128 - self.width) // 2
+            x0 += col_offset
+            x1 += col_offset
         self.write_cmd(SET_COL_ADDR)
         self.write_cmd(x0)
         self.write_cmd(x1)

From a152bd3b72814497462949187a6dec7040699e09 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Thu, 17 Jun 2021 12:02:54 -0400
Subject: [PATCH 257/349] add .num_keys and .store_states() to Keys and
 KeyMatrix

---
 locale/circuitpython.pot           |  8 +++
 shared-bindings/keypad/KeyMatrix.c | 88 +++++++++++++++++++++++-------
 shared-bindings/keypad/KeyMatrix.h |  7 ++-
 shared-bindings/keypad/Keys.c      | 63 ++++++++++++++++++---
 shared-bindings/keypad/Keys.h      |  3 +-
 shared-module/keypad/KeyMatrix.c   | 27 ++++++---
 shared-module/keypad/Keys.c        | 16 +++++-
 shared-module/keypad/__init__.c    |  2 +-
 shared-module/keypad/__init__.h    |  3 +
 9 files changed, 172 insertions(+), 45 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index d2c2dbe8b4..f9aa9aab52 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -83,6 +83,10 @@ msgstr ""
 msgid "%q indices must be integers, not %s"
 msgstr ""
 
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+msgid "%q length must be %q"
+msgstr ""
+
 #: shared-bindings/vectorio/Polygon.c
 msgid "%q list must be a list"
 msgstr ""
@@ -120,6 +124,10 @@ msgstr ""
 msgid "%q must be a tuple of length 2"
 msgstr ""
 
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+msgid "%q must store bytes"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c shared-bindings/keypad/KeyMatrix.c
 #: shared-bindings/keypad/Keys.c
diff --git a/shared-bindings/keypad/KeyMatrix.c b/shared-bindings/keypad/KeyMatrix.c
index 75e434ac3e..d63bfdc0b3 100644
--- a/shared-bindings/keypad/KeyMatrix.c
+++ b/shared-bindings/keypad/KeyMatrix.c
@@ -25,6 +25,7 @@
  */
 
 #include "lib/utils/context_manager_helpers.h"
+#include "py/binary.h"
 #include "py/objproperty.h"
 #include "py/runtime.h"
 #include "shared-bindings/keypad/Event.h"
@@ -136,25 +137,22 @@ STATIC void check_for_deinit(keypad_keymatrix_obj_t *self) {
     }
 }
 
-
-//|     def pressed(self, key_num: int) -> None:
-//|         """Return ``True`` if the given key is pressed. This is a debounced read
-//|         of the key state which bypasses the `events` `EventQueue`.
-//|         """
-//|         ...
+//|     num_keys: int
+//|     """The number of keys that are being scanned. (read-only)
+//|     """
 //|
-STATIC mp_obj_t keypad_keymatrix_pressed(mp_obj_t self_in, mp_obj_t key_num_in) {
+STATIC mp_obj_t keypad_keymatrix_get_num_keys(mp_obj_t self_in) {
     keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-
-    mp_int_t key_num = mp_obj_get_int(key_num_in);
-    if (key_num < 0 || (size_t)key_num >= common_hal_keypad_keymatrix_num_keys(self)) {
-        mp_raise_ValueError_varg(translate("%q out of range"), MP_QSTR_key_num);
-    }
-
-    return mp_obj_new_bool(common_hal_keypad_keymatrix_pressed(self, (mp_uint_t)key_num));
+    return MP_OBJ_NEW_SMALL_INT(common_hal_keypad_keymatrix_get_num_keys(self));
 }
-MP_DEFINE_CONST_FUN_OBJ_2(keypad_keymatrix_pressed_obj, keypad_keymatrix_pressed);
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_keymatrix_get_num_keys_obj, keypad_keymatrix_get_num_keys);
+
+const mp_obj_property_t keypad_keymatrix_num_keys_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&keypad_keymatrix_get_num_keys_obj,
+              MP_ROM_NONE,
+              MP_ROM_NONE},
+};
 
 //|     def key_num(self, row: int, col: int) -> int:
 //|         """Return the key number for a given row and column.
@@ -167,12 +165,12 @@ STATIC mp_obj_t keypad_keymatrix_key_num(mp_obj_t self_in, mp_obj_t row_in, mp_o
     check_for_deinit(self);
 
     const mp_int_t row = mp_obj_get_int(row_in);
-    if (row < 0 || (size_t)row >= common_hal_keypad_keymatrix_num_rows(self)) {
+    if (row < 0 || (size_t)row >= common_hal_keypad_keymatrix_get_num_rows(self)) {
         mp_raise_ValueError_varg(translate("%q out of range"), MP_QSTR_row_num);
     }
 
     const mp_int_t col = mp_obj_get_int(col_in);
-    if (col < 0 || (size_t)col >= common_hal_keypad_keymatrix_num_cols(self)) {
+    if (col < 0 || (size_t)col >= common_hal_keypad_keymatrix_get_num_cols(self)) {
         mp_raise_ValueError_varg(translate("%q out of range"), MP_QSTR_col_num);
     }
 
@@ -181,6 +179,52 @@ STATIC mp_obj_t keypad_keymatrix_key_num(mp_obj_t self_in, mp_obj_t row_in, mp_o
 }
 MP_DEFINE_CONST_FUN_OBJ_3(keypad_keymatrix_key_num_obj, keypad_keymatrix_key_num);
 
+//|     def pressed(self, key_num: int) -> None:
+//|         """Return ``True`` if the given key is pressed. This is a debounced read
+//|         of the key state which bypasses the `events` `EventQueue`.
+//|         """
+//|         ...
+//|
+STATIC mp_obj_t keypad_keymatrix_pressed(mp_obj_t self_in, mp_obj_t key_num_in) {
+    keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+
+    mp_int_t key_num = mp_obj_get_int(key_num_in);
+    if (key_num < 0 || (size_t)key_num >= common_hal_keypad_keymatrix_get_num_keys(self)) {
+        mp_raise_ValueError_varg(translate("%q out of range"), MP_QSTR_key_num);
+    }
+
+    return mp_obj_new_bool(common_hal_keypad_keymatrix_pressed(self, (mp_uint_t)key_num));
+}
+MP_DEFINE_CONST_FUN_OBJ_2(keypad_keymatrix_pressed_obj, keypad_keymatrix_pressed);
+
+//|     def store_states(self, states: _typing.WriteableBuffer) -> None:
+//|         """Write the state of all the keys into ``states``.
+//|         Write a ``1`` if pressed, and ``0`` if released.
+//|         The ``length`` of ``states`` must be `num_keys`.
+//|         This is a debounced read of the state of all the keys, and bypasses the `events` `EventQueue`.
+//|         The read is done atomically.
+//|         """
+//|         ...
+//|
+STATIC mp_obj_t keypad_keymatrix_store_states(mp_obj_t self_in, mp_obj_t pressed) {
+    keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(pressed, &bufinfo, MP_BUFFER_WRITE);
+    if (bufinfo.typecode != 'b' && bufinfo.typecode != 'B' && bufinfo.typecode != BYTEARRAY_TYPECODE) {
+        mp_raise_ValueError_varg(translate("%q must store bytes"), MP_QSTR_states);
+    }
+    if (bufinfo.len != common_hal_keypad_keymatrix_get_num_keys(self)) {
+        mp_raise_ValueError_varg(translate("%q length must be %q"), MP_QSTR_states, MP_QSTR_num_keys);
+    }
+
+    common_hal_keypad_keymatrix_store_states(self, (uint8_t *)bufinfo.buf);
+    return MP_ROM_NONE;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(keypad_keymatrix_store_states_obj, keypad_keymatrix_store_states);
+
 //|     events: EventQueue
 //|     """The `EventQueue` associated with this `Keys` object. (read-only)
 //|     """
@@ -199,13 +243,15 @@ const mp_obj_property_t keypad_keymatrix_events_obj = {
 };
 
 STATIC const mp_rom_map_elem_t keypad_keymatrix_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_deinit),      MP_ROM_PTR(&keypad_keymatrix_deinit_obj) },
-    { MP_ROM_QSTR(MP_QSTR___enter__),   MP_ROM_PTR(&default___enter___obj) },
-    { MP_ROM_QSTR(MP_QSTR___exit__),    MP_ROM_PTR(&keypad_keymatrix___exit___obj) },
+    { MP_ROM_QSTR(MP_QSTR_deinit),       MP_ROM_PTR(&keypad_keymatrix_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR___enter__),    MP_ROM_PTR(&default___enter___obj) },
+    { MP_ROM_QSTR(MP_QSTR___exit__),     MP_ROM_PTR(&keypad_keymatrix___exit___obj) },
 
     { MP_ROM_QSTR(MP_QSTR_events),       MP_ROM_PTR(&keypad_keymatrix_events_obj) },
     { MP_ROM_QSTR(MP_QSTR_key_num),      MP_ROM_PTR(&keypad_keymatrix_key_num_obj) },
+    { MP_ROM_QSTR(MP_QSTR_num_keys),     MP_ROM_PTR(&keypad_keymatrix_num_keys_obj) },
     { MP_ROM_QSTR(MP_QSTR_pressed),      MP_ROM_PTR(&keypad_keymatrix_pressed_obj) },
+    { MP_ROM_QSTR(MP_QSTR_store_states), MP_ROM_PTR(&keypad_keymatrix_store_states_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(keypad_keymatrix_locals_dict, keypad_keymatrix_locals_dict_table);
diff --git a/shared-bindings/keypad/KeyMatrix.h b/shared-bindings/keypad/KeyMatrix.h
index d6a2cbb074..24ac405a82 100644
--- a/shared-bindings/keypad/KeyMatrix.h
+++ b/shared-bindings/keypad/KeyMatrix.h
@@ -39,11 +39,12 @@ bool common_hal_keypad_keymatrix_deinited(keypad_keymatrix_obj_t *self);
 
 mp_uint_t common_hal_keypad_keymatrix_key_num(keypad_keymatrix_obj_t *self, mp_uint_t row, mp_uint_t col);
 
-mp_uint_t common_hal_keypad_keymatrix_num_keys(keypad_keymatrix_obj_t *self);
-mp_uint_t common_hal_keypad_keymatrix_num_cols(keypad_keymatrix_obj_t *self);
-mp_uint_t common_hal_keypad_keymatrix_num_rows(keypad_keymatrix_obj_t *self);
+mp_uint_t common_hal_keypad_keymatrix_get_num_keys(keypad_keymatrix_obj_t *self);
+mp_uint_t common_hal_keypad_keymatrix_get_num_cols(keypad_keymatrix_obj_t *self);
+mp_uint_t common_hal_keypad_keymatrix_get_num_rows(keypad_keymatrix_obj_t *self);
 
 mp_obj_t common_hal_keypad_keymatrix_get_events(keypad_keymatrix_obj_t *self);
 bool common_hal_keypad_keymatrix_pressed(keypad_keymatrix_obj_t *self, mp_uint_t key_num);
+void common_hal_keypad_keymatrix_store_states(keypad_keymatrix_obj_t *self, uint8_t *states);
 
 #endif  // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_KEYMATRIX_H
diff --git a/shared-bindings/keypad/Keys.c b/shared-bindings/keypad/Keys.c
index 35a9c0e09b..ccbe034f3c 100644
--- a/shared-bindings/keypad/Keys.c
+++ b/shared-bindings/keypad/Keys.c
@@ -25,6 +25,7 @@
  */
 
 #include "lib/utils/context_manager_helpers.h"
+#include "py/binary.h"
 #include "py/objproperty.h"
 #include "py/runtime.h"
 #include "shared-bindings/keypad/Event.h"
@@ -135,9 +136,26 @@ STATIC void check_for_deinit(keypad_keys_obj_t *self) {
     }
 }
 
+//|     num_keys: int
+//|     """The number of keys that are being scanned. (read-only)
+//|     """
+//|
+STATIC mp_obj_t keypad_keys_get_num_keys(mp_obj_t self_in) {
+    keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_keypad_keys_get_num_keys(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_keys_get_num_keys_obj, keypad_keys_get_num_keys);
+
+const mp_obj_property_t keypad_keys_num_keys_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&keypad_keys_get_num_keys_obj,
+              MP_ROM_NONE,
+              MP_ROM_NONE},
+};
+
 //|     def pressed(self, key_num: int) -> None:
-//|         """Return ``True`` if the given key is pressed. This is a debounced read
-//|         of the key state which bypasses the `events` `EventQueue`.
+//|         """Return ``True`` if the given key is pressed.
+//          This is a debounced read of the key state which bypasses the `events` `EventQueue`.
 //|         """
 //|         ...
 //|
@@ -146,7 +164,7 @@ STATIC mp_obj_t keypad_keys_pressed(mp_obj_t self_in, mp_obj_t key_num_in) {
     check_for_deinit(self);
 
     mp_int_t key_num = mp_obj_get_int(key_num_in);
-    if (key_num < 0 || (size_t)key_num >= common_hal_keypad_keys_num_keys(self)) {
+    if (key_num < 0 || (size_t)key_num >= common_hal_keypad_keys_get_num_keys(self)) {
         mp_raise_ValueError_varg(translate("%q out of range"), MP_QSTR_key_num);
     }
 
@@ -154,6 +172,33 @@ STATIC mp_obj_t keypad_keys_pressed(mp_obj_t self_in, mp_obj_t key_num_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(keypad_keys_pressed_obj, keypad_keys_pressed);
 
+//|     def store_states(self, states: _typing.WriteableBuffer) -> None:
+//|         """Write the states of all the keys into ``states``.
+//|         Write a ``1`` if pressed, and ``0`` if released.
+//|         The ``length`` of ``states`` must be `num_keys`.
+//|         This is a debounced read of the state of all the keys, and bypasses the `events` `EventQueue`.
+//|         The read is done atomically.
+//|         """
+//|         ...
+//|
+STATIC mp_obj_t keypad_keys_store_states(mp_obj_t self_in, mp_obj_t pressed) {
+    keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(pressed, &bufinfo, MP_BUFFER_WRITE);
+    if (bufinfo.typecode != 'b' && bufinfo.typecode != 'B' && bufinfo.typecode != BYTEARRAY_TYPECODE) {
+        mp_raise_ValueError_varg(translate("%q must store bytes"), MP_QSTR_pressed);
+    }
+    if (bufinfo.len != common_hal_keypad_keys_get_num_keys(self)) {
+        mp_raise_ValueError_varg(translate("%q length must be %q"), MP_QSTR_pressed, MP_QSTR_num_keys);
+    }
+
+    common_hal_keypad_keys_store_states(self, (uint8_t *)bufinfo.buf);
+    return MP_ROM_NONE;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(keypad_keys_store_states_obj, keypad_keys_store_states);
+
 //|     events: EventQueue
 //|     """The `EventQueue` associated with this `Keys` object. (read-only)
 //|     """
@@ -172,12 +217,14 @@ const mp_obj_property_t keypad_keys_events_obj = {
 };
 
 STATIC const mp_rom_map_elem_t keypad_keys_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_deinit),    MP_ROM_PTR(&keypad_keys_deinit_obj) },
-    { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) },
-    { MP_ROM_QSTR(MP_QSTR___exit__),  MP_ROM_PTR(&keypad_keys___exit___obj) },
+    { MP_ROM_QSTR(MP_QSTR_deinit),       MP_ROM_PTR(&keypad_keys_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR___enter__),    MP_ROM_PTR(&default___enter___obj) },
+    { MP_ROM_QSTR(MP_QSTR___exit__),     MP_ROM_PTR(&keypad_keys___exit___obj) },
 
-    { MP_ROM_QSTR(MP_QSTR_events),    MP_ROM_PTR(&keypad_keys_events_obj) },
-    { MP_ROM_QSTR(MP_QSTR_pressed),   MP_ROM_PTR(&keypad_keys_pressed_obj) },
+    { MP_ROM_QSTR(MP_QSTR_events),       MP_ROM_PTR(&keypad_keys_events_obj) },
+    { MP_ROM_QSTR(MP_QSTR_num_keys),     MP_ROM_PTR(&keypad_keys_num_keys_obj) },
+    { MP_ROM_QSTR(MP_QSTR_pressed),      MP_ROM_PTR(&keypad_keys_pressed_obj) },
+    { MP_ROM_QSTR(MP_QSTR_store_states), MP_ROM_PTR(&keypad_keys_store_states_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(keypad_keys_locals_dict, keypad_keys_locals_dict_table);
diff --git a/shared-bindings/keypad/Keys.h b/shared-bindings/keypad/Keys.h
index 81fc36d3cb..edcf0b2b03 100644
--- a/shared-bindings/keypad/Keys.h
+++ b/shared-bindings/keypad/Keys.h
@@ -38,7 +38,8 @@ void common_hal_keypad_keys_deinit(keypad_keys_obj_t *self);
 bool common_hal_keypad_keys_deinited(keypad_keys_obj_t *self);
 
 mp_obj_t common_hal_keypad_keys_get_events(keypad_keys_obj_t *self);
-mp_uint_t common_hal_keypad_keys_num_keys(keypad_keys_obj_t *self);
+mp_uint_t common_hal_keypad_keys_get_num_keys(keypad_keys_obj_t *self);
 bool common_hal_keypad_keys_pressed(keypad_keys_obj_t *self, mp_uint_t key_num);
+void common_hal_keypad_keys_store_states(keypad_keys_obj_t *self, uint8_t *states);
 
 #endif  // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_KEYS_H
diff --git a/shared-module/keypad/KeyMatrix.c b/shared-module/keypad/KeyMatrix.c
index 441f78a448..bd72b4a940 100644
--- a/shared-module/keypad/KeyMatrix.c
+++ b/shared-module/keypad/KeyMatrix.c
@@ -24,6 +24,8 @@
  * THE SOFTWARE.
  */
 
+#include <string.h>
+
 #include "py/gc.h"
 #include "py/runtime.h"
 #include "shared-bindings/digitalio/DigitalInOut.h"
@@ -84,12 +86,12 @@ void common_hal_keypad_keymatrix_deinit(keypad_keymatrix_obj_t *self) {
     // Remove self from the list of active keypad scanners first.
     keypad_deregister_scanner((keypad_scanner_obj_t *)self);
 
-    for (size_t row = 0; row < common_hal_keypad_keymatrix_num_rows(self); row++) {
+    for (size_t row = 0; row < common_hal_keypad_keymatrix_get_num_rows(self); row++) {
         common_hal_digitalio_digitalinout_deinit(self->row_digitalinouts->items[row]);
     }
     self->row_digitalinouts = MP_ROM_NONE;
 
-    for (size_t col = 0; col < common_hal_keypad_keymatrix_num_cols(self); col++) {
+    for (size_t col = 0; col < common_hal_keypad_keymatrix_get_num_cols(self); col++) {
         common_hal_digitalio_digitalinout_deinit(self->col_digitalinouts->items[col]);
     }
     self->col_digitalinouts = MP_ROM_NONE;
@@ -99,21 +101,30 @@ bool common_hal_keypad_keymatrix_deinited(keypad_keymatrix_obj_t *self) {
     return self->row_digitalinouts == MP_ROM_NONE;
 }
 
-size_t common_hal_keypad_keymatrix_num_keys(keypad_keymatrix_obj_t *self) {
-    return common_hal_keypad_keymatrix_num_rows(self) * common_hal_keypad_keymatrix_num_cols(self);
+size_t common_hal_keypad_keymatrix_get_num_keys(keypad_keymatrix_obj_t *self) {
+    return common_hal_keypad_keymatrix_get_num_rows(self) * common_hal_keypad_keymatrix_get_num_cols(self);
 }
 
-size_t common_hal_keypad_keymatrix_num_rows(keypad_keymatrix_obj_t *self) {
+size_t common_hal_keypad_keymatrix_get_num_rows(keypad_keymatrix_obj_t *self) {
     return self->row_digitalinouts->len;
 }
 
-size_t common_hal_keypad_keymatrix_num_cols(keypad_keymatrix_obj_t *self) {
+size_t common_hal_keypad_keymatrix_get_num_cols(keypad_keymatrix_obj_t *self) {
     return self->col_digitalinouts->len;
 }
 
 bool common_hal_keypad_keymatrix_pressed(keypad_keymatrix_obj_t *self, mp_uint_t key_num) {
     return self->currently_pressed[key_num];
 }
+
+// The length of states has already been validated.
+void common_hal_keypad_keymatrix_store_states(keypad_keymatrix_obj_t *self, uint8_t *states) {
+    // Read the state atomically.
+    supervisor_acquire_lock(&keypad_scanners_linked_list_lock);
+    memcpy(states, self->currently_pressed, common_hal_keypad_keymatrix_get_num_keys(self));
+    supervisor_release_lock(&keypad_scanners_linked_list_lock);
+}
+
 mp_uint_t common_hal_keypad_keymatrix_key_num(keypad_keymatrix_obj_t *self, mp_uint_t row, mp_uint_t col) {
     return row_col_to_key_num(self, row, col);
 }
@@ -132,12 +143,12 @@ void keypad_keymatrix_scan(keypad_keymatrix_obj_t *self) {
     self->last_scan_ticks = now;
 
     // On entry, all pins are set to inputs with a pull-up.
-    for (size_t row = 0; row < common_hal_keypad_keymatrix_num_rows(self); row++) {
+    for (size_t row = 0; row < common_hal_keypad_keymatrix_get_num_rows(self); row++) {
         // Switch this row to an output and set to low.
         common_hal_digitalio_digitalinout_switch_to_output(
             self->row_digitalinouts->items[row], false, DRIVE_MODE_PUSH_PULL);
 
-        for (size_t col = 0; col < common_hal_keypad_keymatrix_num_cols(self); col++) {
+        for (size_t col = 0; col < common_hal_keypad_keymatrix_get_num_cols(self); col++) {
             mp_uint_t key_num = row_col_to_key_num(self, row, col);
             const bool previous = self->currently_pressed[key_num];
             self->previously_pressed[key_num] = previous;
diff --git a/shared-module/keypad/Keys.c b/shared-module/keypad/Keys.c
index 19fd2acd5c..f8e897c719 100644
--- a/shared-module/keypad/Keys.c
+++ b/shared-module/keypad/Keys.c
@@ -24,6 +24,8 @@
  * THE SOFTWARE.
  */
 
+#include <string.h>
+
 #include "py/gc.h"
 #include "py/runtime.h"
 #include "shared-bindings/digitalio/DigitalInOut.h"
@@ -73,7 +75,7 @@ void common_hal_keypad_keys_deinit(keypad_keys_obj_t *self) {
     // Remove self from the list of active keypad scanners first.
     keypad_deregister_scanner((keypad_scanner_obj_t *)self);
 
-    for (size_t key = 0; key < common_hal_keypad_keys_num_keys(self); key++) {
+    for (size_t key = 0; key < common_hal_keypad_keys_get_num_keys(self); key++) {
         common_hal_digitalio_digitalinout_deinit(self->digitalinouts->items[key]);
     }
     self->digitalinouts = MP_ROM_NONE;
@@ -84,13 +86,21 @@ bool common_hal_keypad_keys_deinited(keypad_keys_obj_t *self) {
     return self->digitalinouts == MP_ROM_NONE;
 }
 
-size_t common_hal_keypad_keys_num_keys(keypad_keys_obj_t *self) {
+size_t common_hal_keypad_keys_get_num_keys(keypad_keys_obj_t *self) {
     return self->digitalinouts->len;
 }
 bool common_hal_keypad_keys_pressed(keypad_keys_obj_t *self, mp_uint_t key_num) {
     return self->currently_pressed[key_num];
 }
 
+// The length of states has already been validated.
+void common_hal_keypad_keys_store_states(keypad_keys_obj_t *self, uint8_t *states) {
+    // Read the state atomically.
+    supervisor_acquire_lock(&keypad_scanners_linked_list_lock);
+    memcpy(states, self->currently_pressed, common_hal_keypad_keys_get_num_keys(self));
+    supervisor_release_lock(&keypad_scanners_linked_list_lock);
+}
+
 mp_obj_t common_hal_keypad_keys_get_events(keypad_keys_obj_t *self) {
     return MP_OBJ_FROM_PTR(self->events);
 }
@@ -104,7 +114,7 @@ void keypad_keys_scan(keypad_keys_obj_t *self) {
 
     self->last_scan_ticks = now;
 
-    for (mp_uint_t key_num = 0; key_num < common_hal_keypad_keys_num_keys(self); key_num++) {
+    for (mp_uint_t key_num = 0; key_num < common_hal_keypad_keys_get_num_keys(self); key_num++) {
         // Remember the previous up/down state.
         const bool previous = self->currently_pressed[key_num];
         self->previously_pressed[key_num] = previous;
diff --git a/shared-module/keypad/__init__.c b/shared-module/keypad/__init__.c
index f29f126c3f..4cfa011bad 100644
--- a/shared-module/keypad/__init__.c
+++ b/shared-module/keypad/__init__.c
@@ -29,7 +29,7 @@
 #include "supervisor/shared/lock.h"
 #include "supervisor/shared/tick.h"
 
-static supervisor_lock_t keypad_scanners_linked_list_lock;
+supervisor_lock_t keypad_scanners_linked_list_lock;
 
 void keypad_tick(void) {
     // Fast path. Return immediately if there are no scanners.
diff --git a/shared-module/keypad/__init__.h b/shared-module/keypad/__init__.h
index de89c310a5..c5b8fe3a0a 100644
--- a/shared-module/keypad/__init__.h
+++ b/shared-module/keypad/__init__.h
@@ -28,6 +28,7 @@
 #define SHARED_MODULE_KEYPAD_H
 
 #include "py/obj.h"
+#include "supervisor/shared/lock.h"
 
 // All scanners must have a next field immediately following base.
 // This is an ad hoc "superclass" struct for scanners, though they do
@@ -37,6 +38,8 @@ typedef struct _keypad_scanner_obj_t {
     struct _keypad_scanner_obj_t *next;
 } keypad_scanner_obj_t;
 
+extern supervisor_lock_t keypad_scanners_linked_list_lock;
+
 void keypad_tick(void);
 void keypad_reset(void);
 

From 04b69cde9b7c7caec170a402b9131bde3812d562 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Thu, 17 Jun 2021 13:46:45 -0400
Subject: [PATCH 258/349] turn off gamepad on most builds;turn off keypad where
 appropriate

---
 ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.mk   | 1 -
 ports/atmel-samd/boards/pycubed/mpconfigboard.mk                | 2 +-
 ports/atmel-samd/boards/pycubed_mram/mpconfigboard.mk           | 2 +-
 .../boards/winterbloom_big_honking_button/mpconfigboard.mk      | 1 -
 ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk        | 1 -
 ports/nrf/boards/simmel/mpconfigboard.mk                        | 2 +-
 py/circuitpy_mpconfig.mk                                        | 2 +-
 7 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.mk
index 300419fa19..d7230df4bb 100644
--- a/ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.mk
@@ -12,7 +12,6 @@ LONGINT_IMPL = NONE
 
 # To keep the build small
 CIRCUITPY_AUDIOBUSIO = 0
-CIRCUITPY_GAMEPAD = 0
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH
diff --git a/ports/atmel-samd/boards/pycubed/mpconfigboard.mk b/ports/atmel-samd/boards/pycubed/mpconfigboard.mk
index 1eb3cd5239..bbed46dbed 100644
--- a/ports/atmel-samd/boards/pycubed/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pycubed/mpconfigboard.mk
@@ -16,8 +16,8 @@ CIRCUITPY_DRIVE_LABEL = "PYCUBED"
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_BITMAPTOOLS = 0
 CIRCUITPY_DISPLAYIO = 0
+CIRCUITPY_KEYPAD = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
-CIRCUITPY_GAMEPAD = 0
 CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_PS2IO = 0
 
diff --git a/ports/atmel-samd/boards/pycubed_mram/mpconfigboard.mk b/ports/atmel-samd/boards/pycubed_mram/mpconfigboard.mk
index 0c459c309c..ccf3050d11 100644
--- a/ports/atmel-samd/boards/pycubed_mram/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pycubed_mram/mpconfigboard.mk
@@ -17,7 +17,7 @@ CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_BITMAPTOOLS = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
-CIRCUITPY_GAMEPAD = 0
+CIRCUITPY_KEYPAD = 0
 CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_PS2IO = 0
 
diff --git a/ports/atmel-samd/boards/winterbloom_big_honking_button/mpconfigboard.mk b/ports/atmel-samd/boards/winterbloom_big_honking_button/mpconfigboard.mk
index 1c96e1d235..7364de0cfe 100644
--- a/ports/atmel-samd/boards/winterbloom_big_honking_button/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/winterbloom_big_honking_button/mpconfigboard.mk
@@ -22,7 +22,6 @@ CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_BLEIO = 0
 CIRCUITPY_DISPLAYIO = 0
-CIRCUITPY_GAMEPAD = 0
 CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_TOUCHIO = 0
 CIRCUITPY_RGBMATRIX = 0
diff --git a/ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk b/ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk
index 81956a0b80..bc4fff5018 100644
--- a/ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk
@@ -21,7 +21,6 @@ CIRCUITPY_BITMAPTOOLS = 0
 CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
-CIRCUITPY_GAMEPAD = 0
 CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_TOUCHIO = 0
 CIRCUITPY_RGBMATRIX = 0
diff --git a/ports/nrf/boards/simmel/mpconfigboard.mk b/ports/nrf/boards/simmel/mpconfigboard.mk
index e235fd1051..57f83fd3d2 100644
--- a/ports/nrf/boards/simmel/mpconfigboard.mk
+++ b/ports/nrf/boards/simmel/mpconfigboard.mk
@@ -20,7 +20,7 @@ CIRCUITPY_COUNTIO = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_ERRNO = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
-CIRCUITPY_GAMEPAD = 0
+CIRCUITPY_KEYPAD = 0
 CIRCUITPY_MSGPACK = 0
 CIRCUITPY_NEOPIXEL_WRITE = 0
 CIRCUITPY_NVM = 0
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 9c9e84321e..f4075f0d5a 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -184,7 +184,7 @@ CFLAGS += -DCIRCUITPY__EVE=$(CIRCUITPY__EVE)
 CIRCUITPY_FREQUENCYIO ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_FREQUENCYIO=$(CIRCUITPY_FREQUENCYIO)
 
-CIRCUITPY_GAMEPAD ?= $(CIRCUITPY_FULL_BUILD)
+CIRCUITPY_GAMEPAD ?= 0
 CFLAGS += -DCIRCUITPY_GAMEPAD=$(CIRCUITPY_GAMEPAD)
 
 CIRCUITPY_GAMEPADSHIFT ?= 0

From 4eb13c50cd87eff8374b9bffc3d7c15b1bf5e35f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 18 Jun 2021 00:14:21 +1000
Subject: [PATCH 259/349] esp32/machine_sdcard: Use deinit_p to deinit SD bus
 in SPI mode.

Fixes issue #7352.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/machine_sdcard.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/machine_sdcard.c b/ports/esp32/machine_sdcard.c
index c9a9face7c..3f70311f74 100644
--- a/ports/esp32/machine_sdcard.c
+++ b/ports/esp32/machine_sdcard.c
@@ -256,7 +256,14 @@ STATIC mp_obj_t sd_deinit(mp_obj_t self_in) {
     DEBUG_printf("De-init host\n");
 
     if (self->flags & SDCARD_CARD_FLAGS_HOST_INIT_DONE) {
-        self->host.deinit();
+        #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 2, 0)
+        if (self->host.flags & SDMMC_HOST_FLAG_DEINIT_ARG) {
+            self->host.deinit_p(self->host.slot);
+        } else
+        #endif
+        {
+            self->host.deinit();
+        }
         self->flags &= ~SDCARD_CARD_FLAGS_HOST_INIT_DONE;
     }
 

From af66931f71355f04b3383d5715e15f580a038439 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Thu, 17 Jun 2021 20:51:30 -0400
Subject: [PATCH 260/349] Added keypad.ShiftRegisterKeys

---
 py/circuitpy_defns.mk                      |   1 +
 shared-bindings/keypad/ShiftRegisterKeys.c | 239 +++++++++++++++++++++
 shared-bindings/keypad/ShiftRegisterKeys.h |  45 ++++
 shared-bindings/keypad/__init__.c          |  16 +-
 shared-module/keypad/ShiftRegisterKeys.c   | 157 ++++++++++++++
 shared-module/keypad/ShiftRegisterKeys.h   |  54 +++++
 shared-module/keypad/__init__.c            |   5 +-
 7 files changed, 510 insertions(+), 7 deletions(-)
 create mode 100644 shared-bindings/keypad/ShiftRegisterKeys.c
 create mode 100644 shared-bindings/keypad/ShiftRegisterKeys.h
 create mode 100644 shared-module/keypad/ShiftRegisterKeys.c
 create mode 100644 shared-module/keypad/ShiftRegisterKeys.h

diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index aa06434368..9756329ac5 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -519,6 +519,7 @@ SRC_SHARED_MODULE_ALL = \
 	keypad/Event.c \
 	keypad/EventQueue.c \
 	keypad/KeyMatrix.c \
+	keypad/ShiftRegisterKeys.c \
 	keypad/Keys.c \
 	sdcardio/SDCard.c \
 	sdcardio/__init__.c \
diff --git a/shared-bindings/keypad/ShiftRegisterKeys.c b/shared-bindings/keypad/ShiftRegisterKeys.c
new file mode 100644
index 0000000000..31e0baf2f1
--- /dev/null
+++ b/shared-bindings/keypad/ShiftRegisterKeys.c
@@ -0,0 +1,239 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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 "lib/utils/context_manager_helpers.h"
+#include "py/binary.h"
+#include "py/objproperty.h"
+#include "py/runtime.h"
+#include "shared-bindings/keypad/Event.h"
+#include "shared-bindings/keypad/ShiftRegisterKeys.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared-bindings/util.h"
+
+//| class ShiftRegisterKeys:
+//|     """Manage a set of keys attached to an incoming shift register."""
+//|
+//|     def __init__(self, clock: microcontroller.Pin, data: microcontroller.Pin, latch: microcontroller.Pin, level_when_pressed: bool, max_events: int = 64) -> None:
+//|         """
+//|         Create a `Keys` object that will scan keys attached to a parallel-in serial-out shift register
+//|         like the 74HC165 or equivalent.
+//|         Note that you may chain shift registers to load in as many values as you need.
+//|
+//|         Key number 0 is the first (or more properly, the zero-th) bit read. In the
+//|         74HC165, this bit is labeled ``Q7``. Key number 1 will be the value of ``Q6``, etc.
+//|
+//|         An `EventQueue` is created when this object is created and is available in the `events` attribute.
+//|
+//|         The keys are debounced by waiting about 20 msecs before reporting a transition.
+//|
+//|         :param microcontroller.Pin clock: The shift register clock pin.
+//|           The shift register should clock on a low-to-high transition.
+//|         :param microcontroller.Pin data: the incoming shift register data pin
+//|         :param microcontroller.Pin latch:
+//|           Pin used to trigger loading parallel data pins into the shift register.
+//|           Active low: pull low to load the data.
+//|         :param int num_keys: number of data lines to clock in
+//|         :param bool value_when_pressed: ``True`` if the pin reads high when the key is pressed.
+//|           ``False`` if the pin reads low (is grounded) when the key is pressed.
+//|         :param int max_events: maximum size of `events` `EventQueue`:
+//|           maximum number of key transition events that are saved.
+//|           Must be >= 1.
+//|           If a new event arrives when the queue is full, the oldest event is discarded.
+//|         """
+//|         ...
+
+STATIC mp_obj_t keypad_shiftregisterkeys_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    keypad_shiftregisterkeys_obj_t *self = m_new_obj(keypad_shiftregisterkeys_obj_t);
+    self->base.type = &keypad_shiftregisterkeys_type;
+    enum { ARG_clock, ARG_data, ARG_latch, ARG_num_keys, ARG_value_when_pressed, ARG_max_events };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_clock, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_data, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_latch, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_num_keys, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT },
+        { MP_QSTR_value_when_pressed, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_BOOL },
+        { MP_QSTR_max_events, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 64} },
+    };
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    mcu_pin_obj_t *clock = validate_obj_is_free_pin(args[ARG_clock].u_obj);
+    mcu_pin_obj_t *data = validate_obj_is_free_pin(args[ARG_data].u_obj);
+    mcu_pin_obj_t *latch = validate_obj_is_free_pin(args[ARG_latch].u_obj);
+
+    if (args[ARG_num_keys].u_int < 1) {
+        mp_raise_ValueError_varg(translate("%q must be >= 1"), MP_QSTR_num_keys);
+    }
+    const size_t num_keys = (size_t)args[ARG_num_keys].u_int;
+
+    const bool value_when_pressed = args[ARG_value_when_pressed].u_bool;
+
+    if (args[ARG_max_events].u_int < 1) {
+        mp_raise_ValueError_varg(translate("%q must be >= 1"), MP_QSTR_max_events);
+    }
+    const size_t max_events = (size_t)args[ARG_max_events].u_int;
+
+    common_hal_keypad_shiftregisterkeys_construct(
+        self, clock, data, latch, num_keys, value_when_pressed, max_events);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+//|     def deinit(self) -> None:
+//|         """Stop scanning and release the pins."""
+//|         ...
+//|
+STATIC mp_obj_t keypad_shiftregisterkeys_deinit(mp_obj_t self_in) {
+    keypad_shiftregisterkeys_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    common_hal_keypad_shiftregisterkeys_deinit(self);
+    return MP_ROM_NONE;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_shiftregisterkeys_deinit_obj, keypad_shiftregisterkeys_deinit);
+
+//|     def __enter__(self) -> Keys:
+//|         """No-op used by Context Managers."""
+//|         ...
+//|
+//  Provided by context manager helper.
+
+//|     def __exit__(self) -> None:
+//|         """Automatically deinitializes when exiting a context. See
+//|         :ref:`lifetime-and-contextmanagers` for more info."""
+//|         ...
+//|
+STATIC mp_obj_t keypad_shiftregisterkeys___exit__(size_t n_args, const mp_obj_t *args) {
+    (void)n_args;
+    common_hal_keypad_shiftregisterkeys_deinit(args[0]);
+    return MP_ROM_NONE;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(keypad_shiftregisterkeys___exit___obj, 4, 4, keypad_shiftregisterkeys___exit__);
+
+STATIC void check_for_deinit(keypad_shiftregisterkeys_obj_t *self) {
+    if (common_hal_keypad_shiftregisterkeys_deinited(self)) {
+        raise_deinited_error();
+    }
+}
+
+//|     num_keys: int
+//|     """The number of keys that are being scanned. (read-only)
+//|     """
+//|
+STATIC mp_obj_t keypad_shiftregisterkeys_get_num_keys(mp_obj_t self_in) {
+    keypad_shiftregisterkeys_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_keypad_shiftregisterkeys_get_num_keys(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_shiftregisterkeys_get_num_keys_obj, keypad_shiftregisterkeys_get_num_keys);
+
+const mp_obj_property_t keypad_shiftregisterkeys_num_keys_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&keypad_shiftregisterkeys_get_num_keys_obj,
+              MP_ROM_NONE,
+              MP_ROM_NONE},
+};
+
+//|     def pressed(self, key_num: int) -> None:
+//|         """Return ``True`` if the given key is pressed.
+//          This is a debounced read of the key state which bypasses the `events` `EventQueue`.
+//|         """
+//|         ...
+//|
+STATIC mp_obj_t keypad_shiftregisterkeys_pressed(mp_obj_t self_in, mp_obj_t key_num_in) {
+    keypad_shiftregisterkeys_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+
+    mp_int_t key_num = mp_obj_get_int(key_num_in);
+    if (key_num < 0 || (size_t)key_num >= common_hal_keypad_shiftregisterkeys_get_num_keys(self)) {
+        mp_raise_ValueError_varg(translate("%q out of range"), MP_QSTR_key_num);
+    }
+
+    return mp_obj_new_bool(common_hal_keypad_shiftregisterkeys_pressed(self, (mp_uint_t)key_num));
+}
+MP_DEFINE_CONST_FUN_OBJ_2(keypad_shiftregisterkeys_pressed_obj, keypad_shiftregisterkeys_pressed);
+
+//|     def store_states(self, states: _typing.WriteableBuffer) -> None:
+//|         """Write the states of all the keys into ``states``.
+//|         Write a ``1`` if pressed, and ``0`` if released.
+//|         The ``length`` of ``states`` must be `num_keys`.
+//|         This is a debounced read of the state of all the keys, and bypasses the `events` `EventQueue`.
+//|         The read is done atomically.
+//|         """
+//|         ...
+//|
+STATIC mp_obj_t keypad_shiftregisterkeys_store_states(mp_obj_t self_in, mp_obj_t pressed) {
+    keypad_shiftregisterkeys_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(pressed, &bufinfo, MP_BUFFER_WRITE);
+    if (bufinfo.typecode != 'b' && bufinfo.typecode != 'B' && bufinfo.typecode != BYTEARRAY_TYPECODE) {
+        mp_raise_ValueError_varg(translate("%q must store bytes"), MP_QSTR_pressed);
+    }
+    if (bufinfo.len != common_hal_keypad_shiftregisterkeys_get_num_keys(self)) {
+        mp_raise_ValueError_varg(translate("%q length must be %q"), MP_QSTR_pressed, MP_QSTR_num_keys);
+    }
+
+    common_hal_keypad_shiftregisterkeys_store_states(self, (uint8_t *)bufinfo.buf);
+    return MP_ROM_NONE;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(keypad_shiftregisterkeys_store_states_obj, keypad_shiftregisterkeys_store_states);
+
+//|     events: EventQueue
+//|     """The `EventQueue` associated with this `Keys` object. (read-only)
+//|     """
+//|
+STATIC mp_obj_t keypad_shiftregisterkeys_get_events(mp_obj_t self_in) {
+    keypad_shiftregisterkeys_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return common_hal_keypad_shiftregisterkeys_get_events(self);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_shiftregisterkeys_get_events_obj, keypad_shiftregisterkeys_get_events);
+
+const mp_obj_property_t keypad_shiftregisterkeys_events_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&keypad_shiftregisterkeys_get_events_obj,
+              MP_ROM_NONE,
+              MP_ROM_NONE},
+};
+
+STATIC const mp_rom_map_elem_t keypad_shiftregisterkeys_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_deinit),       MP_ROM_PTR(&keypad_shiftregisterkeys_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR___enter__),    MP_ROM_PTR(&default___enter___obj) },
+    { MP_ROM_QSTR(MP_QSTR___exit__),     MP_ROM_PTR(&keypad_shiftregisterkeys___exit___obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_events),       MP_ROM_PTR(&keypad_shiftregisterkeys_events_obj) },
+    { MP_ROM_QSTR(MP_QSTR_num_keys),     MP_ROM_PTR(&keypad_shiftregisterkeys_num_keys_obj) },
+    { MP_ROM_QSTR(MP_QSTR_pressed),      MP_ROM_PTR(&keypad_shiftregisterkeys_pressed_obj) },
+    { MP_ROM_QSTR(MP_QSTR_store_states), MP_ROM_PTR(&keypad_shiftregisterkeys_store_states_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(keypad_shiftregisterkeys_locals_dict, keypad_shiftregisterkeys_locals_dict_table);
+
+const mp_obj_type_t keypad_shiftregisterkeys_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_ShiftRegisterKeys,
+    .make_new = keypad_shiftregisterkeys_make_new,
+    .locals_dict = (mp_obj_t)&keypad_shiftregisterkeys_locals_dict,
+};
diff --git a/shared-bindings/keypad/ShiftRegisterKeys.h b/shared-bindings/keypad/ShiftRegisterKeys.h
new file mode 100644
index 0000000000..6fb6dc94f4
--- /dev/null
+++ b/shared-bindings/keypad/ShiftRegisterKeys.h
@@ -0,0 +1,45 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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_KEYPAD_SHIFTREGISTERKEYS_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_SHIFTREGISTERKEYS_H
+
+#include "py/objlist.h"
+#include "shared-module/keypad/ShiftRegisterKeys.h"
+
+extern const mp_obj_type_t keypad_shiftregisterkeys_type;
+
+void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_t *self, mcu_pin_obj_t *clock_pin, mcu_pin_obj_t *data_pin, mcu_pin_obj_t *latch_pin, size_t num_keys, bool value_when_pressed, size_t max_events);
+
+void common_hal_keypad_shiftregisterkeys_deinit(keypad_shiftregisterkeys_obj_t *self);
+bool common_hal_keypad_shiftregisterkeys_deinited(keypad_shiftregisterkeys_obj_t *self);
+
+mp_obj_t common_hal_keypad_shiftregisterkeys_get_events(keypad_shiftregisterkeys_obj_t *self);
+mp_uint_t common_hal_keypad_shiftregisterkeys_get_num_keys(keypad_shiftregisterkeys_obj_t *self);
+bool common_hal_keypad_shiftregisterkeys_pressed(keypad_shiftregisterkeys_obj_t *self, mp_uint_t key_num);
+void common_hal_keypad_shiftregisterkeys_store_states(keypad_shiftregisterkeys_obj_t *self, uint8_t *states);
+
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_SHIFTREGISTERKEYS_H
diff --git a/shared-bindings/keypad/__init__.c b/shared-bindings/keypad/__init__.c
index 5f6177576e..30d3dd49f0 100644
--- a/shared-bindings/keypad/__init__.c
+++ b/shared-bindings/keypad/__init__.c
@@ -31,20 +31,24 @@
 #include "shared-bindings/keypad/EventQueue.h"
 #include "shared-bindings/keypad/KeyMatrix.h"
 #include "shared-bindings/keypad/Keys.h"
+#include "shared-bindings/keypad/ShiftRegisterKeys.h"
 
 //| """Support for scanning keys and key matrices
 //|
 //| The `keypad` module provides native support to scan sets of keys or buttons,
-//| connected independently to individual pins, or connected in a row-and-column matrix.
+//| connected independently to individual pins,
+//| connected to a shift register,
+//| or connected in a row-and-column matrix.
 //| """
 //|
 
 STATIC mp_map_elem_t keypad_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__),   MP_OBJ_NEW_QSTR(MP_QSTR_keypad) },
-    { MP_ROM_QSTR(MP_QSTR_Event),      MP_OBJ_FROM_PTR(&keypad_event_type) },
-    { MP_ROM_QSTR(MP_QSTR_EventQueue), MP_OBJ_FROM_PTR(&keypad_eventqueue_type) },
-    { MP_ROM_QSTR(MP_QSTR_KeyMatrix),  MP_OBJ_FROM_PTR(&keypad_keymatrix_type) },
-    { MP_ROM_QSTR(MP_QSTR_Keys),       MP_OBJ_FROM_PTR(&keypad_keys_type) },
+    { MP_ROM_QSTR(MP_QSTR___name__),          MP_OBJ_NEW_QSTR(MP_QSTR_keypad) },
+    { MP_ROM_QSTR(MP_QSTR_Event),             MP_OBJ_FROM_PTR(&keypad_event_type) },
+    { MP_ROM_QSTR(MP_QSTR_EventQueue),        MP_OBJ_FROM_PTR(&keypad_eventqueue_type) },
+    { MP_ROM_QSTR(MP_QSTR_KeyMatrix),         MP_OBJ_FROM_PTR(&keypad_keymatrix_type) },
+    { MP_ROM_QSTR(MP_QSTR_Keys),              MP_OBJ_FROM_PTR(&keypad_keys_type) },
+    { MP_ROM_QSTR(MP_QSTR_ShiftRegisterKeys), MP_OBJ_FROM_PTR(&keypad_shiftregisterkeys_type) },
 };
 
 STATIC MP_DEFINE_MUTABLE_DICT(keypad_module_globals, keypad_module_globals_table);
diff --git a/shared-module/keypad/ShiftRegisterKeys.c b/shared-module/keypad/ShiftRegisterKeys.c
new file mode 100644
index 0000000000..0e9ce48555
--- /dev/null
+++ b/shared-module/keypad/ShiftRegisterKeys.c
@@ -0,0 +1,157 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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 <string.h>
+
+#include "py/gc.h"
+#include "py/runtime.h"
+#include "shared-bindings/digitalio/DigitalInOut.h"
+#include "shared-bindings/keypad/EventQueue.h"
+#include "shared-bindings/keypad/ShiftRegisterKeys.h"
+#include "shared-bindings/keypad/__init__.h"
+#include "supervisor/port.h"
+#include "supervisor/shared/tick.h"
+
+#define DEBOUNCE_TICKS (20)
+
+void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_t *self, mcu_pin_obj_t *clock_pin, mcu_pin_obj_t *data_pin, mcu_pin_obj_t *latch_pin, size_t num_keys, bool value_when_pressed, size_t max_events) {
+
+    digitalio_digitalinout_obj_t *clock = m_new_obj(digitalio_digitalinout_obj_t);
+    clock->base.type = &digitalio_digitalinout_type;
+    common_hal_digitalio_digitalinout_construct(clock, clock_pin);
+    common_hal_digitalio_digitalinout_switch_to_output(clock, false, DRIVE_MODE_PUSH_PULL);
+    self->clock = clock;
+
+    digitalio_digitalinout_obj_t *data = m_new_obj(digitalio_digitalinout_obj_t);
+    data->base.type = &digitalio_digitalinout_type;
+    common_hal_digitalio_digitalinout_construct(data, data_pin);
+    common_hal_digitalio_digitalinout_switch_to_input(data, PULL_NONE);
+    self->data = data;
+
+    digitalio_digitalinout_obj_t *latch = m_new_obj(digitalio_digitalinout_obj_t);
+    latch->base.type = &digitalio_digitalinout_type;
+    common_hal_digitalio_digitalinout_construct(latch, latch_pin);
+    common_hal_digitalio_digitalinout_switch_to_output(latch, true, DRIVE_MODE_PUSH_PULL);
+    self->latch = latch;
+
+    self->currently_pressed = (bool *)gc_alloc(sizeof(bool) * num_keys, false, false);
+    self->previously_pressed = (bool *)gc_alloc(sizeof(bool) * num_keys, false, false);
+    self->value_when_pressed = value_when_pressed;
+    self->num_keys = num_keys;
+
+    self->last_scan_ticks = port_get_raw_ticks(NULL);
+
+    keypad_eventqueue_obj_t *events = m_new_obj(keypad_eventqueue_obj_t);
+    events->base.type = &keypad_eventqueue_type;
+    common_hal_keypad_eventqueue_construct(events, max_events);
+    self->events = events;
+
+    // Add self to the list of active keypad scanners.
+    keypad_register_scanner((keypad_scanner_obj_t *)self);
+
+    supervisor_enable_tick();
+}
+
+void common_hal_keypad_shiftregisterkeys_deinit(keypad_shiftregisterkeys_obj_t *self) {
+    if (common_hal_keypad_shiftregisterkeys_deinited(self)) {
+        return;
+    }
+
+    // Remove self from the list of active keypad scanners first.
+    keypad_deregister_scanner((keypad_scanner_obj_t *)self);
+
+
+    common_hal_digitalio_digitalinout_deinit(self->clock);
+    self->clock = MP_ROM_NONE;
+
+    common_hal_digitalio_digitalinout_deinit(self->data);
+    self->data = MP_ROM_NONE;
+
+    common_hal_digitalio_digitalinout_deinit(self->latch);
+    self->latch = MP_ROM_NONE;
+}
+
+bool common_hal_keypad_shiftregisterkeys_deinited(keypad_shiftregisterkeys_obj_t *self) {
+    return self->clock == MP_ROM_NONE;
+}
+
+size_t common_hal_keypad_shiftregisterkeys_get_num_keys(keypad_shiftregisterkeys_obj_t *self) {
+    return self->num_keys;
+}
+bool common_hal_keypad_shiftregisterkeys_pressed(keypad_shiftregisterkeys_obj_t *self, mp_uint_t key_num) {
+    return self->currently_pressed[key_num];
+}
+
+// The length of states has already been validated.
+void common_hal_keypad_shiftregisterkeys_store_states(keypad_shiftregisterkeys_obj_t *self, uint8_t *states) {
+    // Read the state atomically.
+    supervisor_acquire_lock(&keypad_scanners_linked_list_lock);
+    memcpy(states, self->currently_pressed, common_hal_keypad_shiftregisterkeys_get_num_keys(self));
+    supervisor_release_lock(&keypad_scanners_linked_list_lock);
+}
+
+mp_obj_t common_hal_keypad_shiftregisterkeys_get_events(keypad_shiftregisterkeys_obj_t *self) {
+    return MP_OBJ_FROM_PTR(self->events);
+}
+
+void keypad_shiftregisterkeys_scan(keypad_shiftregisterkeys_obj_t *self) {
+    uint64_t now = port_get_raw_ticks(NULL);
+    if (now - self->last_scan_ticks < DEBOUNCE_TICKS) {
+        // Too soon. Wait longer to debounce.
+        return;
+    }
+
+    self->last_scan_ticks = now;
+
+    // Latch (freeze) the current state of the input pins.
+    common_hal_digitalio_digitalinout_set_value(self->latch, true);
+
+    for (mp_uint_t key_num = 0; key_num < common_hal_keypad_shiftregisterkeys_get_num_keys(self); key_num++) {
+        // Zero-th data appears on on the data pin immediately, without shifting.
+        common_hal_digitalio_digitalinout_set_value(self->clock, false);
+
+        // Remember the previous up/down state.
+        const bool previous = self->currently_pressed[key_num];
+        self->previously_pressed[key_num] = previous;
+
+        // Get the current state.
+        const bool current =
+            common_hal_digitalio_digitalinout_get_value(self->data) == self->value_when_pressed;
+        self->currently_pressed[key_num] = current;
+
+        // Trigger a shift to get the next bit.
+        common_hal_digitalio_digitalinout_set_value(self->clock, true);
+
+        // Record any transitions.
+        if (previous != current) {
+            keypad_eventqueue_record(self->events, key_num, current);
+        }
+    }
+
+    // Start reading the input pins again.
+    common_hal_digitalio_digitalinout_set_value(self->latch, false);
+
+}
diff --git a/shared-module/keypad/ShiftRegisterKeys.h b/shared-module/keypad/ShiftRegisterKeys.h
new file mode 100644
index 0000000000..7949ecbb67
--- /dev/null
+++ b/shared-module/keypad/ShiftRegisterKeys.h
@@ -0,0 +1,54 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Dan Halbert 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_MODULE_KEYPAD_SHIFTREGISTERKEYS_H
+#define MICROPY_INCLUDED_SHARED_MODULE_KEYPAD_SHIFTREGISTERKEYS_H
+
+#include "py/obj.h"
+#include "py/objtuple.h"
+
+#include "common-hal/digitalio/DigitalInOut.h"
+#include "shared-module/keypad/__init__.h"
+#include "shared-module/keypad/EventQueue.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    // All scanners have a next field here, to keep a linked list of active scanners.
+    keypad_scanner_obj_t *next;
+    digitalio_digitalinout_obj_t *clock;
+    digitalio_digitalinout_obj_t *data;
+    digitalio_digitalinout_obj_t *latch;
+    size_t num_keys;
+    uint64_t last_scan_ticks;
+    bool *previously_pressed;
+    bool *currently_pressed;
+    keypad_eventqueue_obj_t *events;
+    bool value_when_pressed;
+} keypad_shiftregisterkeys_obj_t;
+
+void keypad_shiftregisterkeys_scan(keypad_shiftregisterkeys_obj_t *self);
+
+#endif  // MICROPY_INCLUDED_SHARED_MODULE_KEYPAD_SHIFTREGISTERKEYS_H
diff --git a/shared-module/keypad/__init__.c b/shared-module/keypad/__init__.c
index 4cfa011bad..fc41396617 100644
--- a/shared-module/keypad/__init__.c
+++ b/shared-module/keypad/__init__.c
@@ -26,13 +26,14 @@
 
 #include "shared-bindings/keypad/Keys.h"
 #include "shared-bindings/keypad/KeyMatrix.h"
+#include "shared-bindings/keypad/ShiftRegisterKeys.h"
 #include "supervisor/shared/lock.h"
 #include "supervisor/shared/tick.h"
 
 supervisor_lock_t keypad_scanners_linked_list_lock;
 
 void keypad_tick(void) {
-    // Fast path. Return immediately if there are no scanners.
+    // Fast path. Return immediately there are no scanners.
     if (!MP_STATE_VM(keypad_scanners_linked_list)) {
         return;
     }
@@ -45,6 +46,8 @@ void keypad_tick(void) {
                 keypad_keys_scan((keypad_keys_obj_t *)scanner);
             } else if (mp_obj_is_type(scanner, &keypad_keymatrix_type)) {
                 keypad_keymatrix_scan((keypad_keymatrix_obj_t *)scanner);
+            } else if (mp_obj_is_type(scanner, &keypad_shiftregisterkeys_type)) {
+                keypad_shiftregisterkeys_scan((keypad_shiftregisterkeys_obj_t *)scanner);
             }
 
             scanner = ((keypad_scanner_obj_t *)scanner)->next;

From eb7ae538f91b5041c92887290756c9526bf38df8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 18 Jun 2021 14:13:18 +1000
Subject: [PATCH 261/349] esp8266/boards/GENERIC_512K: Add custom minimal
 _boot.py.

Commit 0abf6f830cd390e2e5dbd4a2c68f611f5c9507dc removed _boot.py from the
manifest for the GENERIC_512K board because the build does not include a
filesystem.  But the main code expects _boot.py to be there and prints an
error if it's not.  So add a custom _boot.py, which just sets the
gc.threshold().

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/boards/GENERIC_512K/_boot.py    | 3 +++
 ports/esp8266/boards/GENERIC_512K/manifest.py | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 ports/esp8266/boards/GENERIC_512K/_boot.py

diff --git a/ports/esp8266/boards/GENERIC_512K/_boot.py b/ports/esp8266/boards/GENERIC_512K/_boot.py
new file mode 100644
index 0000000000..1a55cfd36c
--- /dev/null
+++ b/ports/esp8266/boards/GENERIC_512K/_boot.py
@@ -0,0 +1,3 @@
+import gc
+
+gc.threshold((gc.mem_free() + gc.mem_alloc()) // 4)
diff --git a/ports/esp8266/boards/GENERIC_512K/manifest.py b/ports/esp8266/boards/GENERIC_512K/manifest.py
index e7ab8ad535..5674f280b5 100644
--- a/ports/esp8266/boards/GENERIC_512K/manifest.py
+++ b/ports/esp8266/boards/GENERIC_512K/manifest.py
@@ -1,3 +1,4 @@
+freeze("$(BOARD_DIR)", "_boot.py", opt=3)
 freeze("$(PORT_DIR)/modules", ("apa102.py", "neopixel.py", "ntptime.py", "port_diag.py"))
 freeze("$(MPY_DIR)/drivers/dht", "dht.py")
 freeze("$(MPY_DIR)/drivers/onewire")

From bc89cdeb45b66961b56e2354f2a0be9ef611ad7b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 18 Jun 2021 14:15:37 +1000
Subject: [PATCH 262/349] py/gc: Only use no_sanitize_address attribute for GCC
 4.8 and above.

It's not supported on older GCC versions.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/gc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/gc.c b/py/gc.c
index 56111bd3b6..8284c435ba 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -345,7 +345,7 @@ void gc_collect_start(void) {
 // Address sanitizer needs to know that the access to ptrs[i] must always be
 // considered OK, even if it's a load from an address that would normally be
 // prohibited (due to being undefined, in a red zone, etc).
-#ifdef __GNUC__
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))
 __attribute__((no_sanitize_address))
 #endif
 static void *gc_get_ptr(void **ptrs, int i) {

From adf35cbab096a4a207ad3eca5323b0e164e7171d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 18 Jun 2021 14:16:07 +1000
Subject: [PATCH 263/349] tests/float: Make bytes/bytearray construct tests
 work with obj repr C.

2.5 can be represented correctly in object representation C, but 2.3 cannot
(it is slightly truncated).

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/float/bytearray_construct_endian.py | 2 +-
 tests/float/bytes_construct_endian.py     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/float/bytearray_construct_endian.py b/tests/float/bytearray_construct_endian.py
index 257d37d1be..47f2b793c0 100644
--- a/tests/float/bytearray_construct_endian.py
+++ b/tests/float/bytearray_construct_endian.py
@@ -9,4 +9,4 @@ except ImportError:
         print("SKIP")
         raise SystemExit
 
-print(bytearray(array("f", [1, 2.3])))
+print(bytearray(array("f", [1, 2.5])))
diff --git a/tests/float/bytes_construct_endian.py b/tests/float/bytes_construct_endian.py
index 208f56162f..4e15acc8bc 100644
--- a/tests/float/bytes_construct_endian.py
+++ b/tests/float/bytes_construct_endian.py
@@ -9,4 +9,4 @@ except ImportError:
         print("SKIP")
         raise SystemExit
 
-print(bytes(array("f", [1, 2.3])))
+print(bytes(array("f", [1, 2.5])))

From 7c51cb2307eaca1a1ccc071e0bb5eb4a5f734610 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 18 Jun 2021 16:38:06 +1000
Subject: [PATCH 264/349] all: Bump version to 1.16.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/conf.py  | 2 +-
 py/mpconfig.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 53cbf9baed..fcaadfaf0a 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -74,7 +74,7 @@ copyright = '2014-2021, Damien P. George, Paul Sokolovsky, and contributors'
 #
 # We don't follow "The short X.Y version" vs "The full version, including alpha/beta/rc tags"
 # breakdown, so use the same version identifier for both to avoid confusion.
-version = release = '1.15'
+version = release = '1.16'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 7337994a5e..d40637dfaf 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -28,7 +28,7 @@
 
 // Current version of MicroPython
 #define MICROPY_VERSION_MAJOR 1
-#define MICROPY_VERSION_MINOR 15
+#define MICROPY_VERSION_MINOR 16
 #define MICROPY_VERSION_MICRO 0
 
 // Combined version as a 32-bit number for convenience

From 7b46187024567763d1db631f1c84047c1126851b Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 18 Jun 2021 10:58:30 -0500
Subject: [PATCH 265/349] Fix trailing whitespace

---
 docs/library/rp2.Flash.rst                          | 1 -
 docs/library/rp2.PIO.rst                            | 1 -
 docs/library/rp2.StateMachine.rst                   | 1 -
 ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake | 2 +-
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/docs/library/rp2.Flash.rst b/docs/library/rp2.Flash.rst
index 3b423adfdd..feeef8014b 100644
--- a/docs/library/rp2.Flash.rst
+++ b/docs/library/rp2.Flash.rst
@@ -33,4 +33,3 @@ Methods
     These methods implement the simple and extended
     :ref:`block protocol <block-device-interface>` defined by
     :class:`uos.AbstractBlockDev`.
-
diff --git a/docs/library/rp2.PIO.rst b/docs/library/rp2.PIO.rst
index e0675af1e9..0f630e2bb0 100644
--- a/docs/library/rp2.PIO.rst
+++ b/docs/library/rp2.PIO.rst
@@ -91,4 +91,3 @@ Constants
           PIO.IRQ_SM3
 
     These constants are used for the *trigger* argument to `PIO.irq`.
-
diff --git a/docs/library/rp2.StateMachine.rst b/docs/library/rp2.StateMachine.rst
index 8d73ccf772..58493d4ae6 100644
--- a/docs/library/rp2.StateMachine.rst
+++ b/docs/library/rp2.StateMachine.rst
@@ -128,4 +128,3 @@ Methods
      Returns the IRQ object for the given StateMachine.
 
      Optionally configure it.
-
diff --git a/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake b/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake
index 5e570d513b..c85d080e0a 100644
--- a/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake
@@ -6,4 +6,4 @@ set(SDKCONFIG_DEFAULTS
     boards/UM_FEATHERS2/sdkconfig.board
 )
 
-set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
\ No newline at end of file
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)

From c50c05aa210475bc1d4ffb484730fca465234904 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 18 Jun 2021 10:58:57 -0500
Subject: [PATCH 266/349] remove workflow file from micropython

---
 .github/workflows/ports_mimxrt.yml | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 .github/workflows/ports_mimxrt.yml

diff --git a/.github/workflows/ports_mimxrt.yml b/.github/workflows/ports_mimxrt.yml
deleted file mode 100644
index 8fbc2209e4..0000000000
--- a/.github/workflows/ports_mimxrt.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: mimxrt port
-
-on:
-  push:
-  pull_request:
-    paths:
-      - '.github/workflows/*.yml'
-      - 'tools/**'
-      - 'py/**'
-      - 'extmod/**'
-      - 'lib/**'
-      - 'drivers/**'
-      - 'ports/mimxrt/**'
-
-jobs:
-  build:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install packages
-      run: source tools/ci.sh && ci_mimxrt_setup
-    - name: Build
-      run: source tools/ci.sh && ci_mimxrt_build

From 8647097078a448fb197ec449074de11ea2f60831 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 18 Jun 2021 10:59:52 -0500
Subject: [PATCH 267/349] remove micropython board

---
 ports/nrf/boards/evk_nina_b3/mpconfigboard.h  | 85 -------------------
 ports/nrf/boards/evk_nina_b3/mpconfigboard.mk |  7 --
 ports/nrf/boards/evk_nina_b3/pins.csv         | 48 -----------
 3 files changed, 140 deletions(-)
 delete mode 100644 ports/nrf/boards/evk_nina_b3/mpconfigboard.h
 delete mode 100644 ports/nrf/boards/evk_nina_b3/mpconfigboard.mk
 delete mode 100644 ports/nrf/boards/evk_nina_b3/pins.csv

diff --git a/ports/nrf/boards/evk_nina_b3/mpconfigboard.h b/ports/nrf/boards/evk_nina_b3/mpconfigboard.h
deleted file mode 100644
index eaca796be4..0000000000
--- a/ports/nrf/boards/evk_nina_b3/mpconfigboard.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 Glenn Ruben Bakke
- *
- * 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.
- */
-
-// Pin numbering scheme for nrf52840-based boards
-//
-// Software Pins 0-31 correspond to physical pins
-// 0.x and software Pins 32-47 correspond to physical pins 1.x.
-//
-// Example: Pin(47) would be 1.15 on the PCA10059
-
-// Board data
-#define MICROPY_HW_BOARD_NAME       "EVK_NINA_B3"
-#define MICROPY_HW_MCU_NAME         "NRF52840"
-#define MICROPY_PY_SYS_PLATFORM     "nrf52"
-
-// Enable @viper and @native
-#define MICROPY_EMIT_THUMB          (1)
-#define MICROPY_EMIT_INLINE_THUMB   (1)
-
-// Enable optional modules
-#define MICROPY_PY_UERRNO           (1)
-#define MICROPY_PY_UHASHLIB         (1)
-
-// Peripherals Config
-#define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_HW_PWM   (1)
-#define MICROPY_PY_MACHINE_HW_SPI   (1)
-#define MICROPY_PY_MACHINE_TIMER    (1)
-#define MICROPY_PY_MACHINE_RTCOUNTER (1)
-#define MICROPY_PY_MACHINE_I2C      (1)
-#define MICROPY_PY_MACHINE_ADC      (1)
-#define MICROPY_PY_MACHINE_TEMP     (1)
-#define MICROPY_HW_ENABLE_RNG       (1)
-
-// Configure LEDS
-#define MICROPY_HW_HAS_LED          (1)
-#define MICROPY_HW_LED_COUNT        (3)
-#define MICROPY_HW_LED_PULLUP       (1)
-#define MICROPY_HW_LED1             (13) // LED1 RED
-#define MICROPY_HW_LED2             (25) // LED2 GREEN
-#define MICROPY_HW_LED3             (32) // LED3 BLUE
-
-// UART config
-#define MICROPY_HW_UART1_RX         (29)
-#define MICROPY_HW_UART1_TX         (45)
-#define MICROPY_HW_UART1_CTS        (44)
-#define MICROPY_HW_UART1_RTS        (31)
-#define MICROPY_HW_UART1_HWFC       (1)
-
-// SPI config
-#define MICROPY_HW_SPI0_NAME        "SPI0"
-#define MICROPY_HW_SPI0_SCK         (12)
-#define MICROPY_HW_SPI0_MOSI        (14)
-#define MICROPY_HW_SPI0_MISO        (15)
-
-// PWM Names
-#define MICROPY_HW_PWM0_NAME        "PWM0"
-#define MICROPY_HW_PWM1_NAME        "PWM1"
-#define MICROPY_HW_PWM2_NAME        "PWM2"
-
-// How Many LED indexes appear in the help() message
-#define HELP_TEXT_BOARD_LED         "1,2,3"
diff --git a/ports/nrf/boards/evk_nina_b3/mpconfigboard.mk b/ports/nrf/boards/evk_nina_b3/mpconfigboard.mk
deleted file mode 100644
index ca555d3932..0000000000
--- a/ports/nrf/boards/evk_nina_b3/mpconfigboard.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-MCU_SERIES = m4
-MCU_VARIANT = nrf52
-MCU_SUB_VARIANT = nrf52840
-SOFTDEV_VERSION = 6.1.1
-LD_FILES += boards/nrf52840_1M_256k.ld
-
-NRF_DEFINES += -DNRF52840_XXAA
diff --git a/ports/nrf/boards/evk_nina_b3/pins.csv b/ports/nrf/boards/evk_nina_b3/pins.csv
deleted file mode 100644
index e6190bac0a..0000000000
--- a/ports/nrf/boards/evk_nina_b3/pins.csv
+++ /dev/null
@@ -1,48 +0,0 @@
-P0,P0
-P1,P1
-P2,P2,ADC0_IN0
-P3,P3,ADC0_IN1
-P4,P4,ADC0_IN2
-P5,P5,ADC0_IN3
-P6,P6
-P7,P7
-P8,P8
-P9,P9
-P10,P10
-P11,P11
-P12,P12
-P13,P13
-P14,P14
-P15,P15
-P16,P16
-P17,P17
-P18,P18
-P19,P19
-P20,P20
-P21,P21
-P22,P22
-P23,P23
-P24,P24
-P25,P25
-P26,P26
-P27,P27
-P28,P28,ADC0_IN4
-P29,P29,ADC0_IN5
-P30,P30,ADC0_IN6
-P31,P31,ADC0_IN7
-P32,P32
-P33,P33
-P34,P34
-P35,P35
-P36,P36
-P37,P37
-P38,P38
-P39,P39
-P40,P40
-P41,P41
-P42,P42
-P43,P43
-P44,P44
-P45,P45
-P46,P46
-P47,P47

From 8cd7e774e75ede661460078af13db41715780172 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Fri, 18 Jun 2021 12:03:47 -0400
Subject: [PATCH 268/349] add KeyMatrix columns_to_anodes arg

---
 locale/circuitpython.pot           |  6 ++++--
 shared-bindings/keypad/KeyMatrix.c | 16 ++++++++++------
 shared-bindings/keypad/KeyMatrix.h |  2 +-
 shared-module/keypad/KeyMatrix.c   | 29 ++++++++++++++++++-----------
 shared-module/keypad/KeyMatrix.h   |  1 +
 5 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index f9aa9aab52..04c6ead9b7 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -84,6 +84,7 @@ msgid "%q indices must be integers, not %s"
 msgstr ""
 
 #: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q length must be %q"
 msgstr ""
 
@@ -110,7 +111,7 @@ msgstr ""
 #: shared-bindings/_bleio/CharacteristicBuffer.c
 #: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.c
 #: shared-bindings/displayio/Shape.c shared-bindings/keypad/KeyMatrix.c
-#: shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/Keys.c shared-bindings/keypad/ShiftRegisterKeys.c
 #: shared-bindings/memorymonitor/AllocationAlarm.c
 #: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c
 msgid "%q must be >= 1"
@@ -125,12 +126,13 @@ msgid "%q must be a tuple of length 2"
 msgstr ""
 
 #: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q must store bytes"
 msgstr ""
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c shared-bindings/keypad/KeyMatrix.c
-#: shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/Keys.c shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q out of range"
 msgstr ""
 
diff --git a/shared-bindings/keypad/KeyMatrix.c b/shared-bindings/keypad/KeyMatrix.c
index d63bfdc0b3..98cefa0198 100644
--- a/shared-bindings/keypad/KeyMatrix.c
+++ b/shared-bindings/keypad/KeyMatrix.c
@@ -36,12 +36,10 @@
 //| class KeyMatrix:
 //|     """Manage a 2D matrix of keys with row and column pins."""
 //|
-//|     def __init__(self, row_pins: Sequence[microcontroller.Pin], col_pins: Sequence[microcontroller.Pin], max_events: int = 64) -> None:
+//|     def __init__(self, row_pins: Sequence[microcontroller.Pin], col_pins: Sequence[microcontroller.Pin], columns_to_anodes: bool = True, max_events: int = 64) -> None:
 //|         """
 //|         Create a `Keys` object that will scan the key matrix attached to the given row and column pins.
-//|         If the matrix uses diodes, the diode anodes should be connected to the column pins,
-//|         and the cathodes should be connected to the row pins. If your diodes are reversed,
-//|         simply exchange the row and column pin sequences.
+//|         There should not be any pull-ups or pull-downs on the matrix.
 //|
 //|         The keys are numbered sequentially from zero. A key number can be computed
 //|         by ``row * len(col_pins) + col``.
@@ -52,6 +50,11 @@
 //|
 //|         :param Sequence[microcontroller.Pin] row_pins: The pins attached to the rows.
 //|         :param Sequence[microcontroller.Pin] col_pins: The pins attached to the colums.
+//|         :param bool columns_to_anodes: Default ``True``.
+//|           If the matrix uses diodes, the diode anodes are typically connected to the column pins,
+//|           and the cathodes should be connected to the row pins. If your diodes are reversed,
+//|           set ``columns_to_anodes`` to ``False``.
+//|
 //|         :param int max_events: maximum size of `events` `EventQueue`:
 //|           maximum number of key transition events that are saved.
 //|           Must be >= 1.
@@ -62,10 +65,11 @@
 STATIC mp_obj_t keypad_keymatrix_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     keypad_keymatrix_obj_t *self = m_new_obj(keypad_keymatrix_obj_t);
     self->base.type = &keypad_keymatrix_type;
-    enum { ARG_row_pins, ARG_col_pins, ARG_max_events };
+    enum { ARG_row_pins, ARG_col_pins, ARG_columns_to_anodes, ARG_max_events };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_row_pins, MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_col_pins, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_columns_to_anodes, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} },
         { MP_QSTR_max_events, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 64} },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -98,7 +102,7 @@ STATIC mp_obj_t keypad_keymatrix_make_new(const mp_obj_type_t *type, size_t n_ar
         col_pins_array[col] = pin;
     }
 
-    common_hal_keypad_keymatrix_construct(self, num_row_pins, row_pins_array, num_col_pins, col_pins_array, max_events);
+    common_hal_keypad_keymatrix_construct(self, num_row_pins, row_pins_array, num_col_pins, col_pins_array, args[ARG_columns_to_anodes].u_bool, max_events);
     return MP_OBJ_FROM_PTR(self);
 }
 
diff --git a/shared-bindings/keypad/KeyMatrix.h b/shared-bindings/keypad/KeyMatrix.h
index 24ac405a82..59df6830e9 100644
--- a/shared-bindings/keypad/KeyMatrix.h
+++ b/shared-bindings/keypad/KeyMatrix.h
@@ -32,7 +32,7 @@
 
 extern const mp_obj_type_t keypad_keymatrix_type;
 
-void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint_t num_row_pins, mcu_pin_obj_t *row_pins[], mp_uint_t num_col_pins, mcu_pin_obj_t *col_pins[], size_t max_events);
+void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint_t num_row_pins, mcu_pin_obj_t *row_pins[], mp_uint_t num_col_pins, mcu_pin_obj_t *col_pins[], bool columns_to_anodes, size_t max_events);
 
 void common_hal_keypad_keymatrix_deinit(keypad_keymatrix_obj_t *self);
 bool common_hal_keypad_keymatrix_deinited(keypad_keymatrix_obj_t *self);
diff --git a/shared-module/keypad/KeyMatrix.c b/shared-module/keypad/KeyMatrix.c
index bd72b4a940..5aa7f95e5f 100644
--- a/shared-module/keypad/KeyMatrix.c
+++ b/shared-module/keypad/KeyMatrix.c
@@ -42,14 +42,14 @@ static mp_uint_t row_col_to_key_num(keypad_keymatrix_obj_t *self, mp_uint_t row,
     return row * self->col_digitalinouts->len + col;
 }
 
-void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint_t num_row_pins, mcu_pin_obj_t *row_pins[], mp_uint_t num_col_pins, mcu_pin_obj_t *col_pins[], size_t max_events) {
+void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint_t num_row_pins, mcu_pin_obj_t *row_pins[], mp_uint_t num_col_pins, mcu_pin_obj_t *col_pins[], bool columns_to_anodes, size_t max_events) {
 
     mp_obj_t row_dios[num_row_pins];
     for (size_t row = 0; row < num_row_pins; row++) {
         digitalio_digitalinout_obj_t *dio = m_new_obj(digitalio_digitalinout_obj_t);
         dio->base.type = &digitalio_digitalinout_type;
         common_hal_digitalio_digitalinout_construct(dio, row_pins[row]);
-        common_hal_digitalio_digitalinout_switch_to_input(dio, PULL_UP);
+        common_hal_digitalio_digitalinout_switch_to_input(dio, columns_to_anodes ? PULL_UP : PULL_DOWN);
         row_dios[row] = dio;
     }
     self->row_digitalinouts = mp_obj_new_tuple(num_row_pins, row_dios);
@@ -59,7 +59,7 @@ void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint
         digitalio_digitalinout_obj_t *dio = m_new_obj(digitalio_digitalinout_obj_t);
         dio->base.type = &digitalio_digitalinout_type;
         common_hal_digitalio_digitalinout_construct(dio, col_pins[col]);
-        common_hal_digitalio_digitalinout_switch_to_input(dio, PULL_UP);
+        common_hal_digitalio_digitalinout_switch_to_input(dio, columns_to_anodes ? PULL_UP : PULL_DOWN);
         col_dios[col] = dio;
     }
     self->col_digitalinouts = mp_obj_new_tuple(num_col_pins, col_dios);
@@ -67,6 +67,8 @@ void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint
     self->currently_pressed = (bool *)gc_alloc(sizeof(bool) * num_row_pins * num_col_pins, false, false);
     self->previously_pressed = (bool *)gc_alloc(sizeof(bool) * num_row_pins * num_col_pins, false, false);
 
+    self->columns_to_anodes = columns_to_anodes;
+
     keypad_eventqueue_obj_t *events = m_new_obj(keypad_eventqueue_obj_t);
     events->base.type = &keypad_eventqueue_type;
     common_hal_keypad_eventqueue_construct(events, max_events);
@@ -142,21 +144,25 @@ void keypad_keymatrix_scan(keypad_keymatrix_obj_t *self) {
 
     self->last_scan_ticks = now;
 
-    // On entry, all pins are set to inputs with a pull-up.
+    // On entry, all pins are set to inputs with a pull-up or pull-down,
+    // depending on the diode orientation.
     for (size_t row = 0; row < common_hal_keypad_keymatrix_get_num_rows(self); row++) {
-        // Switch this row to an output and set to low.
+        // Switch this row to an output and set level appropriately
+        // Set low if columns_to_anodes is true, else set high.
         common_hal_digitalio_digitalinout_switch_to_output(
-            self->row_digitalinouts->items[row], false, DRIVE_MODE_PUSH_PULL);
+            self->row_digitalinouts->items[row], !self->columns_to_anodes, DRIVE_MODE_PUSH_PULL);
 
         for (size_t col = 0; col < common_hal_keypad_keymatrix_get_num_cols(self); col++) {
             mp_uint_t key_num = row_col_to_key_num(self, row, col);
             const bool previous = self->currently_pressed[key_num];
             self->previously_pressed[key_num] = previous;
 
-            // Get the current state, by reading whether the col got pulled down or not.
-            // If low, the key is pressed.
+            // Get the current state, by reading whether the col got pulled to the row value or not.
+            // If low and columns_to_anodes is true, the key is pressed.
+            // If high and columns_to_anodes is false, the key is pressed.
             const bool current =
-                !common_hal_digitalio_digitalinout_get_value(self->col_digitalinouts->items[col]);
+                common_hal_digitalio_digitalinout_get_value(self->col_digitalinouts->items[col]) !=
+                self->columns_to_anodes;
             self->currently_pressed[key_num] = current;
 
             // Record any transitions.
@@ -165,7 +171,8 @@ void keypad_keymatrix_scan(keypad_keymatrix_obj_t *self) {
             }
         }
 
-        // Switch the row back to an input, pulled up.
-        common_hal_digitalio_digitalinout_switch_to_input(self->row_digitalinouts->items[row], PULL_UP);
+        // Switch the row back to an input, pulled appropriately
+        common_hal_digitalio_digitalinout_switch_to_input(
+            self->row_digitalinouts->items[row], self->columns_to_anodes ? PULL_UP : PULL_DOWN);
     }
 }
diff --git a/shared-module/keypad/KeyMatrix.h b/shared-module/keypad/KeyMatrix.h
index 253067890a..14c6f8069c 100644
--- a/shared-module/keypad/KeyMatrix.h
+++ b/shared-module/keypad/KeyMatrix.h
@@ -44,6 +44,7 @@ typedef struct {
     bool *previously_pressed;
     bool *currently_pressed;
     keypad_eventqueue_obj_t *events;
+    bool columns_to_anodes;
 } keypad_keymatrix_obj_t;
 
 void keypad_keymatrix_scan(keypad_keymatrix_obj_t *self);

From e1d7e46e8888cc817d456266975383cdb66a574a Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 18 Jun 2021 11:15:51 -0500
Subject: [PATCH 269/349] fix keyboard interrupt

---
 ports/esp32s2/supervisor/usb.c    | 2 +-
 ports/nrf/bluetooth/ble_uart.c    | 2 +-
 ports/stm/common-hal/busio/UART.c | 2 +-
 supervisor/shared/usb/usb.c       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/esp32s2/supervisor/usb.c b/ports/esp32s2/supervisor/usb.c
index 2289b01cc0..41eeb1138b 100644
--- a/ports/esp32s2/supervisor/usb.c
+++ b/ports/esp32s2/supervisor/usb.c
@@ -120,7 +120,7 @@ void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char) {
     // Compare mp_interrupt_char with wanted_char and ignore if not matched
     if (mp_interrupt_char == wanted_char) {
         tud_cdc_read_flush();    // flush read fifo
-        mp_keyboard_interrupt();
+        mp_sched_keyboard_interrupt();
         // CircuitPython's VM is run in a separate FreeRTOS task from TinyUSB.
         // So, we must notify the other task when a CTRL-C is received.
         xTaskNotifyGive(circuitpython_task);
diff --git a/ports/nrf/bluetooth/ble_uart.c b/ports/nrf/bluetooth/ble_uart.c
index 022b866ce6..6b1fed1ad5 100644
--- a/ports/nrf/bluetooth/ble_uart.c
+++ b/ports/nrf/bluetooth/ble_uart.c
@@ -81,7 +81,7 @@ STATIC void on_ble_evt(ble_evt_t *ble_evt, void *param) {
                 for (size_t i = 0; i < write->len; ++i) {
                     #if MICROPY_KBD_EXCEPTION
                     if (write->data[i] == mp_interrupt_char) {
-                        mp_keyboard_interrupt();
+                        mp_sched_keyboard_interrupt();
                     } else
                     #endif
                     {
diff --git a/ports/stm/common-hal/busio/UART.c b/ports/stm/common-hal/busio/UART.c
index ecaee84d3f..621cce6cfd 100644
--- a/ports/stm/common-hal/busio/UART.c
+++ b/ports/stm/common-hal/busio/UART.c
@@ -355,7 +355,7 @@ void HAL_UART_RxCpltCallback(UART_HandleTypeDef *handle) {
             if (context->sigint_enabled) {
                 if (context->rx_char == CHAR_CTRL_C) {
                     common_hal_busio_uart_clear_rx_buffer(context);
-                    mp_keyboard_interrupt();
+                    mp_sched_keyboard_interrupt();
                 }
             }
 
diff --git a/supervisor/shared/usb/usb.c b/supervisor/shared/usb/usb.c
index 0e1c3472eb..9a276aa6cc 100644
--- a/supervisor/shared/usb/usb.c
+++ b/supervisor/shared/usb/usb.c
@@ -293,7 +293,7 @@ void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char) {
     // Compare mp_interrupt_char with wanted_char and ignore if not matched
     if (mp_interrupt_char == wanted_char) {
         tud_cdc_n_read_flush(itf);    // flush read fifo
-        mp_keyboard_interrupt();
+        mp_sched_keyboard_interrupt();
     }
 }
 

From fa29be5aeab5c012a357c6ec2ff06ca0184fb1b7 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 18 Jun 2021 11:24:39 -0500
Subject: [PATCH 270/349] restore a redundant NULL-comparison, it silences
 compiler diagnostics

---
 py/repl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/repl.c b/py/repl.c
index 60a48b58b8..78367e66da 100644
--- a/py/repl.c
+++ b/py/repl.c
@@ -153,7 +153,7 @@ STATIC bool test_qstr(mp_obj_t obj, qstr name) {
     } else {
         // try builtin module
         return mp_map_lookup((mp_map_t *)&mp_builtin_module_map,
-            MP_OBJ_NEW_QSTR(name), MP_MAP_LOOKUP);
+            MP_OBJ_NEW_QSTR(name), MP_MAP_LOOKUP) != NULL;
     }
 }
 

From 03adbbca7c9861584ac96b8e4652367b61b9f5f7 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Fri, 18 Jun 2021 12:26:48 -0400
Subject: [PATCH 271/349] turn off keypad by default on all SAMD21, for now

---
 ports/atmel-samd/mpconfigport.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk
index d0ef189f41..cb8fae6f07 100644
--- a/ports/atmel-samd/mpconfigport.mk
+++ b/ports/atmel-samd/mpconfigport.mk
@@ -50,6 +50,7 @@ CIRCUITPY_FRAMEBUFFERIO ?= 0
 CIRCUITPY_FREQUENCYIO ?= 0
 CIRCUITPY_I2CPERIPHERAL ?= 0
 CIRCUITPY_JSON ?= 0
+CIRCUITPY_KEYPAD ?= 0
 CIRCUITPY_MSGPACK ?= 0
 CIRCUITPY_RE ?= 0
 CIRCUITPY_SDCARDIO ?= 0

From db297add6713ddf79e8dfc12dc38adfda46c1b5b Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Fri, 18 Jun 2021 13:20:31 -0400
Subject: [PATCH 272/349] fix other too-big builds

---
 ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk | 1 +
 ports/stm/boards/meowbit_v121/mpconfigboard.mk          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk
index d7b8a4bb1e..c2c583022c 100644
--- a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk
@@ -15,6 +15,7 @@ CIRCUITPY_AUDIOMP3 = 0
 CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
+CIRCUITPY_KEYPAD = 0
 CIRCUITPY_MSGPACK = 0
 CIRCUITPY_PS2IO = 0
 CIRCUITPY_RGBMATRIX = 0
diff --git a/ports/stm/boards/meowbit_v121/mpconfigboard.mk b/ports/stm/boards/meowbit_v121/mpconfigboard.mk
index dc44095a31..d846755c28 100644
--- a/ports/stm/boards/meowbit_v121/mpconfigboard.mk
+++ b/ports/stm/boards/meowbit_v121/mpconfigboard.mk
@@ -20,4 +20,5 @@ LD_FILE = boards/STM32F401xe_boot.ld
 # For debugging - also comment BOOTLOADER_OFFSET and BOARD_VTOR_DEFER
 # LD_FILE = boards/STM32F401xe_fs.ld
 
+CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_ULAB = 0

From a703561402435f69a51cf55775160c25d993b37b Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 18 Jun 2021 16:02:44 -0500
Subject: [PATCH 273/349] remove docs added in merge

---
 docs/esp8266/tutorial/ssd1306.rst |  93 ----------
 docs/library/machine.PWM.rst      |  79 --------
 docs/library/rp2.Flash.rst        |  35 ----
 docs/library/rp2.PIO.rst          |  93 ----------
 docs/library/rp2.StateMachine.rst | 130 --------------
 docs/library/rp2.rst              |  83 ---------
 docs/rp2/general.rst              |  18 --
 docs/rp2/img/rpipico.jpg          | Bin 89259 -> 0 bytes
 docs/rp2/quickref.rst             | 288 ------------------------------
 docs/rp2/tutorial/intro.rst       |   6 -
 10 files changed, 825 deletions(-)
 delete mode 100644 docs/esp8266/tutorial/ssd1306.rst
 delete mode 100644 docs/library/machine.PWM.rst
 delete mode 100644 docs/library/rp2.Flash.rst
 delete mode 100644 docs/library/rp2.PIO.rst
 delete mode 100644 docs/library/rp2.StateMachine.rst
 delete mode 100644 docs/library/rp2.rst
 delete mode 100644 docs/rp2/general.rst
 delete mode 100644 docs/rp2/img/rpipico.jpg
 delete mode 100644 docs/rp2/quickref.rst
 delete mode 100644 docs/rp2/tutorial/intro.rst

diff --git a/docs/esp8266/tutorial/ssd1306.rst b/docs/esp8266/tutorial/ssd1306.rst
deleted file mode 100644
index 4dca82afc4..0000000000
--- a/docs/esp8266/tutorial/ssd1306.rst
+++ /dev/null
@@ -1,93 +0,0 @@
-.. _ssd1306:
-
-Using a SSD1306 OLED display
-============================
-
-The SSD1306 OLED display uses either a SPI or I2C interface and comes in a variety of
-sizes (128x64, 128x32, 72x40, 64x48) and colours (white, yellow, blue, yellow + blue).
-
-Hardware SPI interface::
-
-    from machine import Pin, SPI
-    import ssd1306
-
-    hspi = SPI(1)  # sck=14 (scl), mosi=13 (sda), miso=12 (unused)
-
-    dc = Pin(4)    # data/command
-    rst = Pin(5)   # reset
-    cs = Pin(15)   # chip select, some modules do not have a pin for this
-
-    display = ssd1306.SSD1306_SPI(128, 64, hspi, dc, rst, cs)
-
-Software SPI interface::
-
-    from machine import Pin, SoftSPI
-    import ssd1306
-
-    spi = SoftSPI(baudrate=500000, polarity=1, phase=0, sck=Pin(14), mosi=Pin(13), miso=Pin(12))
-
-    dc = Pin(4)   # data/command
-    rst = Pin(5)  # reset
-    cs = Pin(15)  # chip select, some modules do not have a pin for this
-
-    display = ssd1306.SSD1306_SPI(128, 64, spi, dc, rst, cs)
-
-I2C interface::
-
-    from machine import Pin, I2C
-    import ssd1306
-
-    # using default address 0x3C
-    i2c = I2C(sda=Pin(4), scl=Pin(5))
-    display = ssd1306.SSD1306_I2C(128, 64, i2c)
-
-Print Hello World on the first line::
-
-    display.text('Hello, World!', 0, 0, 1)
-    display.show()
-
-Basic functions::
-
-    display.poweroff()     # power off the display, pixels persist in memory
-    display.poweron()      # power on the display, pixels redrawn
-    display.contrast(0)    # dim
-    display.contrast(255)  # bright
-    display.invert(1)      # display inverted
-    display.invert(0)      # display normal
-    display.rotate(True)   # rotate 180 degrees
-    display.rotate(False)  # rotate 0 degrees
-    display.show()         # write the contents of the FrameBuffer to display memory
-
-Subclassing FrameBuffer provides support for graphics primitives::
-
-    display.fill(0)                         # fill entire screen with colour=0
-    display.pixel(0, 10)                    # get pixel at x=0, y=10
-    display.pixel(0, 10, 1)                 # set pixel at x=0, y=10 to colour=1
-    display.hline(0, 8, 4, 1)               # draw horizontal line x=0, y=8, width=4, colour=1
-    display.vline(0, 8, 4, 1)               # draw vertical line x=0, y=8, height=4, colour=1
-    display.line(0, 0, 127, 63, 1)          # draw a line from 0,0 to 127,63
-    display.rect(10, 10, 107, 43, 1)        # draw a rectangle outline 10,10 to 107,43, colour=1
-    display.fill_rect(10, 10, 107, 43, 1)   # draw a solid rectangle 10,10 to 107,43, colour=1
-    display.text('Hello World', 0, 0, 1)    # draw some text at x=0, y=0, colour=1
-    display.scroll(20, 0)                   # scroll 20 pixels to the right
-
-    # draw another FrameBuffer on top of the current one at the given coordinates
-    import framebuf
-    fbuf = framebuf.FrameBuffer(bytearray(8 * 8 * 1), 8, 8, framebuf.MONO_VLSB)
-    fbuf.line(0, 0, 7, 7, 1)
-    display.blit(fbuf, 10, 10, 0)           # draw on top at x=10, y=10, key=0
-    display.show()
-
-Draw the MicroPython logo and print some text::
-
-    display.fill(0)
-    display.fill_rect(0, 0, 32, 32, 1)
-    display.fill_rect(2, 2, 28, 28, 0)
-    display.vline(9, 8, 22, 1)
-    display.vline(16, 2, 22, 1)
-    display.vline(23, 8, 22, 1)
-    display.fill_rect(26, 24, 2, 4, 1)
-    display.text('MicroPython', 40, 0, 1)
-    display.text('SSD1306', 40, 12, 1)
-    display.text('OLED 128x64', 40, 24, 1)
-    display.show()
diff --git a/docs/library/machine.PWM.rst b/docs/library/machine.PWM.rst
deleted file mode 100644
index f2273d8b45..0000000000
--- a/docs/library/machine.PWM.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-.. currentmodule:: machine
-.. _machine.PWM:
-
-class PWM -- pulse width modulation
-===================================
-
-This class provides pulse width modulation output.
-
-Example usage::
-
-    from machine import PWM
-
-    pwm = PWM(pin)          # create a PWM object on a pin
-    pwm.duty_u16(32768)     # set duty to 50%
-
-    # reinitialise with a period of 200us, duty of 5us
-    pwm.init(freq=5000, duty_ns=5000)
-
-    pwm.duty_ns(3000)       # set pulse width to 3us
-
-    pwm.deinit()
-
-Constructors
-------------
-
-.. class:: PWM(dest, \*, freq, duty_u16, duty_ns)
-
-   Construct and return a new PWM object using the following parameters:
-
-      - *dest* is the entity on which the PWM is output, which is usually a
-        :ref:`machine.Pin <machine.Pin>` object, but a port may allow other values,
-        like integers.
-      - *freq* should be an integer which sets the frequency in Hz for the
-        PWM cycle.
-      - *duty_u16* sets the duty cycle as a ratio ``duty_u16 / 65535``.
-      - *duty_ns* sets the pulse width in nanoseconds.
-
-   Setting *freq* may affect other PWM objects if the objects share the same
-   underlying PWM generator (this is hardware specific).
-   Only one of *duty_u16* and *duty_ns* should be specified at a time.
-
-Methods
--------
-
-.. method:: PWM.init(\*, freq, duty_u16, duty_ns)
-
-   Modify settings for the PWM object.  See the above constructor for details
-   about the parameters.
-
-.. method:: PWM.deinit()
-
-   Disable the PWM output.
-
-.. method:: PWM.freq([value])
-
-   Get or set the current frequency of the PWM output.
-
-   With no arguments the frequency in Hz is returned.
-
-   With a single *value* argument the frequency is set to that value in Hz.  The
-   method may raise a ``ValueError`` if the frequency is outside the valid range.
-
-.. method:: PWM.duty_u16([value])
-
-   Get or set the current duty cycle of the PWM output, as an unsigned 16-bit
-   value in the range 0 to 65535 inclusive.
-
-   With no arguments the duty cycle is returned.
-
-   With a single *value* argument the duty cycle is set to that value, measured
-   as the ratio ``value / 65535``.
-
-.. method:: PWM.duty_ns([value])
-
-   Get or set the current pulse width of the PWM output, as a value in nanoseconds.
-
-   With no arguments the pulse width in nanoseconds is returned.
-
-   With a single *value* argument the pulse width is set to that value.
diff --git a/docs/library/rp2.Flash.rst b/docs/library/rp2.Flash.rst
deleted file mode 100644
index feeef8014b..0000000000
--- a/docs/library/rp2.Flash.rst
+++ /dev/null
@@ -1,35 +0,0 @@
-.. currentmodule:: rp2
-.. _rp2.Flash:
-
-class Flash -- access to built-in flash storage
-===============================================
-
-This class gives access to the SPI flash memory.
-
-In most cases, to store persistent data on the device, you'll want to use a
-higher-level abstraction, for example the filesystem via Python's standard file
-API, but this interface is useful to :ref:`customise the filesystem
-configuration <filesystem>` or implement a low-level storage system for your
-application.
-
-
-Constructors
-------------
-
-.. class:: Flash()
-
-   Gets the singleton object for accessing the SPI flash memory.
-
-
-Methods
--------
-
-.. method:: Flash.readblocks(block_num, buf)
-            Flash.readblocks(block_num, buf, offset)
-.. method:: Flash.writeblocks(block_num, buf)
-            Flash.writeblocks(block_num, buf, offset)
-.. method:: Flash.ioctl(cmd, arg)
-
-    These methods implement the simple and extended
-    :ref:`block protocol <block-device-interface>` defined by
-    :class:`uos.AbstractBlockDev`.
diff --git a/docs/library/rp2.PIO.rst b/docs/library/rp2.PIO.rst
deleted file mode 100644
index 0f630e2bb0..0000000000
--- a/docs/library/rp2.PIO.rst
+++ /dev/null
@@ -1,93 +0,0 @@
-.. currentmodule:: rp2
-.. _rp2.PIO:
-
-class PIO -- advanced PIO usage
-===============================
-
-The :class:`PIO` class gives access to an instance of the RP2040's PIO
-(programmable I/O) interface.
-
-The preferred way to interact with PIO is using :class:`rp2.StateMachine`, the
-PIO class is for advanced use.
-
-For assembling PIO programs, see :func:`rp2.asm_pio`.
-
-
-Constructors
-------------
-
-.. class:: PIO(id)
-
-    Gets the PIO instance numbered *id*. The RP2040 has two PIO instances,
-    numbered 0 and 1.
-
-    Raises a ``ValueError`` if any other argument is provided.
-
-
-Methods
--------
-
-.. method:: PIO.add_program(program)
-
-    Add the *program* to the instruction memory of this PIO instance.
-
-    The amount of memory available for programs on each PIO instance is
-    limited. If there isn't enough space left in the PIO's program memory
-    this method will raise ``OSError(ENOMEM)``.
-
-.. method:: PIO.remove_program([program])
-
-    Remove *program* from the instruction memory of this PIO instance.
-
-    If no program is provided, it removes all programs.
-
-    It is not an error to remove a program which has already been removed.
-
-.. method:: PIO.state_machine(id, [program, ...])
-
-    Gets the state machine numbered *id*. On the RP2040, each PIO instance has
-    four state machines, numbered 0 to 3.
-
-    Optionally initialize it with a *program*: see `StateMachine.init`.
-
-    >>> rp2.PIO(1).state_machine(3)
-    StateMachine(7)
-
-.. method:: PIO.irq(handler=None, trigger=IRQ_SM0|IRQ_SM1|IRQ_SM2|IRQ_SM3, hard=False)
-
-    Returns the IRQ object for this PIO instance.
-
-    MicroPython only uses IRQ 0 on each PIO instance. IRQ 1 is not available.
-
-    Optionally configure it.
-
-
-Constants
----------
-
-.. data:: PIO.IN_LOW
-          PIO.IN_HIGH
-          PIO.OUT_LOW
-          PIO.OUT_HIGH
-
-    These constants are used for the *out_init*, *set_init*, and *sideset_init*
-    arguments to `asm_pio`.
-
-.. data:: PIO.SHIFT_LEFT
-          PIO.SHIFT_RIGHT
-
-    These constants are used for the *in_shiftdir* and *out_shiftdir* arguments
-    to `asm_pio` or `StateMachine.init`.
-
-.. data:: PIO.JOIN_NONE
-          PIO.JOIN_TX
-          PIO.JOIN_RX
-
-    These constants are used for the *fifo_join* argument to `asm_pio`.
-
-.. data:: PIO.IRQ_SM0
-          PIO.IRQ_SM1
-          PIO.IRQ_SM2
-          PIO.IRQ_SM3
-
-    These constants are used for the *trigger* argument to `PIO.irq`.
diff --git a/docs/library/rp2.StateMachine.rst b/docs/library/rp2.StateMachine.rst
deleted file mode 100644
index 58493d4ae6..0000000000
--- a/docs/library/rp2.StateMachine.rst
+++ /dev/null
@@ -1,130 +0,0 @@
-.. currentmodule:: rp2
-.. _rp2.StateMachine:
-
-class StateMachine -- access to the RP2040's programmable I/O interface
-=======================================================================
-
-The :class:`StateMachine` class gives access to the RP2040's PIO (programmable
-I/O) interface.
-
-For assembling PIO programs, see :func:`rp2.asm_pio`.
-
-
-Constructors
-------------
-
-.. class:: StateMachine(id, [program, ...])
-
-    Get the state machine numbered *id*. The RP2040 has two identical PIO
-    instances, each with 4 state machines: so there are 8 state machines in
-    total, numbered 0 to 7.
-
-    Optionally initialize it with the given program *program*: see
-    `StateMachine.init`.
-
-
-Methods
--------
-
-.. method:: StateMachine.init(program, freq=-1, *, in_base=None, out_base=None, set_base=None, jmp_pin=None, sideset_base=None, in_shiftdir=None, out_shiftdir=None, push_thresh=None, pull_thresh=None)
-
-    Configure the state machine instance to run the given *program*.
-
-    The program is added to the instruction memory of this PIO instance. If the
-    instruction memory already contains this program, then its offset is
-    re-used so as to save on instruction memory.
-
-    - *freq* is the frequency in Hz to run the state machine at. Defaults to
-      the system clock frequency.
-
-      The clock divider is computed as ``system clock frequency / freq``, so
-      there can be slight rounding errors.
-
-      The minimum possible clock divider is one 65536th of the system clock: so
-      at the default system clock frequency of 125MHz, the minimum value of
-      *freq* is ``1908``. To run state machines at slower frequencies, you'll
-      need to reduce the system clock speed with `machine.freq()`.
-    - *in_base* is the first pin to use for ``in()`` instructions.
-    - *out_base* is the first pin to use for ``out()`` instructions.
-    - *set_base* is the first pin to use for ``set()`` instructions.
-    - *jmp_pin* is the first pin to use for ``jmp(pin, ...)`` instructions.
-    - *sideset_base* is the first pin to use for side-setting.
-    - *in_shiftdir* is the direction the ISR will shift, either
-      `PIO.SHIFT_LEFT` or `PIO.SHIFT_RIGHT`.
-    - *out_shiftdir* is the direction the OSR will shift, either
-      `PIO.SHIFT_LEFT` or `PIO.SHIFT_RIGHT`.
-    - *push_thresh* is the threshold in bits before auto-push or conditional
-      re-pushing is triggered.
-    - *pull_thresh* is the threshold in bits before auto-push or conditional
-      re-pushing is triggered.
-
-.. method:: StateMachine.active([value])
-
-    Gets or sets whether the state machine is currently running.
-
-    >>> sm.active()
-    True
-    >>> sm.active(0)
-    False
-
-.. method:: StateMachine.restart()
-
-    Restarts the state machine and jumps to the beginning of the program.
-
-    This method clears the state machine's internal state using the RP2040's
-    ``SM_RESTART`` register. This includes:
-
-     - input and output shift counters
-     - the contents of the input shift register
-     - the delay counter
-     - the waiting-on-IRQ state
-     - a stalled instruction run using `StateMachine.exec()`
-
-.. method:: StateMachine.exec(instr)
-
-    Execute a single PIO instruction. Uses `asm_pio_encode` to encode the
-    instruction from the given string *instr*.
-
-    >>> sm.exec("set(0, 1)")
-
-.. method:: StateMachine.get(buf=None, shift=0)
-
-    Pull a word from the state machine's RX FIFO.
-
-    If the FIFO is empty, it blocks until data arrives (i.e. the state machine
-    pushes a word).
-
-    The value is shifted right by *shift* bits before returning, i.e. the
-    return value is ``word >> shift``.
-
-.. method:: StateMachine.put(value, shift=0)
-
-    Push a word onto the state machine's TX FIFO.
-
-    If the FIFO is full, it blocks until there is space (i.e. the state machine
-    pulls a word).
-
-    The value is first shifted left by *shift* bits, i.e. the state machine
-    receives ``value << shift``.
-
-.. method:: StateMachine.rx_fifo()
-
-    Returns the number of words in the state machine's RX FIFO. A value of 0
-    indicates the FIFO is empty.
-
-    Useful for checking if data is waiting to be read, before calling
-    `StateMachine.get()`.
-
-.. method:: StateMachine.tx_fifo()
-
-    Returns the number of words in the state machine's TX FIFO. A value of 0
-    indicates the FIFO is empty.
-
-    Useful for checking if there is space to push another word using
-    `StateMachine.put()`.
-
-.. method:: StateMachine.irq(handler=None, trigger=0|1, hard=False)
-
-     Returns the IRQ object for the given StateMachine.
-
-     Optionally configure it.
diff --git a/docs/library/rp2.rst b/docs/library/rp2.rst
deleted file mode 100644
index 5d168bce20..0000000000
--- a/docs/library/rp2.rst
+++ /dev/null
@@ -1,83 +0,0 @@
-.. currentmodule:: rp2
-
-:mod:`rp2` --- functionality specific to the RP2040
-===================================================
-
-.. module:: rp2
-    :synopsis: functionality specific to the RP2
-
-The ``rp2`` module contains functions and classes specific to the RP2040, as
-used in the Raspberry Pi Pico.
-
-See the `RP2040 Python datasheet
-<https://datasheets.raspberrypi.org/pico/raspberry-pi-pico-python-sdk.pdf>`_
-for more information, and `pico-micropython-examples
-<https://github.com/raspberrypi/pico-micropython-examples/tree/master/pio>`_
-for example code.
-
-
-PIO related functions
----------------------
-
-The ``rp2`` module includes functions for assembling PIO programs.
-
-For running PIO programs, see :class:`rp2.StateMachine`.
-
-.. function:: asm_pio(*, out_init=None, set_init=None, sideset_init=None, in_shiftdir=0, out_shiftdir=0, autopush=False, autopull=False, push_thresh=32, pull_thresh=32, fifo_join=PIO.JOIN_NONE)
-
-    Assemble a PIO program.
-
-    The following parameters control the initial state of the GPIO pins, as one
-    of `PIO.IN_LOW`, `PIO.IN_HIGH`, `PIO.OUT_LOW` or `PIO.OUT_HIGH`. If the
-    program uses more than one pin, provide a tuple, e.g.
-    ``out_init=(PIO.OUT_LOW, PIO.OUT_LOW)``.
-
-    - *out_init* configures the pins used for ``out()`` instructions.
-    - *set_init* configures the pins used for ``set()`` instructions. There can
-      be at most 5.
-    - *sideset_init* configures the pins used side-setting. There can be at
-      most 5.
-
-    The following parameters are used by default, but can be overridden in
-    `StateMachine.init()`:
-
-    - *in_shiftdir* is the default direction the ISR will shift, either
-      `PIO.SHIFT_LEFT` or `PIO.SHIFT_RIGHT`.
-    - *out_shiftdir* is the default direction the OSR will shift, either
-      `PIO.SHIFT_LEFT` or `PIO.SHIFT_RIGHT`.
-    - *push_thresh* is the threshold in bits before auto-push or conditional
-      re-pushing is triggered.
-    - *pull_thresh* is the threshold in bits before auto-push or conditional
-      re-pushing is triggered.
-
-    The remaining parameters are:
-
-    - *autopush* configures whether auto-push is enabled.
-    - *autopull* configures whether auto-pull is enabled.
-    - *fifo_join* configures whether the 4-word TX and RX FIFOs should be
-      combined into a single 8-word FIFO for one direction only. The options
-      are `PIO.JOIN_NONE`, `PIO.JOIN_RX` and `PIO.JOIN_TX`.
-
-.. function:: asm_pio_encode(instr, sideset_count)
-
-    Assemble a single PIO instruction. You usually want to use `asm_pio()`
-    instead.
-
-    >>> rp2.asm_pio_encode("set(0, 1)", 0)
-    57345
-
-.. class:: PIOASMError
-
-    This exception is raised from `asm_pio()` or `asm_pio_encode()` if there is
-    an error assembling a PIO program.
-
-
-Classes
--------
-
-.. toctree::
-    :maxdepth: 1
-
-    rp2.Flash.rst
-    rp2.PIO.rst
-    rp2.StateMachine.rst
diff --git a/docs/rp2/general.rst b/docs/rp2/general.rst
deleted file mode 100644
index 9ff83a9656..0000000000
--- a/docs/rp2/general.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-.. _rp2_general:
-
-General information about the RP2xxx port
-=========================================
-
-The rp2 port supports boards powered by the Raspberry Pi Foundation's RP2xxx
-family of microcontrollers, most notably the Raspberry Pi Pico that employs
-the RP2040.
-
-Technical specifications and SoC datasheets
--------------------------------------------
-
-Datasheets!
-
-Short summary of tech specs!
-
-Description of general structure of the port (it's built on top of the APIs
-provided by the Raspberry Pi SDK).
diff --git a/docs/rp2/img/rpipico.jpg b/docs/rp2/img/rpipico.jpg
deleted file mode 100644
index 336d3582775b8701d670403b0e63df8fcefc478c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 89259
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

diff --git a/docs/rp2/quickref.rst b/docs/rp2/quickref.rst
deleted file mode 100644
index 6bbe179541..0000000000
--- a/docs/rp2/quickref.rst
+++ /dev/null
@@ -1,288 +0,0 @@
-.. _rp2_quickref:
-
-Quick reference for the RP2
-===========================
-
-.. image:: img/rpipico.jpg
-    :alt: Raspberry Pi Pico
-    :width: 640px
-
-The Raspberry Pi Pico Development Board (image attribution: Raspberry Pi Foundation).
-
-Below is a quick reference for Raspberry Pi RP2xxx boards.  If it is your first time
-working with this board it may be useful to get an overview of the microcontroller:
-
-.. toctree::
-   :maxdepth: 1
-
-   general.rst
-   tutorial/intro.rst
-
-Installing MicroPython
-----------------------
-
-See the corresponding section of tutorial: :ref:`rp2_intro`. It also includes
-a troubleshooting subsection.
-
-General board control
----------------------
-
-The MicroPython REPL is on the USB serial port.
-Tab-completion is useful to find out what methods an object has.
-Paste mode (ctrl-E) is useful to paste a large slab of Python code into
-the REPL.
-
-The :mod:`machine` module::
-
-    import machine
-
-    machine.freq()          # get the current frequency of the CPU
-    machine.freq(240000000) # set the CPU frequency to 240 MHz
-
-The :mod:`rp2` module::
-
-    import rp2
-
-Delay and timing
-----------------
-
-Use the :mod:`time <utime>` module::
-
-    import time
-
-    time.sleep(1)           # sleep for 1 second
-    time.sleep_ms(500)      # sleep for 500 milliseconds
-    time.sleep_us(10)       # sleep for 10 microseconds
-    start = time.ticks_ms() # get millisecond counter
-    delta = time.ticks_diff(time.ticks_ms(), start) # compute time difference
-
-Timers
-------
-
-How do they work?
-
-.. _rp2_Pins_and_GPIO:
-
-Pins and GPIO
--------------
-
-Use the :ref:`machine.Pin <machine.Pin>` class::
-
-    from machine import Pin
-
-    p0 = Pin(0, Pin.OUT)    # create output pin on GPIO0
-    p0.on()                 # set pin to "on" (high) level
-    p0.off()                # set pin to "off" (low) level
-    p0.value(1)             # set pin to on/high
-
-    p2 = Pin(2, Pin.IN)     # create input pin on GPIO2
-    print(p2.value())       # get value, 0 or 1
-
-    p4 = Pin(4, Pin.IN, Pin.PULL_UP) # enable internal pull-up resistor
-    p5 = Pin(5, Pin.OUT, value=1) # set pin high on creation
-
-UART (serial bus)
------------------
-
-See :ref:`machine.UART <machine.UART>`. ::
-
-    from machine import UART
-
-    uart1 = UART(1, baudrate=9600, tx=33, rx=32)
-    uart1.write('hello')  # write 5 bytes
-    uart1.read(5)         # read up to 5 bytes
-
-
-PWM (pulse width modulation)
-----------------------------
-
-How does PWM work on the RPi RP2xxx?
-
-Use the ``machine.PWM`` class::
-
-    from machine import Pin, PWM
-
-    pwm0 = PWM(Pin(0))      # create PWM object from a pin
-    pwm0.freq()             # get current frequency
-    pwm0.freq(1000)         # set frequency
-    pwm0.duty_u16()         # get current duty cycle, range 0-65535
-    pwm0.duty_u16(200)      # set duty cycle, range 0-65535
-    pwm0.deinit()           # turn off PWM on the pin
-
-ADC (analog to digital conversion)
-----------------------------------
-
-How does the ADC module work?
-
-Use the :ref:`machine.ADC <machine.ADC>` class::
-
-    from machine import ADC
-
-    adc = ADC(Pin(32))          # create ADC object on ADC pin
-    adc.read_u16()              # read value, 0-65535 across voltage range 0.0v - 3.3v
-
-Software SPI bus
-----------------
-
-Software SPI (using bit-banging) works on all pins, and is accessed via the
-:ref:`machine.SoftSPI <machine.SoftSPI>` class::
-
-    from machine import Pin, SoftSPI
-
-    # construct a SoftSPI bus on the given pins
-    # polarity is the idle state of SCK
-    # phase=0 means sample on the first edge of SCK, phase=1 means the second
-    spi = SoftSPI(baudrate=100000, polarity=1, phase=0, sck=Pin(0), mosi=Pin(2), miso=Pin(4))
-
-    spi.init(baudrate=200000) # set the baudrate
-
-    spi.read(10)            # read 10 bytes on MISO
-    spi.read(10, 0xff)      # read 10 bytes while outputting 0xff on MOSI
-
-    buf = bytearray(50)     # create a buffer
-    spi.readinto(buf)       # read into the given buffer (reads 50 bytes in this case)
-    spi.readinto(buf, 0xff) # read into the given buffer and output 0xff on MOSI
-
-    spi.write(b'12345')     # write 5 bytes on MOSI
-
-    buf = bytearray(4)      # create a buffer
-    spi.write_readinto(b'1234', buf) # write to MOSI and read from MISO into the buffer
-    spi.write_readinto(buf, buf) # write buf to MOSI and read MISO back into buf
-
-.. Warning::
-   Currently *all* of ``sck``, ``mosi`` and ``miso`` *must* be specified when
-   initialising Software SPI.
-
-Hardware SPI bus
-----------------
-
-Hardware SPI is accessed via the :ref:`machine.SPI <machine.SPI>` class and
-has the same methods as software SPI above::
-
-    from machine import Pin, SPI
-
-    spi = SPI(1, 10000000)
-    spi = SPI(1, 10000000, sck=Pin(14), mosi=Pin(13), miso=Pin(12))
-    spi = SPI(2, baudrate=80000000, polarity=0, phase=0, bits=8, firstbit=0, sck=Pin(18), mosi=Pin(23), miso=Pin(19))
-
-Software I2C bus
-----------------
-
-Software I2C (using bit-banging) works on all output-capable pins, and is
-accessed via the :ref:`machine.SoftI2C <machine.SoftI2C>` class::
-
-    from machine import Pin, SoftI2C
-
-    i2c = SoftI2C(scl=Pin(5), sda=Pin(4), freq=100000)
-
-    i2c.scan()              # scan for devices
-
-    i2c.readfrom(0x3a, 4)   # read 4 bytes from device with address 0x3a
-    i2c.writeto(0x3a, '12') # write '12' to device with address 0x3a
-
-    buf = bytearray(10)     # create a buffer with 10 bytes
-    i2c.writeto(0x3a, buf)  # write the given buffer to the slave
-
-Hardware I2C bus
-----------------
-
-The driver is accessed via the :ref:`machine.I2C <machine.I2C>` class and
-has the same methods as software I2C above::
-
-    from machine import Pin, I2C
-
-    i2c = I2C(0)
-    i2c = I2C(1, scl=Pin(5), sda=Pin(4), freq=400000)
-
-Real time clock (RTC)
----------------------
-
-See :ref:`machine.RTC <machine.RTC>` ::
-
-    from machine import RTC
-
-    rtc = RTC()
-    rtc.datetime((2017, 8, 23, 1, 12, 48, 0, 0)) # set a specific date and time
-    rtc.datetime() # get date and time
-
-WDT (Watchdog timer)
---------------------
-
-Is there a watchdog timer?
-
-See :ref:`machine.WDT <machine.WDT>`. ::
-
-    from machine import WDT
-
-    # enable the WDT with a timeout of 5s (1s is the minimum)
-    wdt = WDT(timeout=5000)
-    wdt.feed()
-
-Deep-sleep mode
----------------
-
-Is there deep-sleep support for the rp2?
-
-The following code can be used to sleep, wake and check the reset cause::
-
-    import machine
-
-    # check if the device woke from a deep sleep
-    if machine.reset_cause() == machine.DEEPSLEEP_RESET:
-        print('woke from a deep sleep')
-
-    # put the device to sleep for 10 seconds
-    machine.deepsleep(10000)
-
-OneWire driver
---------------
-
-The OneWire driver is implemented in software and works on all pins::
-
-    from machine import Pin
-    import onewire
-
-    ow = onewire.OneWire(Pin(12)) # create a OneWire bus on GPIO12
-    ow.scan()               # return a list of devices on the bus
-    ow.reset()              # reset the bus
-    ow.readbyte()           # read a byte
-    ow.writebyte(0x12)      # write a byte on the bus
-    ow.write('123')         # write bytes on the bus
-    ow.select_rom(b'12345678') # select a specific device by its ROM code
-
-There is a specific driver for DS18S20 and DS18B20 devices::
-
-    import time, ds18x20
-    ds = ds18x20.DS18X20(ow)
-    roms = ds.scan()
-    ds.convert_temp()
-    time.sleep_ms(750)
-    for rom in roms:
-        print(ds.read_temp(rom))
-
-Be sure to put a 4.7k pull-up resistor on the data line.  Note that
-the ``convert_temp()`` method must be called each time you want to
-sample the temperature.
-
-NeoPixel and APA106 driver
---------------------------
-
-Use the ``neopixel`` and ``apa106`` modules::
-
-    from machine import Pin
-    from neopixel import NeoPixel
-
-    pin = Pin(0, Pin.OUT)   # set GPIO0 to output to drive NeoPixels
-    np = NeoPixel(pin, 8)   # create NeoPixel driver on GPIO0 for 8 pixels
-    np[0] = (255, 255, 255) # set the first pixel to white
-    np.write()              # write data to all pixels
-    r, g, b = np[0]         # get first pixel colour
-
-
-The APA106 driver extends NeoPixel, but internally uses a different colour order::
-
-    from apa106 import APA106
-    ap = APA106(pin, 8)
-    r, g, b = ap[0]
-
-APA102 (DotStar) uses a different driver as it has an additional clock pin.
diff --git a/docs/rp2/tutorial/intro.rst b/docs/rp2/tutorial/intro.rst
deleted file mode 100644
index 5609ab3798..0000000000
--- a/docs/rp2/tutorial/intro.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-.. _rp2_intro:
-
-Getting started with MicroPython on the RP2xxx
-==============================================
-
-Let's get started!

From a5876f4deab0fa7212c1fb70dbe5f091ac1dac98 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 18 Jun 2021 16:59:48 -0500
Subject: [PATCH 274/349] fix compile error on boards with inline asm

---
 py/emitglue.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/emitglue.c b/py/emitglue.c
index 22ad55db57..e701d0808f 100644
--- a/py/emitglue.c
+++ b/py/emitglue.c
@@ -112,7 +112,7 @@ void mp_emit_glue_assign_native(mp_raw_code_t *rc, mp_raw_code_kind_t kind, void
     // so that the generated native code which was created in data RAM will
     // be available for execution from instruction RAM.
     #if MICROPY_EMIT_THUMB || MICROPY_EMIT_INLINE_THUMB
-    #if __ICACHE_PRESENT == 1
+    #if defined(__ICACHE_PRESENT) && __ICACHE_PRESENT == 1
     // Flush D-cache, so the code emitted is stored in RAM.
     MP_HAL_CLEAN_DCACHE(fun_data, fun_len);
     // Invalidate I-cache, so the newly-created code is reloaded from RAM.

From 2c30312dd421607794f2c116d522fa3d3d233c9b Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Sun, 20 Jun 2021 16:57:20 -0400
Subject: [PATCH 275/349] Fix waitskip behavior

---
 main.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/main.c b/main.c
index 00b2bdfeb3..78f8216370 100755
--- a/main.c
+++ b/main.c
@@ -281,6 +281,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
     result.exception_line = 0;
 
     bool skip_repl;
+    bool skip_wait = false;
     bool found_main = false;
     uint8_t next_code_options = 0;
     // Collects stickiness bits that apply in the current situation.
@@ -355,18 +356,23 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
             next_code_stickiness_situation |= SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_SUCCESS;
             if (next_code_options & SUPERVISOR_NEXT_CODE_OPT_RELOAD_ON_SUCCESS) {
                 skip_repl = true;
+                skip_wait = true;
                 //goto done;
             }
         }
         else {
             next_code_stickiness_situation |= SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_ERROR;
             if (next_code_options & SUPERVISOR_NEXT_CODE_OPT_RELOAD_ON_ERROR) {
+                // TODO: in what scenario is this acceptable
                 skip_repl = true;
+                skip_wait = true;
                 //goto done;
             }
         }
         if (result.return_code & PYEXEC_FORCED_EXIT) {
+            // TODO: what scenario does this describe?
             skip_repl = reload_requested;
+            skip_wait = true;
             //goto done;
         }
 
@@ -416,7 +422,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
     bool fake_sleeping = false;
     #endif
     // bool skip_repl = false;
-    while (true) {
+    while (!skip_wait) {
         RUN_BACKGROUND_TASKS;
 
         // If a reload was requested by the supervisor or autoreload, return

From 626e4e97485d9ebbc39c88fff6068141d6d58bcf Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Sun, 20 Jun 2021 17:00:56 -0400
Subject: [PATCH 276/349] Fix missed precommit formatting

---
 supervisor/shared/autoreload.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/supervisor/shared/autoreload.h b/supervisor/shared/autoreload.h
index 069be997dc..41f9faea85 100644
--- a/supervisor/shared/autoreload.h
+++ b/supervisor/shared/autoreload.h
@@ -32,12 +32,12 @@
 #include "supervisor/memory.h"
 
 enum {
-	SUPERVISOR_NEXT_CODE_OPT_RELOAD_ON_SUCCESS = 0x1,
-	SUPERVISOR_NEXT_CODE_OPT_RELOAD_ON_ERROR = 0x2,
-	SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_SUCCESS = 0x4,
-	SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_ERROR = 0x8,
-	SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_RELOAD = 0x10,
-	SUPERVISOR_NEXT_CODE_OPT_NEWLY_SET = 0x20,
+    SUPERVISOR_NEXT_CODE_OPT_RELOAD_ON_SUCCESS = 0x1,
+    SUPERVISOR_NEXT_CODE_OPT_RELOAD_ON_ERROR = 0x2,
+    SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_SUCCESS = 0x4,
+    SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_ERROR = 0x8,
+    SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_RELOAD = 0x10,
+    SUPERVISOR_NEXT_CODE_OPT_NEWLY_SET = 0x20,
 };
 
 typedef struct {
@@ -45,7 +45,7 @@ typedef struct {
     char filename[];
 } next_code_info_t;
 
-extern supervisor_allocation* next_code_allocation;
+extern supervisor_allocation *next_code_allocation;
 
 extern volatile bool reload_requested;
 

From 372ddfd562755753562a610d4e508a7af58051a3 Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Sun, 20 Jun 2021 17:20:47 -0400
Subject: [PATCH 277/349] Fix deep sleep masking, cleanup

---
 main.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/main.c b/main.c
index 78f8216370..3367445102 100755
--- a/main.c
+++ b/main.c
@@ -352,28 +352,26 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
         if (reload_requested) {
             next_code_stickiness_situation |= SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_RELOAD;
         }
-        else if (result.return_code == 0) { //TODO mask out PYEXEC_DEEP_SLEEP?
+        else if (result.return_code == 0) {
             next_code_stickiness_situation |= SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_SUCCESS;
             if (next_code_options & SUPERVISOR_NEXT_CODE_OPT_RELOAD_ON_SUCCESS) {
                 skip_repl = true;
                 skip_wait = true;
-                //goto done;
             }
         }
         else {
             next_code_stickiness_situation |= SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_ERROR;
-            if (next_code_options & SUPERVISOR_NEXT_CODE_OPT_RELOAD_ON_ERROR) {
-                // TODO: in what scenario is this acceptable
+            // Deep sleep cannot be skipped
+            // TODO: settings in deep sleep should persist, using a new sleep memory API
+            if (next_code_options & SUPERVISOR_NEXT_CODE_OPT_RELOAD_ON_ERROR
+                && !(result.return_code & PYEXEC_DEEP_SLEEP)) {
                 skip_repl = true;
                 skip_wait = true;
-                //goto done;
             }
         }
         if (result.return_code & PYEXEC_FORCED_EXIT) {
-            // TODO: what scenario does this describe?
             skip_repl = reload_requested;
             skip_wait = true;
-            //goto done;
         }
 
         if (reload_requested && result.return_code == PYEXEC_EXCEPTION) {
@@ -421,7 +419,6 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
     #if CIRCUITPY_ALARM
     bool fake_sleeping = false;
     #endif
-    // bool skip_repl = false;
     while (!skip_wait) {
         RUN_BACKGROUND_TASKS;
 

From 1f3d69d87c6d708ccf574af61a434b77637c900b Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Sun, 20 Jun 2021 17:57:51 -0400
Subject: [PATCH 278/349] Clean up sleep memory, mark as not-implemented

---
 locale/circuitpython.pot                      |  1 +
 .../common-hal/alarm/SleepMemory.c            | 24 ++++---------------
 .../common-hal/alarm/SleepMemory.h            | 15 ------------
 3 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index d1c27c180a..a0096b35b9 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -2026,6 +2026,7 @@ msgstr ""
 msgid "Size not supported"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/alarm/SleepMemory.c
 #: ports/stm/common-hal/alarm/SleepMemory.c
 msgid "Sleep Memory not available"
 msgstr ""
diff --git a/ports/raspberrypi/common-hal/alarm/SleepMemory.c b/ports/raspberrypi/common-hal/alarm/SleepMemory.c
index a444cbf207..b8fcdfbccf 100644
--- a/ports/raspberrypi/common-hal/alarm/SleepMemory.c
+++ b/ports/raspberrypi/common-hal/alarm/SleepMemory.c
@@ -29,35 +29,19 @@
 #include "py/runtime.h"
 #include "common-hal/alarm/SleepMemory.h"
 
-// Data storage for singleton instance of SleepMemory.
-// Might be RTC_SLOW_MEM or RTC_FAST_MEM, depending on setting of CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM.
-// static RTC_DATA_ATTR uint8_t _sleep_mem[SLEEP_MEMORY_LENGTH];
-
 void alarm_sleep_memory_reset(void) {
-    // ESP-IDF build system takes care of doing esp_sleep_pd_config() or the equivalentwith
-    // the correct settings, depending on which RTC mem we are using.
-    // https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/api-reference/system/sleep_modes.html#power-down-of-rtc-peripherals-and-memories
 }
 
 uint32_t common_hal_alarm_sleep_memory_get_length(alarm_sleep_memory_obj_t *self) {
-    return 0;// sizeof(_sleep_mem);
+    mp_raise_NotImplementedError(translate("Sleep Memory not available"));
+    return 0;
 }
 
 bool common_hal_alarm_sleep_memory_set_bytes(alarm_sleep_memory_obj_t *self, uint32_t start_index, const uint8_t *values, uint32_t len) {
-
-    // if (start_index + len > sizeof(_sleep_mem)) {
-    //     return false;
-    // }
-
-    // memcpy((uint8_t *)(_sleep_mem + start_index), values, len);
-    // return true;
+    mp_raise_NotImplementedError(translate("Sleep Memory not available"));
     return false;
 }
 
 void common_hal_alarm_sleep_memory_get_bytes(alarm_sleep_memory_obj_t *self, uint32_t start_index, uint8_t *values, uint32_t len) {
-
-    // if (start_index + len > sizeof(_sleep_mem)) {
-    //     return;
-    // }
-    // memcpy(values, (uint8_t *)(_sleep_mem + start_index), len);
+    mp_raise_NotImplementedError(translate("Sleep Memory not available"));
 }
diff --git a/ports/raspberrypi/common-hal/alarm/SleepMemory.h b/ports/raspberrypi/common-hal/alarm/SleepMemory.h
index 427fe30a8c..59d0429c3b 100644
--- a/ports/raspberrypi/common-hal/alarm/SleepMemory.h
+++ b/ports/raspberrypi/common-hal/alarm/SleepMemory.h
@@ -29,21 +29,6 @@
 
 #include "py/obj.h"
 
-// There are several places we could store persistent data for SleepMemory:
-//
-// RTC registers: There are a few 32-bit registers maintained during deep sleep.
-// We are already using one for saving sleep information during deep sleep.
-//
-// RTC Fast Memory: 8kB, also used for deep-sleep power-on stub.
-// RTC Slow Memory: 8kB, also used for the ULP (tiny co-processor available during sleep).
-//
-// The ESP-IDF build system takes care of the power management of these regions.
-// RTC_DATA_ATTR will allocate storage in RTC_SLOW_MEM unless CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM
-// is set. Any memory not allocated by us can be used by the ESP-IDF for heap or other purposes.
-
-// Use half of RTC_SLOW_MEM or RTC_FAST_MEM.
-#define SLEEP_MEMORY_LENGTH (4096)
-
 typedef struct {
     mp_obj_base_t base;
 } alarm_sleep_memory_obj_t;

From a23c659eda3822fcc569f85a1ccd9800b77e2d25 Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Sun, 20 Jun 2021 18:09:18 -0400
Subject: [PATCH 279/349] Add alarm tests

---
 tests/circuitpython-manual/alarm/deepsleep.py | 81 +++++++++++++++++++
 tests/circuitpython-manual/alarm/esp/boot.py  | 11 +++
 tests/circuitpython-manual/alarm/esp/code.py  | 19 +++++
 .../circuitpython-manual/alarm/lightsleep.py  | 77 ++++++++++++++++++
 tests/circuitpython-manual/alarm/nrf/code.py  | 29 +++++++
 tests/circuitpython-manual/alarm/rp/boot.py   | 11 +++
 tests/circuitpython-manual/alarm/rp/code.py   | 19 +++++
 tests/circuitpython-manual/alarm/stm/code.py  | 29 +++++++
 8 files changed, 276 insertions(+)
 create mode 100644 tests/circuitpython-manual/alarm/deepsleep.py
 create mode 100644 tests/circuitpython-manual/alarm/esp/boot.py
 create mode 100644 tests/circuitpython-manual/alarm/esp/code.py
 create mode 100644 tests/circuitpython-manual/alarm/lightsleep.py
 create mode 100644 tests/circuitpython-manual/alarm/nrf/code.py
 create mode 100644 tests/circuitpython-manual/alarm/rp/boot.py
 create mode 100644 tests/circuitpython-manual/alarm/rp/code.py
 create mode 100644 tests/circuitpython-manual/alarm/stm/code.py

diff --git a/tests/circuitpython-manual/alarm/deepsleep.py b/tests/circuitpython-manual/alarm/deepsleep.py
new file mode 100644
index 0000000000..ab4f9ea70a
--- /dev/null
+++ b/tests/circuitpython-manual/alarm/deepsleep.py
@@ -0,0 +1,81 @@
+import alarm
+import board
+import time
+import digitalio
+import neopixel
+
+## WAKING PINS - uncomment appropriate pin per microcontroller
+wake_pin = board.X1  # STM32F4 Pyboard
+# wake_pin = board.GP0                    # RP2040 Pico
+# wake_pin = board.A4                     # NRF52840 Feather
+# wake_pin = board.IO5                    # ESP32-S2 Saola
+
+## LED - use on RP2040 Pico, STM32F4 Pyboard
+## PinAlarms blink 1x, TimeAlarms 2x, Startup 3x
+led_pin = board.LED
+led = digitalio.DigitalInOut(led_pin)
+led.direction = digitalio.Direction.OUTPUT
+
+
+def blink(num_blinks):
+    for i in range(num_blinks):
+        led.value = True
+        time.sleep(0.2)
+        led.value = False
+        time.sleep(0.2)
+
+
+def show_timealarm():
+    blink(2)
+
+
+def show_pinalarm():
+    blink(1)
+
+
+def show_noalarm():
+    blink(3)
+
+
+## Comment out above if using Neopixel
+
+## NEOPIXEL - use on Circuitplayground Bluefruit, ESP32-S2 Saola
+## TimeAlarms are red, PinAlarms are blue, Default is white
+# np = neopixel.NeoPixel(board.NEOPIXEL, 1)
+# def show_timealarm():
+#     np[0] = (50, 0, 0)
+#     time.sleep(1)
+#     np[0] = (0, 0, 0)
+# def show_pinalarm():
+#     np[0] = (0, 0, 50)
+#     time.sleep(1)
+#     np[0] = (0, 0, 0)
+# def show_noalarm():
+#     np[0] = (50, 50, 50)
+#     time.sleep(1)
+#     np[0] = (0, 0, 0)
+## Comment out above if using LED
+
+## Show which alarm woke the chip
+print("Wake alarm:")
+print(alarm.wake_alarm)
+if isinstance(alarm.wake_alarm, alarm.time.TimeAlarm):
+    show_timealarm()
+elif isinstance(alarm.wake_alarm, alarm.pin.PinAlarm):
+    show_pinalarm()
+else:
+    show_noalarm()
+
+## USB enumeration may take 4-5s per restart
+time_alarm = alarm.time.TimeAlarm(monotonic_time=time.monotonic() + 10)
+
+## Deep sleep pin alarms may only accept a single configuration.
+pin_alarm = alarm.pin.PinAlarm(
+    pin=wake_pin, value=True, edge=True, pull=True
+)  # STM32 must be this exact config
+# pin_alarm = alarm.pin.PinAlarm(pin=wake_pin, value=False, edge=False, pull=True)  # NRF and ESP32S2 must use level, not edge
+# pin_alarm = alarm.pin.PinAlarm(pin=wake_pin, value=False, edge=True, pull=True)   # RP2040 supports any config
+
+alarm.exit_and_deep_sleep_until_alarms(time_alarm, pin_alarm)
+# alarm.exit_and_deep_sleep_until_alarms(pin_alarm) # Using TimeAlarm will reduce performance on the RP2040
+# alarm.exit_and_deep_sleep_until_alarms(time_alarm) # Using PinAlarm will reduce performance on the ESP32-S2
diff --git a/tests/circuitpython-manual/alarm/esp/boot.py b/tests/circuitpython-manual/alarm/esp/boot.py
new file mode 100644
index 0000000000..0b34adb7be
--- /dev/null
+++ b/tests/circuitpython-manual/alarm/esp/boot.py
@@ -0,0 +1,11 @@
+import board
+import digitalio
+import storage
+
+switch = digitalio.DigitalInOut(board.IO10)
+
+switch.direction = digitalio.Direction.INPUT
+switch.pull = digitalio.Pull.UP
+
+# If the switch pin is connected to ground CircuitPython can write to the drive
+storage.remount("/", switch.value)
diff --git a/tests/circuitpython-manual/alarm/esp/code.py b/tests/circuitpython-manual/alarm/esp/code.py
new file mode 100644
index 0000000000..d4a577cbd9
--- /dev/null
+++ b/tests/circuitpython-manual/alarm/esp/code.py
@@ -0,0 +1,19 @@
+import alarm
+import board
+import time
+import microcontroller
+import storage
+
+temperature = microcontroller.cpu.temperature
+print("Temperature:", temperature)
+
+try:
+    with open("/log.txt", "a") as sdc:
+        sdc.write("{}\n".format(temperature))
+except OSError as e:
+    print("Cannot write to fs, is IO10 grounded?")
+
+## USB enumeration may take 4-5s per restart
+time_alarm = alarm.time.TimeAlarm(monotonic_time=time.monotonic() + 10)
+
+alarm.exit_and_deep_sleep_until_alarms(time_alarm)
diff --git a/tests/circuitpython-manual/alarm/lightsleep.py b/tests/circuitpython-manual/alarm/lightsleep.py
new file mode 100644
index 0000000000..b2878db4bb
--- /dev/null
+++ b/tests/circuitpython-manual/alarm/lightsleep.py
@@ -0,0 +1,77 @@
+import alarm
+import board
+import time
+import digitalio
+import neopixel
+
+## WAKING PINS - uncomment appropriate pin per microcontroller
+wake_pin = board.X1  # STM32F4 Pyboard
+# wake_pin = board.GP0                    # RP2040 Pico
+# wake_pin = board.A4                     # NRF52840 Feather
+# wake_pin = board.IO5                    # ESP32-S2 Saola
+
+## LED - use on RP2040 Pico, STM32F4 Pyboard
+## PinAlarms blink 1x, TimeAlarms 2x, Startup 3x
+led_pin = board.LED
+led = digitalio.DigitalInOut(led_pin)
+led.direction = digitalio.Direction.OUTPUT
+
+
+def blink(num_blinks):
+    for i in range(num_blinks):
+        led.value = True
+        time.sleep(0.2)
+        led.value = False
+        time.sleep(0.2)
+
+
+def show_timealarm():
+    blink(2)
+
+
+def show_pinalarm():
+    blink(1)
+
+
+def show_noalarm():
+    blink(3)
+
+
+## Comment out above if using Neopixel
+
+## NEOPIXEL - use on Circuitplayground Bluefruit, ESP32-S2 Saola
+## TimeAlarms are red, PinAlarms are blue, Default is white
+# np = neopixel.NeoPixel(board.NEOPIXEL, 1)
+# def show_timealarm():
+#     np[0] = (50, 0, 0)
+#     time.sleep(1)
+#     np[0] = (0, 0, 0)
+# def show_pinalarm():
+#     np[0] = (0, 0, 50)
+#     time.sleep(1)
+#     np[0] = (0, 0, 0)
+# def show_noalarm():
+#     np[0] = (50, 50, 50)
+#     time.sleep(1)
+#     np[0] = (0, 0, 0)
+## Comment out above if using LED
+
+## PinAlarm only needs to be set once
+pin_alarm = alarm.pin.PinAlarm(pin=wake_pin, value=False, edge=True, pull=True)  # STM32, RP2040
+# pin_alarm = alarm.pin.PinAlarm(pin=wake_pin, value=False, edge=False, pull=True)  # NRF, ESP32-S2, RP2040
+
+while True:
+    ## TimeAlarms must be reset each time you sleep, since they use monotonic time
+    time_alarm = alarm.time.TimeAlarm(monotonic_time=time.monotonic() + 10)
+    ret_alarm = alarm.light_sleep_until_alarms(pin_alarm, time_alarm)
+
+    print("Returned alarm vs global alarm:")  # These should be the same
+    print(ret_alarm)
+    print(alarm.wake_alarm)
+
+    if isinstance(ret_alarm, alarm.time.TimeAlarm):
+        show_timealarm()
+    elif isinstance(ret_alarm, alarm.pin.PinAlarm):
+        show_pinalarm()
+    else:
+        show_noalarm()
diff --git a/tests/circuitpython-manual/alarm/nrf/code.py b/tests/circuitpython-manual/alarm/nrf/code.py
new file mode 100644
index 0000000000..b4379dc79d
--- /dev/null
+++ b/tests/circuitpython-manual/alarm/nrf/code.py
@@ -0,0 +1,29 @@
+import time
+import adafruit_ble
+from adafruit_ble_eddystone import uid, url
+import alarm
+
+np = neopixel.NeoPixel(board.NEOPIXEL, 1)
+
+radio = adafruit_ble.BLERadio()
+# Reuse the BLE address as our Eddystone instance id.
+eddystone_uid = uid.EddystoneUID(radio.address_bytes)
+eddystone_url = url.EddystoneURL("https://adafru.it/discord")
+
+while True:
+    np[0] = (50, 0, 0)
+    # Alternate between advertising our ID and our URL.
+    radio.start_advertising(eddystone_uid)
+    time.sleep(0.5)
+    radio.stop_advertising()
+
+    radio.start_advertising(eddystone_url)
+    time.sleep(0.5)
+    radio.stop_advertising()
+
+    ## USB enumeration may take 4-5s per restart
+    time_alarm = alarm.time.TimeAlarm(monotonic_time=time.monotonic() + 10)
+
+    np[0] = (0, 0, 0)
+
+    alarm.exit_and_deep_sleep_until_alarms(time_alarm)
diff --git a/tests/circuitpython-manual/alarm/rp/boot.py b/tests/circuitpython-manual/alarm/rp/boot.py
new file mode 100644
index 0000000000..93a7a66040
--- /dev/null
+++ b/tests/circuitpython-manual/alarm/rp/boot.py
@@ -0,0 +1,11 @@
+import board
+import digitalio
+import storage
+
+switch = digitalio.DigitalInOut(board.GP4)
+
+switch.direction = digitalio.Direction.INPUT
+switch.pull = digitalio.Pull.UP
+
+# If the switch pin is connected to ground CircuitPython can write to the drive
+storage.remount("/", switch.value)
diff --git a/tests/circuitpython-manual/alarm/rp/code.py b/tests/circuitpython-manual/alarm/rp/code.py
new file mode 100644
index 0000000000..4a2c7e8085
--- /dev/null
+++ b/tests/circuitpython-manual/alarm/rp/code.py
@@ -0,0 +1,19 @@
+import alarm
+import board
+import time
+import microcontroller
+import storage
+
+temperature = microcontroller.cpu.temperature
+print("Temperature:", temperature)
+
+try:
+    with open("/log.txt", "a") as sdc:
+        sdc.write("{}\n".format(temperature))
+except OSError as e:
+    print("Cannot write to fs, is GP4 grounded?")
+
+## USB enumeration may take 4-5s per restart
+time_alarm = alarm.time.TimeAlarm(monotonic_time=time.monotonic() + 10)
+
+alarm.exit_and_deep_sleep_until_alarms(time_alarm)
diff --git a/tests/circuitpython-manual/alarm/stm/code.py b/tests/circuitpython-manual/alarm/stm/code.py
new file mode 100644
index 0000000000..342e42f87e
--- /dev/null
+++ b/tests/circuitpython-manual/alarm/stm/code.py
@@ -0,0 +1,29 @@
+import alarm
+import board
+import time
+import microcontroller
+import sdioio
+import storage
+import neopixel
+
+np = neopixel.NeoPixel(board.NEOPIXEL, 1)
+np[0] = (50, 0, 0)
+
+# SD Card
+sd = sdioio.SDCard(
+    clock=board.SDIO_CLOCK, command=board.SDIO_COMMAND, data=board.SDIO_DATA, frequency=25000000
+)
+vfs = storage.VfsFat(sd)
+storage.mount(vfs, "/sd")
+
+with open("/sd/log.txt", "a") as sdc:
+    temperature = microcontroller.cpu.temperature
+    print("Temperature:", temperature)
+    sdc.write("{}\n".format(temperature))
+
+## USB enumeration may take 4-5s per restart
+time_alarm = alarm.time.TimeAlarm(monotonic_time=time.monotonic() + 10)
+
+np[0] = (0, 0, 0)
+
+alarm.exit_and_deep_sleep_until_alarms(time_alarm)

From 154e91ab855115979bd0a73766cf7392dccfc3b4 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Mon, 21 Jun 2021 08:18:06 -0400
Subject: [PATCH 280/349] add EventQueue.store_next() to allow reusing event
 objects

---
 locale/circuitpython.pot            |  4 ++++
 shared-bindings/keypad/Event.c      |  6 ++---
 shared-bindings/keypad/EventQueue.c | 34 +++++++++++++++++++++++++++--
 shared-bindings/keypad/EventQueue.h |  5 +++--
 shared-module/keypad/EventQueue.c   | 14 ++++++++++++
 5 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 04c6ead9b7..b399aba91f 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -949,6 +949,10 @@ msgstr ""
 msgid "Expected a UUID"
 msgstr ""
 
+#: shared-bindings/keypad/EventQueue.c
+msgid "Expected an %q"
+msgstr ""
+
 #: shared-bindings/_bleio/Adapter.c
 msgid "Expected an Address"
 msgstr ""
diff --git a/shared-bindings/keypad/Event.c b/shared-bindings/keypad/Event.c
index 7abd75e54d..22f3b6b37d 100644
--- a/shared-bindings/keypad/Event.c
+++ b/shared-bindings/keypad/Event.c
@@ -32,7 +32,7 @@
 
 //| class Event:
 //|     """A key transition event."""
-//|     def __init__(self, key_num: int, pressed: bool) -> None:
+//|     def __init__(self, key_num: int=0, pressed: bool=True) -> None:
 //|         """Create a key transition event, which reports a key-pressed or key-released transition.
 //|
 //|         :param int key_num: the key number
@@ -46,8 +46,8 @@ STATIC mp_obj_t keypad_event_make_new(const mp_obj_type_t *type, size_t n_args,
     self->base.type = &keypad_event_type;
     enum { ARG_key_num, ARG_pressed };
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_key_num, MP_ARG_REQUIRED | MP_ARG_INT },
-        { MP_QSTR_pressed, MP_ARG_REQUIRED | MP_ARG_BOOL },
+        { MP_QSTR_key_num, MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_pressed, MP_ARG_BOOL, {.u_bool = true} },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
diff --git a/shared-bindings/keypad/EventQueue.c b/shared-bindings/keypad/EventQueue.c
index 9ffebf3662..8cd3e74986 100644
--- a/shared-bindings/keypad/EventQueue.c
+++ b/shared-bindings/keypad/EventQueue.c
@@ -25,6 +25,7 @@
  */
 
 #include "py/runtime.h"
+#include "shared-bindings/keypad/Event.h"
 #include "shared-bindings/keypad/EventQueue.h"
 
 //| class EventQueue:
@@ -54,6 +55,34 @@ STATIC mp_obj_t keypad_eventqueue_next(mp_obj_t self_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(keypad_eventqueue_next_obj, keypad_eventqueue_next);
 
+//|     def store_next(self, Event: event) -> bool:
+//|         """Store the next key transition event in the supplied event, if available,
+//|         and return ``True``.
+//|         If there are no queued events, do not touch ``event`` and return ``False``.
+//|
+//|         The advantage of this method over ``next()`` is that it does not allocate storage.
+//|         Instead you can reuse an existing ``Event`` object.
+//|
+//|         Note that the queue size is limited; see ``max_events`` in the constructor of
+//|         a scanner such as `Keys` or `KeyMatrix`.
+//|         If a new event arrives when the queue is full, the oldest event is discarded.
+//|
+//|         :return ``True`` if an event was available and stored, ``False`` if not.
+//|         :rtype: bool
+//|         """
+//|         ...
+//|
+STATIC mp_obj_t keypad_eventqueue_store_next(mp_obj_t self_in, mp_obj_t event_in) {
+    keypad_eventqueue_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    if (!mp_obj_is_type(event_in, &keypad_event_type)) {
+        mp_raise_ValueError_varg(translate("Expected an %q"), MP_QSTR_Event);
+    }
+    keypad_event_obj_t *event = MP_OBJ_TO_PTR(event_in);
+    return mp_obj_new_bool(common_hal_keypad_eventqueue_store_next(self, event));
+}
+MP_DEFINE_CONST_FUN_OBJ_2(keypad_eventqueue_store_next_obj, keypad_eventqueue_store_next);
+
 //|     def clear(self) -> None:
 //|         """Clear any queued key transition events.
 //|         """
@@ -91,8 +120,9 @@ STATIC mp_obj_t keypad_eventqueue_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 }
 
 STATIC const mp_rom_map_elem_t keypad_eventqueue_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_clear), MP_ROM_PTR(&keypad_eventqueue_clear_obj) },
-    { MP_ROM_QSTR(MP_QSTR_next),  MP_ROM_PTR(&keypad_eventqueue_next_obj) },
+    { MP_ROM_QSTR(MP_QSTR_clear),       MP_ROM_PTR(&keypad_eventqueue_clear_obj) },
+    { MP_ROM_QSTR(MP_QSTR_next),        MP_ROM_PTR(&keypad_eventqueue_next_obj) },
+    { MP_ROM_QSTR(MP_QSTR_store_next),  MP_ROM_PTR(&keypad_eventqueue_store_next_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(keypad_eventqueue_locals_dict, keypad_eventqueue_locals_dict_table);
diff --git a/shared-bindings/keypad/EventQueue.h b/shared-bindings/keypad/EventQueue.h
index d6b2ac32c6..6faa2971fd 100644
--- a/shared-bindings/keypad/EventQueue.h
+++ b/shared-bindings/keypad/EventQueue.h
@@ -27,8 +27,8 @@
 #ifndef MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_EVENTQUEUE_H
 #define MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_EVENTQUEUE_H
 
-#include "py/objlist.h"
-#include "shared-module/keypad/Keys.h"
+#include "shared-module/keypad/Event.h"
+#include "shared-module/keypad/EventQueue.h"
 
 extern const mp_obj_type_t keypad_eventqueue_type;
 
@@ -37,5 +37,6 @@ void common_hal_keypad_eventqueue_construct(keypad_eventqueue_obj_t *self, size_
 void common_hal_keypad_eventqueue_clear(keypad_eventqueue_obj_t *self);
 size_t common_hal_keypad_eventqueue_get_length(keypad_eventqueue_obj_t *self);
 mp_obj_t common_hal_keypad_eventqueue_next(keypad_eventqueue_obj_t *self);
+bool common_hal_keypad_eventqueue_store_next(keypad_eventqueue_obj_t *self, keypad_event_obj_t *event);
 
 #endif  // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_EVENTQUEUE_H
diff --git a/shared-module/keypad/EventQueue.c b/shared-module/keypad/EventQueue.c
index e75d93106a..556e425e4b 100644
--- a/shared-module/keypad/EventQueue.c
+++ b/shared-module/keypad/EventQueue.c
@@ -49,6 +49,20 @@ mp_obj_t common_hal_keypad_eventqueue_next(keypad_eventqueue_obj_t *self) {
     return MP_OBJ_FROM_PTR(event);
 }
 
+bool common_hal_keypad_eventqueue_store_next(keypad_eventqueue_obj_t *self, keypad_event_obj_t *event) {
+    int encoded_event = ringbuf_get16(&self->encoded_events);
+    if (encoded_event == -1) {
+        return false;
+    }
+
+    // "Construct" using the existing event.
+    common_hal_keypad_event_construct(event, encoded_event & EVENT_KEY_NUM_MASK, encoded_event & EVENT_PRESSED);
+    return true;
+}
+
+
+
+
 void common_hal_keypad_eventqueue_clear(keypad_eventqueue_obj_t *self) {
     ringbuf_clear(&self->encoded_events);
 }

From a718d3315707887cebe3458e4cb3655e07c0f8b0 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Mon, 21 Jun 2021 09:04:26 -0400
Subject: [PATCH 281/349] fix doc typos

---
 shared-bindings/imagecapture/ParallelImageCapture.c | 2 +-
 shared-bindings/keypad/EventQueue.c                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared-bindings/imagecapture/ParallelImageCapture.c b/shared-bindings/imagecapture/ParallelImageCapture.c
index 8e8991339b..59a6f256e6 100644
--- a/shared-bindings/imagecapture/ParallelImageCapture.c
+++ b/shared-bindings/imagecapture/ParallelImageCapture.c
@@ -43,7 +43,7 @@
 //|         clock: microcontroller.Pin,
 //|         vsync: Optional[microcontroller.Pin],
 //|         href: Optional[microcontroller.Pin],
-//|     ):
+//|     ) -> None:
 //|         """Create a parallel image capture object
 //|
 //|         :param List[microcontroller.Pin] data_pins: The data pins.
diff --git a/shared-bindings/keypad/EventQueue.c b/shared-bindings/keypad/EventQueue.c
index 8cd3e74986..e9d1054c78 100644
--- a/shared-bindings/keypad/EventQueue.c
+++ b/shared-bindings/keypad/EventQueue.c
@@ -55,7 +55,7 @@ STATIC mp_obj_t keypad_eventqueue_next(mp_obj_t self_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(keypad_eventqueue_next_obj, keypad_eventqueue_next);
 
-//|     def store_next(self, Event: event) -> bool:
+//|     def store_next(self, event: Event) -> bool:
 //|         """Store the next key transition event in the supplied event, if available,
 //|         and return ``True``.
 //|         If there are no queued events, do not touch ``event`` and return ``False``.

From 51c547a5b9e9b84af3e5d2490718853a88af9c61 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Mon, 21 Jun 2021 12:13:39 -0400
Subject: [PATCH 282/349] add generic arg validation routines; add interval
 args to keypad

---
 locale/circuitpython.pot                   | 35 +++++++++------
 py/argcheck.c                              | 51 ++++++++++++++++++++++
 py/runtime.h                               |  8 ++++
 shared-bindings/keypad/Event.c             |  7 +--
 shared-bindings/keypad/EventQueue.c        |  6 +--
 shared-bindings/keypad/KeyMatrix.c         | 43 ++++++++----------
 shared-bindings/keypad/KeyMatrix.h         |  2 +-
 shared-bindings/keypad/Keys.c              | 28 ++++++------
 shared-bindings/keypad/Keys.h              |  2 +-
 shared-bindings/keypad/ShiftRegisterKeys.c | 37 +++++++---------
 shared-bindings/keypad/ShiftRegisterKeys.h |  2 +-
 shared-module/keypad/KeyMatrix.c           |  9 ++--
 shared-module/keypad/KeyMatrix.h           |  1 +
 shared-module/keypad/Keys.c                |  8 ++--
 shared-module/keypad/Keys.h                |  1 +
 shared-module/keypad/ShiftRegisterKeys.c   |  7 ++-
 shared-module/keypad/ShiftRegisterKeys.h   |  1 +
 17 files changed, 151 insertions(+), 97 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 23f4dd7baa..0c21d69438 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -83,8 +83,7 @@ msgstr ""
 msgid "%q indices must be integers, not %s"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
+#: py/argcheck.c
 msgid "%q length must be %q"
 msgstr ""
 
@@ -92,6 +91,14 @@ msgstr ""
 msgid "%q list must be a list"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must <= %d"
+msgstr ""
+
+#: py/argcheck.c
+msgid "%q must be %d-%d"
+msgstr ""
+
 #: shared-bindings/usb_hid/Device.c
 msgid "%q must be 0-255"
 msgstr ""
@@ -100,18 +107,17 @@ msgstr ""
 msgid "%q must be 1-255"
 msgstr ""
 
-#: shared-bindings/keypad/Event.c
-msgid "%q must be > 0"
+#: py/argcheck.c
+msgid "%q must be >= %d"
 msgstr ""
 
-#: shared-bindings/memorymonitor/AllocationAlarm.c
+#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c
 msgid "%q must be >= 0"
 msgstr ""
 
 #: shared-bindings/_bleio/CharacteristicBuffer.c
 #: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.c
-#: shared-bindings/displayio/Shape.c shared-bindings/keypad/KeyMatrix.c
-#: shared-bindings/keypad/Keys.c shared-bindings/keypad/ShiftRegisterKeys.c
+#: shared-bindings/displayio/Shape.c
 #: shared-bindings/memorymonitor/AllocationAlarm.c
 #: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c
 msgid "%q must be >= 1"
@@ -121,6 +127,10 @@ msgstr ""
 msgid "%q must be None or between 1 and len(report_descriptor)-1"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must be a string"
+msgstr ""
+
 #: shared-module/vectorio/Polygon.c
 msgid "%q must be a tuple of length 2"
 msgstr ""
@@ -129,14 +139,17 @@ msgstr ""
 msgid "%q must be between %d and %d"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must of type %q"
+msgstr ""
+
 #: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
 #: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q must store bytes"
 msgstr ""
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
-#: shared-bindings/canio/Match.c shared-bindings/keypad/KeyMatrix.c
-#: shared-bindings/keypad/Keys.c shared-bindings/keypad/ShiftRegisterKeys.c
+#: shared-bindings/canio/Match.c
 msgid "%q out of range"
 msgstr ""
 
@@ -953,10 +966,6 @@ msgstr ""
 msgid "Expected a UUID"
 msgstr ""
 
-#: shared-bindings/keypad/EventQueue.c
-msgid "Expected an %q"
-msgstr ""
-
 #: shared-bindings/_bleio/Adapter.c
 msgid "Expected an Address"
 msgstr ""
diff --git a/py/argcheck.c b/py/argcheck.c
index 8d26779b91..7710cf1592 100644
--- a/py/argcheck.c
+++ b/py/argcheck.c
@@ -162,3 +162,54 @@ NORETURN void mp_arg_error_unimpl_kw(void) {
     mp_raise_NotImplementedError(MP_ERROR_TEXT("keyword argument(s) not yet implemented - use normal args instead"));
 }
 #endif
+
+
+mp_int_t mp_arg_validate_int_min(mp_int_t i, mp_int_t min, qstr arg_name) {
+    if (i < min) {
+        mp_raise_ValueError_varg(translate("%q must be >= %d"), arg_name, min);
+    }
+    return i;
+}
+
+mp_int_t mp_arg_validate_int_max(mp_int_t i, mp_int_t max, qstr arg_name) {
+    if (i > max) {
+        mp_raise_ValueError_varg(translate("%q must <= %d"), arg_name, max);
+    }
+    return i;
+}
+
+mp_int_t mp_arg_validate_int_range(mp_int_t i, mp_int_t min, mp_int_t max, qstr arg_name) {
+    if (i < min || i > max) {
+        mp_raise_ValueError_varg(translate("%q must be %d-%d"), arg_name, min, max);
+    }
+    return i;
+}
+
+mp_float_t mp_arg_validate_obj_float_non_negative(mp_obj_t float_in, mp_float_t default_for_null, qstr arg_name) {
+    const mp_float_t f = (float_in == MP_OBJ_NULL)
+        ? default_for_null
+        : mp_obj_get_float(float_in);
+    if (f <= 0.0f) {
+        mp_raise_ValueError_varg(translate("%q must be >= 0"), arg_name);
+    }
+    return f;
+}
+
+size_t mp_arg_validate_length_with_name(mp_int_t i, size_t length, qstr arg_name, qstr length_name) {
+    mp_raise_ValueError_varg(translate("%q length must be %q"), MP_QSTR_pressed, MP_QSTR_num_keys);
+    return (size_t)i;
+}
+
+mp_obj_t mp_arg_validate_type(mp_obj_t obj, const mp_obj_type_t *type, qstr arg_name) {
+    if (!mp_obj_is_type(obj, type)) {
+        mp_raise_TypeError_varg(translate("%q must of type %q"), arg_name, type->name);
+    }
+    return obj;
+}
+
+mp_obj_t mp_arg_validate_string(mp_obj_t obj, qstr arg_name) {
+    if (!mp_obj_is_str(obj)) {
+        mp_raise_TypeError_varg(translate("%q must be a string"), arg_name);
+    }
+    return obj;
+}
diff --git a/py/runtime.h b/py/runtime.h
index a8a3120eef..c16cbe80d7 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -90,6 +90,14 @@ void mp_arg_parse_all_kw_array(size_t n_pos, size_t n_kw, const mp_obj_t *args,
 NORETURN void mp_arg_error_terse_mismatch(void);
 NORETURN void mp_arg_error_unimpl_kw(void);
 
+mp_int_t mp_arg_validate_int_min(mp_int_t i, mp_int_t min, qstr arg_name);
+mp_int_t mp_arg_validate_int_max(mp_int_t i, mp_int_t j, qstr arg_name);
+mp_int_t mp_arg_validate_int_range(mp_int_t i, mp_int_t min, mp_int_t max, qstr arg_name);
+mp_float_t mp_arg_validate_obj_float_non_negative(mp_obj_t float_in, mp_float_t default_for_null, qstr arg_name);
+size_t mp_arg_validate_length_with_name(mp_int_t i, size_t length, qstr arg_name, qstr length_name);
+mp_obj_t mp_arg_validate_type(mp_obj_t obj, const mp_obj_type_t *type, qstr arg_name);
+mp_obj_t mp_arg_validate_string(mp_obj_t obj, qstr arg_name);
+
 static inline mp_obj_dict_t *PLACE_IN_ITCM(mp_locals_get)(void) {
     return MP_STATE_THREAD(dict_locals);
 }
diff --git a/shared-bindings/keypad/Event.c b/shared-bindings/keypad/Event.c
index 22f3b6b37d..ff1323eac0 100644
--- a/shared-bindings/keypad/Event.c
+++ b/shared-bindings/keypad/Event.c
@@ -52,12 +52,9 @@ STATIC mp_obj_t keypad_event_make_new(const mp_obj_type_t *type, size_t n_args,
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const mp_int_t key_num = args[ARG_key_num].u_int;
-    if (key_num < 0) {
-        mp_raise_ValueError_varg(translate("%q must be > 0"), MP_QSTR_key_num);
-    }
+    const mp_uint_t key_num = (mp_uint_t)mp_arg_validate_int_min(args[ARG_key_num].u_int, 0, MP_QSTR_key_num);
 
-    common_hal_keypad_event_construct(self, (mp_uint_t)key_num, args[ARG_pressed].u_bool);
+    common_hal_keypad_event_construct(self, key_num, args[ARG_pressed].u_bool);
     return MP_OBJ_FROM_PTR(self);
 }
 
diff --git a/shared-bindings/keypad/EventQueue.c b/shared-bindings/keypad/EventQueue.c
index e9d1054c78..ae544a6665 100644
--- a/shared-bindings/keypad/EventQueue.c
+++ b/shared-bindings/keypad/EventQueue.c
@@ -75,10 +75,8 @@ MP_DEFINE_CONST_FUN_OBJ_1(keypad_eventqueue_next_obj, keypad_eventqueue_next);
 STATIC mp_obj_t keypad_eventqueue_store_next(mp_obj_t self_in, mp_obj_t event_in) {
     keypad_eventqueue_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
-    if (!mp_obj_is_type(event_in, &keypad_event_type)) {
-        mp_raise_ValueError_varg(translate("Expected an %q"), MP_QSTR_Event);
-    }
-    keypad_event_obj_t *event = MP_OBJ_TO_PTR(event_in);
+    keypad_event_obj_t *event = MP_OBJ_TO_PTR(mp_arg_validate_type(event_in, &keypad_event_type, MP_QSTR_event));
+
     return mp_obj_new_bool(common_hal_keypad_eventqueue_store_next(self, event));
 }
 MP_DEFINE_CONST_FUN_OBJ_2(keypad_eventqueue_store_next_obj, keypad_eventqueue_store_next);
diff --git a/shared-bindings/keypad/KeyMatrix.c b/shared-bindings/keypad/KeyMatrix.c
index 98cefa0198..f2c80b42e5 100644
--- a/shared-bindings/keypad/KeyMatrix.c
+++ b/shared-bindings/keypad/KeyMatrix.c
@@ -36,7 +36,7 @@
 //| class KeyMatrix:
 //|     """Manage a 2D matrix of keys with row and column pins."""
 //|
-//|     def __init__(self, row_pins: Sequence[microcontroller.Pin], col_pins: Sequence[microcontroller.Pin], columns_to_anodes: bool = True, max_events: int = 64) -> None:
+//|     def __init__(self, row_pins: Sequence[microcontroller.Pin], col_pins: Sequence[microcontroller.Pin], columns_to_anodes: bool = True, interval: float = 0.020, max_events: int = 64) -> None:
 //|         """
 //|         Create a `Keys` object that will scan the key matrix attached to the given row and column pins.
 //|         There should not be any pull-ups or pull-downs on the matrix.
@@ -54,7 +54,8 @@
 //|           If the matrix uses diodes, the diode anodes are typically connected to the column pins,
 //|           and the cathodes should be connected to the row pins. If your diodes are reversed,
 //|           set ``columns_to_anodes`` to ``False``.
-//|
+//|         :param float interval: Scan keys no more often
+//|           to allow for debouncing. Given in seconds.
 //|         :param int max_events: maximum size of `events` `EventQueue`:
 //|           maximum number of key transition events that are saved.
 //|           Must be >= 1.
@@ -65,11 +66,12 @@
 STATIC mp_obj_t keypad_keymatrix_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     keypad_keymatrix_obj_t *self = m_new_obj(keypad_keymatrix_obj_t);
     self->base.type = &keypad_keymatrix_type;
-    enum { ARG_row_pins, ARG_col_pins, ARG_columns_to_anodes, ARG_max_events };
+    enum { ARG_row_pins, ARG_col_pins, ARG_columns_to_anodes, ARG_interval, ARG_max_events };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_row_pins, MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_col_pins, MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_columns_to_anodes, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} },
+        { MP_QSTR_interval, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_max_events, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 64} },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -82,10 +84,9 @@ STATIC mp_obj_t keypad_keymatrix_make_new(const mp_obj_type_t *type, size_t n_ar
     mp_obj_t col_pins = args[ARG_col_pins].u_obj;
     const size_t num_col_pins = (size_t)MP_OBJ_SMALL_INT_VALUE(mp_obj_len(col_pins));
 
-    if (args[ARG_max_events].u_int < 1) {
-        mp_raise_ValueError_varg(translate("%q must be >= 1"), MP_QSTR_max_events);
-    }
-    const size_t max_events = (size_t)args[ARG_max_events].u_int;
+    const mp_float_t interval =
+        mp_arg_validate_obj_float_non_negative(args[ARG_interval].u_obj, 0.020f, MP_QSTR_interval);
+    const size_t max_events = (size_t)mp_arg_validate_int_min(args[ARG_max_events].u_int, 1, MP_QSTR_max_events);
 
     mcu_pin_obj_t *row_pins_array[num_row_pins];
     mcu_pin_obj_t *col_pins_array[num_col_pins];
@@ -102,7 +103,7 @@ STATIC mp_obj_t keypad_keymatrix_make_new(const mp_obj_type_t *type, size_t n_ar
         col_pins_array[col] = pin;
     }
 
-    common_hal_keypad_keymatrix_construct(self, num_row_pins, row_pins_array, num_col_pins, col_pins_array, args[ARG_columns_to_anodes].u_bool, max_events);
+    common_hal_keypad_keymatrix_construct(self, num_row_pins, row_pins_array, num_col_pins, col_pins_array, args[ARG_columns_to_anodes].u_bool, interval, max_events);
     return MP_OBJ_FROM_PTR(self);
 }
 
@@ -168,18 +169,14 @@ STATIC mp_obj_t keypad_keymatrix_key_num(mp_obj_t self_in, mp_obj_t row_in, mp_o
     keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
 
-    const mp_int_t row = mp_obj_get_int(row_in);
-    if (row < 0 || (size_t)row >= common_hal_keypad_keymatrix_get_num_rows(self)) {
-        mp_raise_ValueError_varg(translate("%q out of range"), MP_QSTR_row_num);
-    }
+    const mp_uint_t row = (mp_uint_t)mp_arg_validate_int_range(
+        mp_obj_get_int(row_in), 0, (mp_int_t)common_hal_keypad_keymatrix_get_num_rows(self), MP_QSTR_row);
 
-    const mp_int_t col = mp_obj_get_int(col_in);
-    if (col < 0 || (size_t)col >= common_hal_keypad_keymatrix_get_num_cols(self)) {
-        mp_raise_ValueError_varg(translate("%q out of range"), MP_QSTR_col_num);
-    }
+    const mp_int_t col = (mp_uint_t)mp_arg_validate_int_range(
+        mp_obj_get_int(col_in), 0, (mp_int_t)common_hal_keypad_keymatrix_get_num_cols(self), MP_QSTR_col);
 
     return MP_OBJ_NEW_SMALL_INT(
-        (mp_int_t)common_hal_keypad_keymatrix_key_num(self, (mp_uint_t)row, (mp_uint_t)col));
+        (mp_int_t)common_hal_keypad_keymatrix_key_num(self, row, col));
 }
 MP_DEFINE_CONST_FUN_OBJ_3(keypad_keymatrix_key_num_obj, keypad_keymatrix_key_num);
 
@@ -193,10 +190,8 @@ STATIC mp_obj_t keypad_keymatrix_pressed(mp_obj_t self_in, mp_obj_t key_num_in)
     keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
 
-    mp_int_t key_num = mp_obj_get_int(key_num_in);
-    if (key_num < 0 || (size_t)key_num >= common_hal_keypad_keymatrix_get_num_keys(self)) {
-        mp_raise_ValueError_varg(translate("%q out of range"), MP_QSTR_key_num);
-    }
+    mp_uint_t key_num = mp_arg_validate_int_range(
+        mp_obj_get_int(key_num_in), 0, (mp_int_t)common_hal_keypad_keymatrix_get_num_keys(self), MP_QSTR_key_num);
 
     return mp_obj_new_bool(common_hal_keypad_keymatrix_pressed(self, (mp_uint_t)key_num));
 }
@@ -220,9 +215,9 @@ STATIC mp_obj_t keypad_keymatrix_store_states(mp_obj_t self_in, mp_obj_t pressed
     if (bufinfo.typecode != 'b' && bufinfo.typecode != 'B' && bufinfo.typecode != BYTEARRAY_TYPECODE) {
         mp_raise_ValueError_varg(translate("%q must store bytes"), MP_QSTR_states);
     }
-    if (bufinfo.len != common_hal_keypad_keymatrix_get_num_keys(self)) {
-        mp_raise_ValueError_varg(translate("%q length must be %q"), MP_QSTR_states, MP_QSTR_num_keys);
-    }
+
+    (void)mp_arg_validate_length_with_name(bufinfo.len, common_hal_keypad_keymatrix_get_num_keys(self),
+        MP_QSTR_states, MP_QSTR_num_keys);
 
     common_hal_keypad_keymatrix_store_states(self, (uint8_t *)bufinfo.buf);
     return MP_ROM_NONE;
diff --git a/shared-bindings/keypad/KeyMatrix.h b/shared-bindings/keypad/KeyMatrix.h
index 59df6830e9..72e1847c44 100644
--- a/shared-bindings/keypad/KeyMatrix.h
+++ b/shared-bindings/keypad/KeyMatrix.h
@@ -32,7 +32,7 @@
 
 extern const mp_obj_type_t keypad_keymatrix_type;
 
-void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint_t num_row_pins, mcu_pin_obj_t *row_pins[], mp_uint_t num_col_pins, mcu_pin_obj_t *col_pins[], bool columns_to_anodes, size_t max_events);
+void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint_t num_row_pins, mcu_pin_obj_t *row_pins[], mp_uint_t num_col_pins, mcu_pin_obj_t *col_pins[], bool columns_to_anodes, mp_float_t interval, size_t max_events);
 
 void common_hal_keypad_keymatrix_deinit(keypad_keymatrix_obj_t *self);
 bool common_hal_keypad_keymatrix_deinited(keypad_keymatrix_obj_t *self);
diff --git a/shared-bindings/keypad/Keys.c b/shared-bindings/keypad/Keys.c
index ccbe034f3c..6286104be4 100644
--- a/shared-bindings/keypad/Keys.c
+++ b/shared-bindings/keypad/Keys.c
@@ -36,7 +36,7 @@
 //| class Keys:
 //|     """Manage a set of independent keys."""
 //|
-//|     def __init__(self, pins: Sequence[microcontroller.Pin], *, level_when_pressed: bool, pull: bool = True, max_events: int = 64) -> None:
+//|     def __init__(self, pins: Sequence[microcontroller.Pin], *, level_when_pressed: bool, pull: bool = True, interval: float = 0.020, max_events: int = 64) -> None:
 //|         """
 //|         Create a `Keys` object that will scan keys attached to the given sequence of pins.
 //|         Each key is independent and attached to its own pin.
@@ -56,6 +56,8 @@
 //|           If an external pull is already provided for all the pins, you can set ``pull`` to ``False``.
 //|           However, enabling an internal pull when an external one is already present is not a problem;
 //|           it simply uses slightly more current.
+//|         :param float interval: Scan keys no more often
+//|           to allow for debouncing. Given in seconds.
 //|         :param int max_events: maximum size of `events` `EventQueue`:
 //|           maximum number of key transition events that are saved.
 //|           Must be >= 1.
@@ -66,11 +68,12 @@
 STATIC mp_obj_t keypad_keys_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     keypad_keys_obj_t *self = m_new_obj(keypad_keys_obj_t);
     self->base.type = &keypad_keys_type;
-    enum { ARG_pins, ARG_value_when_pressed, ARG_pull, ARG_max_events };
+    enum { ARG_pins, ARG_value_when_pressed, ARG_pull, ARG_interval, ARG_max_events };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_pins, MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_value_when_pressed, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_BOOL },
         { MP_QSTR_pull, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} },
+        { MP_QSTR_interval, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL } },
         { MP_QSTR_max_events, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 64} },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -81,11 +84,9 @@ STATIC mp_obj_t keypad_keys_make_new(const mp_obj_type_t *type, size_t n_args, c
     const size_t num_pins = (size_t)MP_OBJ_SMALL_INT_VALUE(mp_obj_len(pins));
 
     const bool value_when_pressed = args[ARG_value_when_pressed].u_bool;
-
-    if (args[ARG_max_events].u_int < 1) {
-        mp_raise_ValueError_varg(translate("%q must be >= 1"), MP_QSTR_max_events);
-    }
-    const size_t max_events = (size_t)args[ARG_max_events].u_int;
+    const mp_float_t interval =
+        mp_arg_validate_obj_float_non_negative(args[ARG_interval].u_obj, 0.020f, MP_QSTR_interval);
+    const size_t max_events = (size_t)mp_arg_validate_int_min(args[ARG_max_events].u_int, 1, MP_QSTR_max_events);
 
     mcu_pin_obj_t *pins_array[num_pins];
 
@@ -95,7 +96,7 @@ STATIC mp_obj_t keypad_keys_make_new(const mp_obj_type_t *type, size_t n_args, c
         pins_array[i] = pin;
     }
 
-    common_hal_keypad_keys_construct(self, num_pins, pins_array, value_when_pressed, args[ARG_pull].u_bool, max_events);
+    common_hal_keypad_keys_construct(self, num_pins, pins_array, value_when_pressed, args[ARG_pull].u_bool, interval, max_events);
 
     return MP_OBJ_FROM_PTR(self);
 }
@@ -163,10 +164,8 @@ STATIC mp_obj_t keypad_keys_pressed(mp_obj_t self_in, mp_obj_t key_num_in) {
     keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
 
-    mp_int_t key_num = mp_obj_get_int(key_num_in);
-    if (key_num < 0 || (size_t)key_num >= common_hal_keypad_keys_get_num_keys(self)) {
-        mp_raise_ValueError_varg(translate("%q out of range"), MP_QSTR_key_num);
-    }
+    const mp_int_t key_num = mp_obj_get_int(key_num_in);
+    (void)mp_arg_validate_int_range(key_num, 0, common_hal_keypad_keys_get_num_keys(self), MP_QSTR_key_num);
 
     return mp_obj_new_bool(common_hal_keypad_keys_pressed(self, (mp_uint_t)key_num));
 }
@@ -190,9 +189,8 @@ STATIC mp_obj_t keypad_keys_store_states(mp_obj_t self_in, mp_obj_t pressed) {
     if (bufinfo.typecode != 'b' && bufinfo.typecode != 'B' && bufinfo.typecode != BYTEARRAY_TYPECODE) {
         mp_raise_ValueError_varg(translate("%q must store bytes"), MP_QSTR_pressed);
     }
-    if (bufinfo.len != common_hal_keypad_keys_get_num_keys(self)) {
-        mp_raise_ValueError_varg(translate("%q length must be %q"), MP_QSTR_pressed, MP_QSTR_num_keys);
-    }
+    (void)mp_arg_validate_length_with_name(bufinfo.len,common_hal_keypad_keys_get_num_keys(self),
+        MP_QSTR_pressed, MP_QSTR_num_keys);
 
     common_hal_keypad_keys_store_states(self, (uint8_t *)bufinfo.buf);
     return MP_ROM_NONE;
diff --git a/shared-bindings/keypad/Keys.h b/shared-bindings/keypad/Keys.h
index edcf0b2b03..6160b8b959 100644
--- a/shared-bindings/keypad/Keys.h
+++ b/shared-bindings/keypad/Keys.h
@@ -32,7 +32,7 @@
 
 extern const mp_obj_type_t keypad_keys_type;
 
-void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pins, mcu_pin_obj_t *pins[], bool value_when_pressed,  bool pull, size_t max_events);
+void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pins, mcu_pin_obj_t *pins[], bool value_when_pressed,  bool pull, mp_float_t interval, size_t max_events);
 
 void common_hal_keypad_keys_deinit(keypad_keys_obj_t *self);
 bool common_hal_keypad_keys_deinited(keypad_keys_obj_t *self);
diff --git a/shared-bindings/keypad/ShiftRegisterKeys.c b/shared-bindings/keypad/ShiftRegisterKeys.c
index 31e0baf2f1..583e20e243 100644
--- a/shared-bindings/keypad/ShiftRegisterKeys.c
+++ b/shared-bindings/keypad/ShiftRegisterKeys.c
@@ -36,7 +36,7 @@
 //| class ShiftRegisterKeys:
 //|     """Manage a set of keys attached to an incoming shift register."""
 //|
-//|     def __init__(self, clock: microcontroller.Pin, data: microcontroller.Pin, latch: microcontroller.Pin, level_when_pressed: bool, max_events: int = 64) -> None:
+//|     def __init__(self, clock: microcontroller.Pin, data: microcontroller.Pin, latch: microcontroller.Pin, level_when_pressed: bool, interval: float = 0.020, max_events: int = 64) -> None:
 //|         """
 //|         Create a `Keys` object that will scan keys attached to a parallel-in serial-out shift register
 //|         like the 74HC165 or equivalent.
@@ -58,6 +58,8 @@
 //|         :param int num_keys: number of data lines to clock in
 //|         :param bool value_when_pressed: ``True`` if the pin reads high when the key is pressed.
 //|           ``False`` if the pin reads low (is grounded) when the key is pressed.
+//|         :param float interval: Scan keys no more often
+//|           to allow for debouncing. Given in seconds.
 //|         :param int max_events: maximum size of `events` `EventQueue`:
 //|           maximum number of key transition events that are saved.
 //|           Must be >= 1.
@@ -68,13 +70,14 @@
 STATIC mp_obj_t keypad_shiftregisterkeys_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     keypad_shiftregisterkeys_obj_t *self = m_new_obj(keypad_shiftregisterkeys_obj_t);
     self->base.type = &keypad_shiftregisterkeys_type;
-    enum { ARG_clock, ARG_data, ARG_latch, ARG_num_keys, ARG_value_when_pressed, ARG_max_events };
+    enum { ARG_clock, ARG_data, ARG_latch, ARG_num_keys, ARG_value_when_pressed, ARG_interval, ARG_max_events };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_clock, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_data, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_latch, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_num_keys, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT },
         { MP_QSTR_value_when_pressed, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_BOOL },
+        { MP_QSTR_interval, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_max_events, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 64} },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -84,20 +87,14 @@ STATIC mp_obj_t keypad_shiftregisterkeys_make_new(const mp_obj_type_t *type, siz
     mcu_pin_obj_t *data = validate_obj_is_free_pin(args[ARG_data].u_obj);
     mcu_pin_obj_t *latch = validate_obj_is_free_pin(args[ARG_latch].u_obj);
 
-    if (args[ARG_num_keys].u_int < 1) {
-        mp_raise_ValueError_varg(translate("%q must be >= 1"), MP_QSTR_num_keys);
-    }
-    const size_t num_keys = (size_t)args[ARG_num_keys].u_int;
-
+    const size_t num_keys = (size_t)mp_arg_validate_int_min(args[ARG_num_keys].u_int, 1, MP_QSTR_num_keys);
     const bool value_when_pressed = args[ARG_value_when_pressed].u_bool;
-
-    if (args[ARG_max_events].u_int < 1) {
-        mp_raise_ValueError_varg(translate("%q must be >= 1"), MP_QSTR_max_events);
-    }
-    const size_t max_events = (size_t)args[ARG_max_events].u_int;
+    const mp_float_t interval =
+        mp_arg_validate_obj_float_non_negative(args[ARG_interval].u_obj, 0.020f, MP_QSTR_interval);
+    const size_t max_events = (size_t)mp_arg_validate_int_min(args[ARG_max_events].u_int, 1, MP_QSTR_max_events);
 
     common_hal_keypad_shiftregisterkeys_construct(
-        self, clock, data, latch, num_keys, value_when_pressed, max_events);
+        self, clock, data, latch, num_keys, value_when_pressed, interval, max_events);
 
     return MP_OBJ_FROM_PTR(self);
 }
@@ -165,12 +162,11 @@ STATIC mp_obj_t keypad_shiftregisterkeys_pressed(mp_obj_t self_in, mp_obj_t key_
     keypad_shiftregisterkeys_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
 
-    mp_int_t key_num = mp_obj_get_int(key_num_in);
-    if (key_num < 0 || (size_t)key_num >= common_hal_keypad_shiftregisterkeys_get_num_keys(self)) {
-        mp_raise_ValueError_varg(translate("%q out of range"), MP_QSTR_key_num);
-    }
+    mp_uint_t key_num = mp_arg_validate_int_range(
+        mp_obj_get_int(key_num_in), 0, (mp_int_t)common_hal_keypad_shiftregisterkeys_get_num_keys(self),
+        MP_QSTR_key_num);
 
-    return mp_obj_new_bool(common_hal_keypad_shiftregisterkeys_pressed(self, (mp_uint_t)key_num));
+    return mp_obj_new_bool(common_hal_keypad_shiftregisterkeys_pressed(self, key_num));
 }
 MP_DEFINE_CONST_FUN_OBJ_2(keypad_shiftregisterkeys_pressed_obj, keypad_shiftregisterkeys_pressed);
 
@@ -192,9 +188,8 @@ STATIC mp_obj_t keypad_shiftregisterkeys_store_states(mp_obj_t self_in, mp_obj_t
     if (bufinfo.typecode != 'b' && bufinfo.typecode != 'B' && bufinfo.typecode != BYTEARRAY_TYPECODE) {
         mp_raise_ValueError_varg(translate("%q must store bytes"), MP_QSTR_pressed);
     }
-    if (bufinfo.len != common_hal_keypad_shiftregisterkeys_get_num_keys(self)) {
-        mp_raise_ValueError_varg(translate("%q length must be %q"), MP_QSTR_pressed, MP_QSTR_num_keys);
-    }
+    (void)mp_arg_validate_length_with_name(bufinfo.len, common_hal_keypad_shiftregisterkeys_get_num_keys(self),
+        MP_QSTR_states, MP_QSTR_num_keys);
 
     common_hal_keypad_shiftregisterkeys_store_states(self, (uint8_t *)bufinfo.buf);
     return MP_ROM_NONE;
diff --git a/shared-bindings/keypad/ShiftRegisterKeys.h b/shared-bindings/keypad/ShiftRegisterKeys.h
index 6fb6dc94f4..bf33f08e59 100644
--- a/shared-bindings/keypad/ShiftRegisterKeys.h
+++ b/shared-bindings/keypad/ShiftRegisterKeys.h
@@ -32,7 +32,7 @@
 
 extern const mp_obj_type_t keypad_shiftregisterkeys_type;
 
-void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_t *self, mcu_pin_obj_t *clock_pin, mcu_pin_obj_t *data_pin, mcu_pin_obj_t *latch_pin, size_t num_keys, bool value_when_pressed, size_t max_events);
+void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_t *self, mcu_pin_obj_t *clock_pin, mcu_pin_obj_t *data_pin, mcu_pin_obj_t *latch_pin, size_t num_keys, bool value_when_pressed, mp_float_t interval, size_t max_events);
 
 void common_hal_keypad_shiftregisterkeys_deinit(keypad_shiftregisterkeys_obj_t *self);
 bool common_hal_keypad_shiftregisterkeys_deinited(keypad_shiftregisterkeys_obj_t *self);
diff --git a/shared-module/keypad/KeyMatrix.c b/shared-module/keypad/KeyMatrix.c
index 5aa7f95e5f..8ac3abe837 100644
--- a/shared-module/keypad/KeyMatrix.c
+++ b/shared-module/keypad/KeyMatrix.c
@@ -36,13 +36,11 @@
 #include "supervisor/port.h"
 #include "supervisor/shared/tick.h"
 
-#define DEBOUNCE_TICKS (20)
-
 static mp_uint_t row_col_to_key_num(keypad_keymatrix_obj_t *self, mp_uint_t row, mp_uint_t col) {
     return row * self->col_digitalinouts->len + col;
 }
 
-void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint_t num_row_pins, mcu_pin_obj_t *row_pins[], mp_uint_t num_col_pins, mcu_pin_obj_t *col_pins[], bool columns_to_anodes, size_t max_events) {
+void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint_t num_row_pins, mcu_pin_obj_t *row_pins[], mp_uint_t num_col_pins, mcu_pin_obj_t *col_pins[], bool columns_to_anodes, mp_float_t interval, size_t max_events) {
 
     mp_obj_t row_dios[num_row_pins];
     for (size_t row = 0; row < num_row_pins; row++) {
@@ -74,6 +72,9 @@ void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint
     common_hal_keypad_eventqueue_construct(events, max_events);
     self->events = events;
 
+    self->interval_ticks = (mp_uint_t)(interval * 1024);   // interval * 1000 * (1024/1000)
+    self->last_scan_ticks = port_get_raw_ticks(NULL);
+
     // Add self to the list of active keypad scanners.
     keypad_register_scanner((keypad_scanner_obj_t *)self);
 
@@ -137,7 +138,7 @@ mp_obj_t common_hal_keypad_keymatrix_get_events(keypad_keymatrix_obj_t *self) {
 
 void keypad_keymatrix_scan(keypad_keymatrix_obj_t *self) {
     uint64_t now = port_get_raw_ticks(NULL);
-    if (now - self->last_scan_ticks < DEBOUNCE_TICKS) {
+    if (now - self->last_scan_ticks < self->interval_ticks) {
         // Too soon. Wait longer to debounce.
         return;
     }
diff --git a/shared-module/keypad/KeyMatrix.h b/shared-module/keypad/KeyMatrix.h
index 14c6f8069c..4f789aa382 100644
--- a/shared-module/keypad/KeyMatrix.h
+++ b/shared-module/keypad/KeyMatrix.h
@@ -40,6 +40,7 @@ typedef struct {
     keypad_scanner_obj_t *next;
     mp_obj_tuple_t *row_digitalinouts;
     mp_obj_tuple_t *col_digitalinouts;
+    mp_uint_t interval_ticks;
     uint64_t last_scan_ticks;
     bool *previously_pressed;
     bool *currently_pressed;
diff --git a/shared-module/keypad/Keys.c b/shared-module/keypad/Keys.c
index f8e897c719..5f5d2f3880 100644
--- a/shared-module/keypad/Keys.c
+++ b/shared-module/keypad/Keys.c
@@ -35,9 +35,7 @@
 #include "supervisor/port.h"
 #include "supervisor/shared/tick.h"
 
-#define DEBOUNCE_TICKS (20)
-
-void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pins, mcu_pin_obj_t *pins[], bool value_when_pressed, bool pull, size_t max_events) {
+void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pins, mcu_pin_obj_t *pins[], bool value_when_pressed, bool pull, mp_float_t interval, size_t max_events) {
     mp_obj_t dios[num_pins];
 
     for (size_t i = 0; i < num_pins; i++) {
@@ -54,6 +52,8 @@ void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pin
     self->currently_pressed = (bool *)gc_alloc(sizeof(bool) * num_pins, false, false);
     self->previously_pressed = (bool *)gc_alloc(sizeof(bool) * num_pins, false, false);
     self->value_when_pressed = value_when_pressed;
+
+    self->interval_ticks = (mp_uint_t)(interval * 1024);   // interval * 1000 * (1024/1000)
     self->last_scan_ticks = port_get_raw_ticks(NULL);
 
     keypad_eventqueue_obj_t *events = m_new_obj(keypad_eventqueue_obj_t);
@@ -107,7 +107,7 @@ mp_obj_t common_hal_keypad_keys_get_events(keypad_keys_obj_t *self) {
 
 void keypad_keys_scan(keypad_keys_obj_t *self) {
     uint64_t now = port_get_raw_ticks(NULL);
-    if (now - self->last_scan_ticks < DEBOUNCE_TICKS) {
+    if (now - self->last_scan_ticks < self->interval_ticks) {
         // Too soon. Wait longer to debounce.
         return;
     }
diff --git a/shared-module/keypad/Keys.h b/shared-module/keypad/Keys.h
index 7aea31bc50..3edae32439 100644
--- a/shared-module/keypad/Keys.h
+++ b/shared-module/keypad/Keys.h
@@ -39,6 +39,7 @@ typedef struct {
     // All scanners have a next field here, to keep a linked list of active scanners.
     keypad_scanner_obj_t *next;
     mp_obj_tuple_t *digitalinouts;
+    mp_uint_t interval_ticks;
     uint64_t last_scan_ticks;
     bool *previously_pressed;
     bool *currently_pressed;
diff --git a/shared-module/keypad/ShiftRegisterKeys.c b/shared-module/keypad/ShiftRegisterKeys.c
index 0e9ce48555..80dd7b5bd4 100644
--- a/shared-module/keypad/ShiftRegisterKeys.c
+++ b/shared-module/keypad/ShiftRegisterKeys.c
@@ -35,9 +35,7 @@
 #include "supervisor/port.h"
 #include "supervisor/shared/tick.h"
 
-#define DEBOUNCE_TICKS (20)
-
-void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_t *self, mcu_pin_obj_t *clock_pin, mcu_pin_obj_t *data_pin, mcu_pin_obj_t *latch_pin, size_t num_keys, bool value_when_pressed, size_t max_events) {
+void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_t *self, mcu_pin_obj_t *clock_pin, mcu_pin_obj_t *data_pin, mcu_pin_obj_t *latch_pin, size_t num_keys, bool value_when_pressed, mp_float_t interval, size_t max_events) {
 
     digitalio_digitalinout_obj_t *clock = m_new_obj(digitalio_digitalinout_obj_t);
     clock->base.type = &digitalio_digitalinout_type;
@@ -62,6 +60,7 @@ void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_
     self->value_when_pressed = value_when_pressed;
     self->num_keys = num_keys;
 
+    self->interval_ticks = (mp_uint_t)(interval * 1024);   // interval * 1000 * (1024/1000)
     self->last_scan_ticks = port_get_raw_ticks(NULL);
 
     keypad_eventqueue_obj_t *events = m_new_obj(keypad_eventqueue_obj_t);
@@ -119,7 +118,7 @@ mp_obj_t common_hal_keypad_shiftregisterkeys_get_events(keypad_shiftregisterkeys
 
 void keypad_shiftregisterkeys_scan(keypad_shiftregisterkeys_obj_t *self) {
     uint64_t now = port_get_raw_ticks(NULL);
-    if (now - self->last_scan_ticks < DEBOUNCE_TICKS) {
+    if (now - self->last_scan_ticks < self->interval_ticks) {
         // Too soon. Wait longer to debounce.
         return;
     }
diff --git a/shared-module/keypad/ShiftRegisterKeys.h b/shared-module/keypad/ShiftRegisterKeys.h
index 7949ecbb67..f0eb6abdf6 100644
--- a/shared-module/keypad/ShiftRegisterKeys.h
+++ b/shared-module/keypad/ShiftRegisterKeys.h
@@ -42,6 +42,7 @@ typedef struct {
     digitalio_digitalinout_obj_t *data;
     digitalio_digitalinout_obj_t *latch;
     size_t num_keys;
+    mp_uint_t interval_ticks;
     uint64_t last_scan_ticks;
     bool *previously_pressed;
     bool *currently_pressed;

From 8c74b4a5f21513de9de7d7c387de104ac672bb0d Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Mon, 21 Jun 2021 17:47:12 -0400
Subject: [PATCH 283/349] fix some typos

---
 py/argcheck.c                              | 6 ++++--
 shared-bindings/keypad/Keys.c              | 2 +-
 shared-bindings/keypad/ShiftRegisterKeys.c | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/py/argcheck.c b/py/argcheck.c
index 7710cf1592..8b6588a556 100644
--- a/py/argcheck.c
+++ b/py/argcheck.c
@@ -189,14 +189,16 @@ mp_float_t mp_arg_validate_obj_float_non_negative(mp_obj_t float_in, mp_float_t
     const mp_float_t f = (float_in == MP_OBJ_NULL)
         ? default_for_null
         : mp_obj_get_float(float_in);
-    if (f <= 0.0f) {
+    if (f <= (mp_float_t)0.0) {
         mp_raise_ValueError_varg(translate("%q must be >= 0"), arg_name);
     }
     return f;
 }
 
 size_t mp_arg_validate_length_with_name(mp_int_t i, size_t length, qstr arg_name, qstr length_name) {
-    mp_raise_ValueError_varg(translate("%q length must be %q"), MP_QSTR_pressed, MP_QSTR_num_keys);
+    if (i != (mp_int_t)length) {
+        mp_raise_ValueError_varg(translate("%q length must be %q"), MP_QSTR_pressed, MP_QSTR_num_keys);
+    }
     return (size_t)i;
 }
 
diff --git a/shared-bindings/keypad/Keys.c b/shared-bindings/keypad/Keys.c
index 6286104be4..5f1d0ecc7d 100644
--- a/shared-bindings/keypad/Keys.c
+++ b/shared-bindings/keypad/Keys.c
@@ -36,7 +36,7 @@
 //| class Keys:
 //|     """Manage a set of independent keys."""
 //|
-//|     def __init__(self, pins: Sequence[microcontroller.Pin], *, level_when_pressed: bool, pull: bool = True, interval: float = 0.020, max_events: int = 64) -> None:
+//|     def __init__(self, pins: Sequence[microcontroller.Pin], *, value_when_pressed: bool, pull: bool = True, interval: float = 0.020, max_events: int = 64) -> None:
 //|         """
 //|         Create a `Keys` object that will scan keys attached to the given sequence of pins.
 //|         Each key is independent and attached to its own pin.
diff --git a/shared-bindings/keypad/ShiftRegisterKeys.c b/shared-bindings/keypad/ShiftRegisterKeys.c
index 583e20e243..7896ed7a38 100644
--- a/shared-bindings/keypad/ShiftRegisterKeys.c
+++ b/shared-bindings/keypad/ShiftRegisterKeys.c
@@ -36,7 +36,7 @@
 //| class ShiftRegisterKeys:
 //|     """Manage a set of keys attached to an incoming shift register."""
 //|
-//|     def __init__(self, clock: microcontroller.Pin, data: microcontroller.Pin, latch: microcontroller.Pin, level_when_pressed: bool, interval: float = 0.020, max_events: int = 64) -> None:
+//|     def __init__(self, clock: microcontroller.Pin, data: microcontroller.Pin, latch: microcontroller.Pin, value_when_pressed: bool, interval: float = 0.020, max_events: int = 64) -> None:
 //|         """
 //|         Create a `Keys` object that will scan keys attached to a parallel-in serial-out shift register
 //|         like the 74HC165 or equivalent.

From f052dc4d8ba020858528228cd5c5ce2e2f20019f Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Mon, 21 Jun 2021 19:03:48 -0400
Subject: [PATCH 284/349] ShiftRegisterKeys: allow specifying sense of latch

---
 shared-bindings/keypad/ShiftRegisterKeys.c | 18 ++++++++++++------
 shared-bindings/keypad/ShiftRegisterKeys.h |  2 +-
 shared-module/keypad/ShiftRegisterKeys.c   |  8 ++++----
 shared-module/keypad/ShiftRegisterKeys.h   |  1 +
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/shared-bindings/keypad/ShiftRegisterKeys.c b/shared-bindings/keypad/ShiftRegisterKeys.c
index 7896ed7a38..2946ba3f98 100644
--- a/shared-bindings/keypad/ShiftRegisterKeys.c
+++ b/shared-bindings/keypad/ShiftRegisterKeys.c
@@ -36,10 +36,10 @@
 //| class ShiftRegisterKeys:
 //|     """Manage a set of keys attached to an incoming shift register."""
 //|
-//|     def __init__(self, clock: microcontroller.Pin, data: microcontroller.Pin, latch: microcontroller.Pin, value_when_pressed: bool, interval: float = 0.020, max_events: int = 64) -> None:
+//|     def __init__(self, *, clock: microcontroller.Pin, data: microcontroller.Pin, latch: microcontroller.Pin, value_to_latch: bool = True, num_keys: int, value_when_pressed: bool, interval: float = 0.020, max_events: int = 64) -> None:
 //|         """
 //|         Create a `Keys` object that will scan keys attached to a parallel-in serial-out shift register
-//|         like the 74HC165 or equivalent.
+//|         like the 74HC165 or CD4021.
 //|         Note that you may chain shift registers to load in as many values as you need.
 //|
 //|         Key number 0 is the first (or more properly, the zero-th) bit read. In the
@@ -53,8 +53,12 @@
 //|           The shift register should clock on a low-to-high transition.
 //|         :param microcontroller.Pin data: the incoming shift register data pin
 //|         :param microcontroller.Pin latch:
-//|           Pin used to trigger loading parallel data pins into the shift register.
-//|           Active low: pull low to load the data.
+//|           Pin used to latch parallel data going into the shift register.
+//|         :param bool value_to_latch: Pin state to latch data being read.
+//|           ``True`` if the data is latched when ``latch`` goes high
+//|           ``False`` if the data is latched when ``latch goes low.
+//|           The default is ``True``, which is how the 74HC165 operates. The CD4021 latch is the opposite.
+//|           Once the data is latched, it will be shifted out by toggling the clock pin.
 //|         :param int num_keys: number of data lines to clock in
 //|         :param bool value_when_pressed: ``True`` if the pin reads high when the key is pressed.
 //|           ``False`` if the pin reads low (is grounded) when the key is pressed.
@@ -70,11 +74,12 @@
 STATIC mp_obj_t keypad_shiftregisterkeys_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     keypad_shiftregisterkeys_obj_t *self = m_new_obj(keypad_shiftregisterkeys_obj_t);
     self->base.type = &keypad_shiftregisterkeys_type;
-    enum { ARG_clock, ARG_data, ARG_latch, ARG_num_keys, ARG_value_when_pressed, ARG_interval, ARG_max_events };
+    enum { ARG_clock, ARG_data, ARG_latch, ARG_value_to_latch, ARG_num_keys, ARG_value_when_pressed, ARG_interval, ARG_max_events };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_clock, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_data, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_latch, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_value_to_latch, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} },
         { MP_QSTR_num_keys, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT },
         { MP_QSTR_value_when_pressed, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_BOOL },
         { MP_QSTR_interval, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
@@ -86,6 +91,7 @@ STATIC mp_obj_t keypad_shiftregisterkeys_make_new(const mp_obj_type_t *type, siz
     mcu_pin_obj_t *clock = validate_obj_is_free_pin(args[ARG_clock].u_obj);
     mcu_pin_obj_t *data = validate_obj_is_free_pin(args[ARG_data].u_obj);
     mcu_pin_obj_t *latch = validate_obj_is_free_pin(args[ARG_latch].u_obj);
+    const bool value_to_latch = args[ARG_value_to_latch].u_bool;
 
     const size_t num_keys = (size_t)mp_arg_validate_int_min(args[ARG_num_keys].u_int, 1, MP_QSTR_num_keys);
     const bool value_when_pressed = args[ARG_value_when_pressed].u_bool;
@@ -94,7 +100,7 @@ STATIC mp_obj_t keypad_shiftregisterkeys_make_new(const mp_obj_type_t *type, siz
     const size_t max_events = (size_t)mp_arg_validate_int_min(args[ARG_max_events].u_int, 1, MP_QSTR_max_events);
 
     common_hal_keypad_shiftregisterkeys_construct(
-        self, clock, data, latch, num_keys, value_when_pressed, interval, max_events);
+        self, clock, data, latch, value_to_latch, num_keys, value_when_pressed, interval, max_events);
 
     return MP_OBJ_FROM_PTR(self);
 }
diff --git a/shared-bindings/keypad/ShiftRegisterKeys.h b/shared-bindings/keypad/ShiftRegisterKeys.h
index bf33f08e59..6a27d3cc73 100644
--- a/shared-bindings/keypad/ShiftRegisterKeys.h
+++ b/shared-bindings/keypad/ShiftRegisterKeys.h
@@ -32,7 +32,7 @@
 
 extern const mp_obj_type_t keypad_shiftregisterkeys_type;
 
-void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_t *self, mcu_pin_obj_t *clock_pin, mcu_pin_obj_t *data_pin, mcu_pin_obj_t *latch_pin, size_t num_keys, bool value_when_pressed, mp_float_t interval, size_t max_events);
+void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_t *self, mcu_pin_obj_t *clock_pin, mcu_pin_obj_t *data_pin, mcu_pin_obj_t *latch_pin, bool value_to_latch, size_t num_keys, bool value_when_pressed, mp_float_t interval, size_t max_events);
 
 void common_hal_keypad_shiftregisterkeys_deinit(keypad_shiftregisterkeys_obj_t *self);
 bool common_hal_keypad_shiftregisterkeys_deinited(keypad_shiftregisterkeys_obj_t *self);
diff --git a/shared-module/keypad/ShiftRegisterKeys.c b/shared-module/keypad/ShiftRegisterKeys.c
index 80dd7b5bd4..5d7d956632 100644
--- a/shared-module/keypad/ShiftRegisterKeys.c
+++ b/shared-module/keypad/ShiftRegisterKeys.c
@@ -35,7 +35,7 @@
 #include "supervisor/port.h"
 #include "supervisor/shared/tick.h"
 
-void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_t *self, mcu_pin_obj_t *clock_pin, mcu_pin_obj_t *data_pin, mcu_pin_obj_t *latch_pin, size_t num_keys, bool value_when_pressed, mp_float_t interval, size_t max_events) {
+void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_t *self, mcu_pin_obj_t *clock_pin, mcu_pin_obj_t *data_pin, mcu_pin_obj_t *latch_pin, bool value_to_latch, size_t num_keys, bool value_when_pressed, mp_float_t interval, size_t max_events) {
 
     digitalio_digitalinout_obj_t *clock = m_new_obj(digitalio_digitalinout_obj_t);
     clock->base.type = &digitalio_digitalinout_type;
@@ -54,6 +54,7 @@ void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_
     common_hal_digitalio_digitalinout_construct(latch, latch_pin);
     common_hal_digitalio_digitalinout_switch_to_output(latch, true, DRIVE_MODE_PUSH_PULL);
     self->latch = latch;
+    self->value_to_latch = value_to_latch;
 
     self->currently_pressed = (bool *)gc_alloc(sizeof(bool) * num_keys, false, false);
     self->previously_pressed = (bool *)gc_alloc(sizeof(bool) * num_keys, false, false);
@@ -126,7 +127,7 @@ void keypad_shiftregisterkeys_scan(keypad_shiftregisterkeys_obj_t *self) {
     self->last_scan_ticks = now;
 
     // Latch (freeze) the current state of the input pins.
-    common_hal_digitalio_digitalinout_set_value(self->latch, true);
+    common_hal_digitalio_digitalinout_set_value(self->latch, self->value_to_latch);
 
     for (mp_uint_t key_num = 0; key_num < common_hal_keypad_shiftregisterkeys_get_num_keys(self); key_num++) {
         // Zero-th data appears on on the data pin immediately, without shifting.
@@ -151,6 +152,5 @@ void keypad_shiftregisterkeys_scan(keypad_shiftregisterkeys_obj_t *self) {
     }
 
     // Start reading the input pins again.
-    common_hal_digitalio_digitalinout_set_value(self->latch, false);
-
+    common_hal_digitalio_digitalinout_set_value(self->latch, !self->value_to_latch);
 }
diff --git a/shared-module/keypad/ShiftRegisterKeys.h b/shared-module/keypad/ShiftRegisterKeys.h
index f0eb6abdf6..c685a7141c 100644
--- a/shared-module/keypad/ShiftRegisterKeys.h
+++ b/shared-module/keypad/ShiftRegisterKeys.h
@@ -48,6 +48,7 @@ typedef struct {
     bool *currently_pressed;
     keypad_eventqueue_obj_t *events;
     bool value_when_pressed;
+    bool value_to_latch;
 } keypad_shiftregisterkeys_obj_t;
 
 void keypad_shiftregisterkeys_scan(keypad_shiftregisterkeys_obj_t *self);

From 4401d73efdf53674efcb6e4591c88622d32febfd Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Mon, 21 Jun 2021 19:49:56 -0500
Subject: [PATCH 285/349] Update tools/pyboard.py

Co-authored-by: Scott Shawcroft <scott@tannewt.org>
---
 tools/pyboard.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index d64a48deed..e281f9be86 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# SPDX-FileCopyrightText: Copyright (c) 2014-2016 Damien P. George
+# SPDX-FileCopyrightText: Copyright (c) 2014-2021 Damien P. George
 # SPDX-FileCopyrightText: Copyright (c) 2017 Paul Sokolovsky
 # SPDX-FileCopyrightText: 2014 MicroPython & CircuitPython contributors (https://github.com/adafruit/circuitpython/graphs/contributors)
 # SPDX-License-Identifier: MIT

From 680ac9388fb92ca8e91e066cdfb5af8ac01dab4c Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Mon, 21 Jun 2021 19:50:37 -0500
Subject: [PATCH 286/349] review suggestion: remove files

---
 .../esp32/boards/M5STACK_ATOM/modules/atom.py |  75 ---
 .../boards/M5STACK_ATOM/mpconfigboard.cmake   |  10 -
 .../esp32/boards/M5STACK_ATOM/mpconfigboard.h |   2 -
 .../esp32/boards/M5STACK_ATOM/sdkconfig.board |   5 -
 ports/esp32/boards/UM_FEATHERS2/manifest.py   |   3 -
 .../boards/UM_FEATHERS2/modules/feathers2.py  | 101 ---
 .../boards/UM_FEATHERS2/mpconfigboard.cmake   |   9 -
 .../esp32/boards/UM_FEATHERS2/mpconfigboard.h |  12 -
 .../esp32/boards/UM_FEATHERS2/sdkconfig.board |  16 -
 ports/esp32/boards/UM_TINYPICO/manifest.py    |   2 -
 .../boards/UM_TINYPICO/mpconfigboard.cmake    |  11 -
 .../esp32/boards/UM_TINYPICO/mpconfigboard.h  |   9 -
 ports/esp32/boards/UM_TINYS2/manifest.py      |   2 -
 .../esp32/boards/UM_TINYS2/modules/tinys2.py  |  82 ---
 .../boards/UM_TINYS2/mpconfigboard.cmake      |   8 -
 ports/esp32/boards/UM_TINYS2/mpconfigboard.h  |  12 -
 ports/esp32/boards/UM_TINYS2/sdkconfig.board  |   6 -
 ports/esp32/boards/sdkconfig.spiram_sx        |  11 -
 ports/esp32/partitions-16MiB.csv              |   7 -
 ports/esp8266/boards/GENERIC_512K/_boot.py    |   3 -
 ports/esp8266/boards/GENERIC_512K/manifest.py |   5 -
 .../SPARKFUN_PROMICRO/mpconfigboard.cmake     |   1 -
 .../boards/SPARKFUN_PROMICRO/mpconfigboard.h  |   3 -
 .../SPARKFUN_THINGPLUS/mpconfigboard.cmake    |   1 -
 .../boards/SPARKFUN_THINGPLUS/mpconfigboard.h |   3 -
 ports/rp2/boards/manifest.py                  |   3 -
 ports/rp2/machine_rtc.c                       | 122 ----
 ports/zephyr/boards/nucleo_wb55rg.conf        |   6 -
 ports/zephyr/modbluetooth_zephyr.c            | 410 ------------
 ports/zephyr/mphalport.c                      |  74 ---
 tests/multi_bluetooth/perf_gatt_char_write.py | 151 -----
 .../perf_gatt_char_write.py.exp               |  24 -
 tests/multi_net/uasyncio_tcp_readinto.py      |  80 ---
 tests/multi_net/uasyncio_tcp_readinto.py.exp  |  11 -
 tools/mpremote/LICENSE                        |  21 -
 tools/mpremote/README.md                      |  71 --
 tools/mpremote/mpremote.py                    |   6 -
 tools/mpremote/mpremote/__init__.py           |   1 -
 tools/mpremote/mpremote/console.py            | 171 -----
 tools/mpremote/mpremote/main.py               | 455 -------------
 tools/mpremote/mpremote/pyboardextended.py    | 621 ------------------
 tools/mpremote/pyproject.toml                 |   6 -
 tools/mpremote/setup.cfg                      |  25 -
 43 files changed, 2657 deletions(-)
 delete mode 100644 ports/esp32/boards/M5STACK_ATOM/modules/atom.py
 delete mode 100644 ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake
 delete mode 100644 ports/esp32/boards/M5STACK_ATOM/mpconfigboard.h
 delete mode 100644 ports/esp32/boards/M5STACK_ATOM/sdkconfig.board
 delete mode 100644 ports/esp32/boards/UM_FEATHERS2/manifest.py
 delete mode 100644 ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py
 delete mode 100644 ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake
 delete mode 100644 ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h
 delete mode 100644 ports/esp32/boards/UM_FEATHERS2/sdkconfig.board
 delete mode 100644 ports/esp32/boards/UM_TINYPICO/manifest.py
 delete mode 100644 ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake
 delete mode 100644 ports/esp32/boards/UM_TINYPICO/mpconfigboard.h
 delete mode 100644 ports/esp32/boards/UM_TINYS2/manifest.py
 delete mode 100644 ports/esp32/boards/UM_TINYS2/modules/tinys2.py
 delete mode 100644 ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake
 delete mode 100644 ports/esp32/boards/UM_TINYS2/mpconfigboard.h
 delete mode 100644 ports/esp32/boards/UM_TINYS2/sdkconfig.board
 delete mode 100644 ports/esp32/boards/sdkconfig.spiram_sx
 delete mode 100644 ports/esp32/partitions-16MiB.csv
 delete mode 100644 ports/esp8266/boards/GENERIC_512K/_boot.py
 delete mode 100644 ports/esp8266/boards/GENERIC_512K/manifest.py
 delete mode 100644 ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.cmake
 delete mode 100644 ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.h
 delete mode 100644 ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.cmake
 delete mode 100644 ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.h
 delete mode 100644 ports/rp2/boards/manifest.py
 delete mode 100644 ports/rp2/machine_rtc.c
 delete mode 100644 ports/zephyr/boards/nucleo_wb55rg.conf
 delete mode 100644 ports/zephyr/modbluetooth_zephyr.c
 delete mode 100644 ports/zephyr/mphalport.c
 delete mode 100644 tests/multi_bluetooth/perf_gatt_char_write.py
 delete mode 100644 tests/multi_bluetooth/perf_gatt_char_write.py.exp
 delete mode 100644 tests/multi_net/uasyncio_tcp_readinto.py
 delete mode 100644 tests/multi_net/uasyncio_tcp_readinto.py.exp
 delete mode 100644 tools/mpremote/LICENSE
 delete mode 100644 tools/mpremote/README.md
 delete mode 100755 tools/mpremote/mpremote.py
 delete mode 100644 tools/mpremote/mpremote/__init__.py
 delete mode 100644 tools/mpremote/mpremote/console.py
 delete mode 100644 tools/mpremote/mpremote/main.py
 delete mode 100644 tools/mpremote/mpremote/pyboardextended.py
 delete mode 100644 tools/mpremote/pyproject.toml
 delete mode 100644 tools/mpremote/setup.cfg

diff --git a/ports/esp32/boards/M5STACK_ATOM/modules/atom.py b/ports/esp32/boards/M5STACK_ATOM/modules/atom.py
deleted file mode 100644
index 8f47585f19..0000000000
--- a/ports/esp32/boards/M5STACK_ATOM/modules/atom.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# M5Stack ATOM MicroPython Helper Library
-# MIT license; Copyright (c) 2021 IAMLIUBO work for M5STACK
-#
-# Hardware details:
-#       ATOM Lite    https://docs.m5stack.com/en/core/atom_lite
-#       ATOM Matrix  https://docs.m5stack.com/en/core/atom_matrix
-
-from micropython import const
-from machine import Pin
-import neopixel
-
-# M5STACK ATOM Hardware Pin Assignments
-"""
-          FRONT
-                  |3V3|
-|G21|   IR   G12  |G22|
-|G25|   BTN  G39  |G19|
-| 5V| WS2812  G27 |G23|
-|GNG| MPU G21 G25 |G33|
-     G32 G26 5V GND
-       Grove Port
-"""
-
-# WS2812
-WS2812_PIN = const(27)
-
-# Button
-BUTTON_PIN = const(39)
-
-# IR
-IR_PIN = const(12)
-
-# I2C
-I2C0_SCL_PIN = const(21)
-I2C0_SDA_PIN = const(25)
-
-# Grove port
-GROVE_PORT_PIN = (const(26), const(32))
-
-
-class ATOM:
-    def __init__(self, np_n):
-        self._np = neopixel.NeoPixel(pin=Pin(WS2812_PIN), n=np_n)
-        self._btn = Pin(BUTTON_PIN, Pin.IN, Pin.PULL_UP)
-
-    def get_button_status(self):
-        return self._btn.value()
-
-    def set_button_callback(self, cb):
-        self._btn.irq(trigger=Pin.IRQ_FALLING, handler=cb)
-
-    def set_pixel_color(self, num, r, g, b):
-        if num <= self._np.n:
-            self._np[num] = [r, g, b]
-            self._np.write()
-
-    def get_pixel_color(self, num):
-        if num <= self._np.n:
-            return self._np[num]
-
-    def set_pixels_color(self, r, g, b):
-        self._np.fill([r, g, b])
-        self._np.write()
-
-
-class Lite(ATOM):
-    # WS2812 number: 1
-    def __init__(self):
-        super(Lite, self).__init__(np_n=1)
-
-
-class Matrix(ATOM):
-    # WS2812 number: 25
-    def __init__(self):
-        super(Matrix, self).__init__(np_n=25)
diff --git a/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake b/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake
deleted file mode 100644
index 548337a479..0000000000
--- a/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(SDKCONFIG_DEFAULTS
-    boards/sdkconfig.base
-    boards/sdkconfig.ble
-    boards/sdkconfig.240mhz
-    boards/M5STACK_ATOM/sdkconfig.board
-)
-
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
-endif()
diff --git a/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.h b/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.h
deleted file mode 100644
index 4270b19caf..0000000000
--- a/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define MICROPY_HW_BOARD_NAME "M5Stack ATOM"
-#define MICROPY_HW_MCU_NAME "ESP32-PICO-D4"
diff --git a/ports/esp32/boards/M5STACK_ATOM/sdkconfig.board b/ports/esp32/boards/M5STACK_ATOM/sdkconfig.board
deleted file mode 100644
index b299822dcb..0000000000
--- a/ports/esp32/boards/M5STACK_ATOM/sdkconfig.board
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_FLASHMODE_QIO=y
-CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_SPIRAM_SPEED_80M=y
-CONFIG_ESP32_REV_MIN_1=y
-CONFIG_LWIP_LOCAL_HOSTNAME="M5StackATOM"
diff --git a/ports/esp32/boards/UM_FEATHERS2/manifest.py b/ports/esp32/boards/UM_FEATHERS2/manifest.py
deleted file mode 100644
index 82ad0c7e49..0000000000
--- a/ports/esp32/boards/UM_FEATHERS2/manifest.py
+++ /dev/null
@@ -1,3 +0,0 @@
-include("$(PORT_DIR)/boards/manifest.py")
-freeze("$(PORT_DIR)/boards/UM_TINYPICO/modules", "dotstar.py")
-freeze("modules")
diff --git a/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py b/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py
deleted file mode 100644
index 95e1f52681..0000000000
--- a/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py
+++ /dev/null
@@ -1,101 +0,0 @@
-# FeatherS2 MicroPython Helper Library
-# 2021 Seon Rozenblum - Unexpected Maker
-#
-# Project home:
-#   https://feathers2.io
-#
-# 2021-Mar-21 - v0.1 - Initial implementation
-
-# Import required libraries
-from micropython import const
-from machine import Pin, SPI, ADC
-import machine, time
-
-# FeatherS2 Hardware Pin Assignments
-
-# LDO
-LDO2 = const(21)
-
-# APA102 Dotstar pins
-DOTSTAR_CLK = const(45)
-DOTSTAR_DATA = const(40)
-
-# SPI
-SPI_MOSI = const(35)
-SPI_MISO = const(37)
-SPI_CLK = const(36)
-
-# I2C
-I2C_SDA = const(8)
-I2C_SCL = const(9)
-
-# DAC
-DAC1 = const(17)
-DAC2 = const(18)
-
-# LED & Ambient Light Sensor
-LED = const(13)
-AMB_LIGHT = const(4)
-
-# Helper functions
-
-# LED & Ambient Light Sensor control
-def set_led(state):
-    l = Pin(LED, Pin.OUT)
-    l.value(state)
-
-
-def toggle_led(state):
-    l = Pin(LED, Pin.OUT)
-    l.value(not l.value())
-
-
-# Create ADC and set attenuation and return the ambient light value from the onboard sensor
-def get_amb_light():
-    adc = ADC(Pin(AMB_LIGHT))
-    adc.atten(ADC.ATTN_11DB)
-    return adc.read()
-
-
-# LDO2 power control
-# When we manually turn off the second LDO we also set the DotStar DATA and CLK pins to input to
-# prevent parasitic power from lighting the LED even with the LDO off, causing current use.
-# The DotStar is a beautiful LED, but parasitic power makes it a terrible choice for battery use :(
-def set_ldo2_power(state):
-    """Set the power for the on-board Dotstar to allow no current draw when not needed."""
-    # Set the power pin to the inverse of state
-    ldo2 = Pin(LDO2, Pin.OUT)
-    ldo2.value(state)
-
-    if state:
-        Pin(DOTSTAR_CLK, Pin.OUT)
-        Pin(DOTSTAR_DATA, Pin.OUT)  # If power is on, set CLK to be output, otherwise input
-    else:
-        Pin(DOTSTAR_CLK, Pin.IN)
-        Pin(DOTSTAR_DATA, Pin.IN)  # If power is on, set CLK to be output, otherwise input
-
-    # A small delay to let the IO change state
-    time.sleep(0.035)
-
-
-# Dotstar rainbow colour wheel
-def dotstar_color_wheel(wheel_pos):
-    """Color wheel to allow for cycling through the rainbow of RGB colors."""
-    wheel_pos = wheel_pos % 255
-
-    if wheel_pos < 85:
-        return 255 - wheel_pos * 3, 0, wheel_pos * 3
-    elif wheel_pos < 170:
-        wheel_pos -= 85
-        return 0, wheel_pos * 3, 255 - wheel_pos * 3
-    else:
-        wheel_pos -= 170
-        return wheel_pos * 3, 255 - wheel_pos * 3, 0
-
-
-# Go into deep sleep but shut down the APA first to save power
-# Use this if you want lowest deep  sleep current
-def go_deepsleep(t):
-    """Deep sleep helper that also powers down the on-board Dotstar."""
-    set_ldo2_power(False)
-    machine.deepsleep(t)
diff --git a/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake b/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake
deleted file mode 100644
index c85d080e0a..0000000000
--- a/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-set(IDF_TARGET esp32s2)
-set(SDKCONFIG_DEFAULTS
-    boards/sdkconfig.base
-    boards/sdkconfig.spiram_sx
-    boards/sdkconfig.usb
-    boards/UM_FEATHERS2/sdkconfig.board
-)
-
-set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h b/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h
deleted file mode 100644
index 8d0c9f78c8..0000000000
--- a/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#define MICROPY_HW_BOARD_NAME "FeatherS2"
-#define MICROPY_HW_MCU_NAME "ESP32-S2"
-
-#define MICROPY_PY_BLUETOOTH                (0)
-#define MICROPY_HW_ENABLE_SDCARD            (0)
-
-#define MICROPY_HW_I2C0_SCL (9)
-#define MICROPY_HW_I2C0_SDA (8)
-
-#define MICROPY_HW_SPI1_MOSI (35)  // SDO
-#define MICROPY_HW_SPI1_MISO (37)  // SDI
-#define MICROPY_HW_SPI1_SCK (36)
diff --git a/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board b/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board
deleted file mode 100644
index ccda7bff68..0000000000
--- a/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board
+++ /dev/null
@@ -1,16 +0,0 @@
-CONFIG_FLASHMODE_QIO=y
-CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
-CONFIG_ESPTOOLPY_AFTER_NORESET=y
-
-CONFIG_SPIRAM_MEMTEST=
-
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
-CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
-CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-16MiB.csv"
-#CONFIG_USB_AND_UART=y
-
-# LWIP
-CONFIG_LWIP_LOCAL_HOSTNAME="UMFeatherS2"
-# end of LWIP
diff --git a/ports/esp32/boards/UM_TINYPICO/manifest.py b/ports/esp32/boards/UM_TINYPICO/manifest.py
deleted file mode 100644
index 7ae2ed15d9..0000000000
--- a/ports/esp32/boards/UM_TINYPICO/manifest.py
+++ /dev/null
@@ -1,2 +0,0 @@
-include("$(PORT_DIR)/boards/manifest.py")
-freeze("modules")
diff --git a/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake
deleted file mode 100644
index bc2541c699..0000000000
--- a/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-set(SDKCONFIG_DEFAULTS
-    boards/sdkconfig.base
-    boards/sdkconfig.ble
-    boards/sdkconfig.240mhz
-    boards/sdkconfig.spiram
-    boards/UM_TINYPICO/sdkconfig.board
-)
-
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
-endif()
diff --git a/ports/esp32/boards/UM_TINYPICO/mpconfigboard.h b/ports/esp32/boards/UM_TINYPICO/mpconfigboard.h
deleted file mode 100644
index 6bf70cc13b..0000000000
--- a/ports/esp32/boards/UM_TINYPICO/mpconfigboard.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#define MICROPY_HW_BOARD_NAME "TinyPICO"
-#define MICROPY_HW_MCU_NAME "ESP32-PICO-D4"
-
-#define MICROPY_HW_I2C0_SCL (22)
-#define MICROPY_HW_I2C0_SDA (21)
-
-#define MICROPY_HW_SPI1_SCK (18)
-#define MICROPY_HW_SPI1_MOSI (23)
-#define MICROPY_HW_SPI1_MISO (19)
diff --git a/ports/esp32/boards/UM_TINYS2/manifest.py b/ports/esp32/boards/UM_TINYS2/manifest.py
deleted file mode 100644
index 7ae2ed15d9..0000000000
--- a/ports/esp32/boards/UM_TINYS2/manifest.py
+++ /dev/null
@@ -1,2 +0,0 @@
-include("$(PORT_DIR)/boards/manifest.py")
-freeze("modules")
diff --git a/ports/esp32/boards/UM_TINYS2/modules/tinys2.py b/ports/esp32/boards/UM_TINYS2/modules/tinys2.py
deleted file mode 100644
index 0a3eaf14d4..0000000000
--- a/ports/esp32/boards/UM_TINYS2/modules/tinys2.py
+++ /dev/null
@@ -1,82 +0,0 @@
-# TinyS2 MicroPython Helper Library
-# 2021 Seon Rozenblum - Unexpected Maker
-#
-# Project home:
-#   https://tinys2.io
-#
-# 2021-Apr-10 - v0.1 - Initial implementation
-
-# Import required libraries
-from micropython import const
-from machine import Pin, SPI, ADC
-import machine, time
-
-# TinyS2 Hardware Pin Assignments
-
-# Sense Pins
-VBUS_SENSE = const(21)
-VBAT_SENSE = const(3)
-
-
-# RGB LED Pins
-RGB_DATA = const(1)
-RGB_PWR = const(2)
-
-# SPI
-SPI_MOSI = const(35)
-SPI_MISO = const(36)
-SPI_CLK = const(37)
-
-# I2C
-I2C_SDA = const(8)
-I2C_SCL = const(9)
-
-# DAC
-DAC1 = const(17)
-DAC2 = const(18)
-
-
-# Helper functions
-def set_pixel_power(state):
-    """Enable or Disable power to the onboard NeoPixel to either show colour, or to reduce power for deep sleep."""
-    Pin(RGB_PWR, Pin.OUT).value(state)
-
-
-def get_battery_voltage():
-    """
-    Returns the current battery voltage. If no battery is connected, returns 4.2V which is the charge voltage
-    This is an approximation only, but useful to detect if the charge state of the battery is getting low.
-    """
-    adc = ADC(Pin(VBAT_SENSE))  # Assign the ADC pin to read
-    measuredvbat = adc.read()  # Read the value
-    measuredvbat /= 8192  # divide by 8192 as we are using the default ADC voltage range of 0-1V
-    measuredvbat *= 4.2  # Multiply by 4.2V, our reference voltage
-    return round(measuredvbat, 2)
-
-
-def get_vbus_present():
-    """Detect if VBUS (5V) power source is present"""
-    return Pin(VBUS_SENSE, Pin.IN).value() == 1
-
-
-# NeoPixel rainbow colour wheel
-def rgb_color_wheel(wheel_pos):
-    """Color wheel to allow for cycling through the rainbow of RGB colors."""
-    wheel_pos = wheel_pos % 255
-
-    if wheel_pos < 85:
-        return 255 - wheel_pos * 3, 0, wheel_pos * 3
-    elif wheel_pos < 170:
-        wheel_pos -= 85
-        return 0, wheel_pos * 3, 255 - wheel_pos * 3
-    else:
-        wheel_pos -= 170
-        return wheel_pos * 3, 255 - wheel_pos * 3, 0
-
-
-# Go into deep sleep but shut down the RGB LED first to save power
-# Use this if you want lowest deep sleep current
-def go_deepsleep(t):
-    """Deep sleep helper that also powers down the on-board NeoPixel."""
-    set_pixel_power(False)
-    machine.deepsleep(t)
diff --git a/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake
deleted file mode 100644
index 928f9f8fc3..0000000000
--- a/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-set(IDF_TARGET esp32s2)
-set(SDKCONFIG_DEFAULTS
-    boards/sdkconfig.base
-    boards/sdkconfig.spiram_sx
-    boards/sdkconfig.usb
-)
-
-set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
diff --git a/ports/esp32/boards/UM_TINYS2/mpconfigboard.h b/ports/esp32/boards/UM_TINYS2/mpconfigboard.h
deleted file mode 100644
index 1052f6d79c..0000000000
--- a/ports/esp32/boards/UM_TINYS2/mpconfigboard.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#define MICROPY_HW_BOARD_NAME "TinyS2"
-#define MICROPY_HW_MCU_NAME "ESP32-S2FN4R2"
-
-#define MICROPY_PY_BLUETOOTH                (0)
-#define MICROPY_HW_ENABLE_SDCARD            (0)
-
-#define MICROPY_HW_I2C0_SCL (9)
-#define MICROPY_HW_I2C0_SDA (8)
-
-#define MICROPY_HW_SPI1_MOSI (35)
-#define MICROPY_HW_SPI1_MISO (36)
-#define MICROPY_HW_SPI1_SCK (37)
diff --git a/ports/esp32/boards/UM_TINYS2/sdkconfig.board b/ports/esp32/boards/UM_TINYS2/sdkconfig.board
deleted file mode 100644
index 48b6749c72..0000000000
--- a/ports/esp32/boards/UM_TINYS2/sdkconfig.board
+++ /dev/null
@@ -1,6 +0,0 @@
-CONFIG_FLASHMODE_QIO=y
-CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_USB_AND_UART=y
-# LWIP
-CONFIG_LWIP_LOCAL_HOSTNAME="UMTinyS2"
-# end of LWIP
diff --git a/ports/esp32/boards/sdkconfig.spiram_sx b/ports/esp32/boards/sdkconfig.spiram_sx
deleted file mode 100644
index 18a0712cbf..0000000000
--- a/ports/esp32/boards/sdkconfig.spiram_sx
+++ /dev/null
@@ -1,11 +0,0 @@
-# MicroPython on ESP32-S2 and ESP32-PAD1_subscript_3, ESP IDF configuration with SPIRAM support
-CONFIG_ESP32S2_SPIRAM_SUPPORT=y
-CONFIG_SPIRAM_TYPE_AUTO=y
-CONFIG_DEFAULT_PSRAM_CLK_IO=30
-CONFIG_DEFAULT_PSRAM_CS_IO=26
-CONFIG_SPIRAM_SPEED_80M=y
-CONFIG_SPIRAM=y
-CONFIG_SPIRAM_BOOT_INIT=y
-CONFIG_SPIRAM_IGNORE_NOTFOUND=y
-CONFIG_SPIRAM_USE_MEMMAP=y
-CONFIG_SPIRAM_MEMTEST=y
diff --git a/ports/esp32/partitions-16MiB.csv b/ports/esp32/partitions-16MiB.csv
deleted file mode 100644
index 20d06bad47..0000000000
--- a/ports/esp32/partitions-16MiB.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-# Notes: the offset of the partition table itself is set in
-# $IDF_PATH/components/partition_table/Kconfig.projbuild.
-# Name,   Type, SubType, Offset,  Size, Flags
-nvs,      data, nvs,     0x9000,  0x6000,
-phy_init, data, phy,     0xf000,  0x1000,
-factory,  app,  factory, 0x10000, 0x180000,
-vfs,      data, fat,     0x200000, 0xD59F80,
diff --git a/ports/esp8266/boards/GENERIC_512K/_boot.py b/ports/esp8266/boards/GENERIC_512K/_boot.py
deleted file mode 100644
index 1a55cfd36c..0000000000
--- a/ports/esp8266/boards/GENERIC_512K/_boot.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import gc
-
-gc.threshold((gc.mem_free() + gc.mem_alloc()) // 4)
diff --git a/ports/esp8266/boards/GENERIC_512K/manifest.py b/ports/esp8266/boards/GENERIC_512K/manifest.py
deleted file mode 100644
index 5674f280b5..0000000000
--- a/ports/esp8266/boards/GENERIC_512K/manifest.py
+++ /dev/null
@@ -1,5 +0,0 @@
-freeze("$(BOARD_DIR)", "_boot.py", opt=3)
-freeze("$(PORT_DIR)/modules", ("apa102.py", "neopixel.py", "ntptime.py", "port_diag.py"))
-freeze("$(MPY_DIR)/drivers/dht", "dht.py")
-freeze("$(MPY_DIR)/drivers/onewire")
-include("$(MPY_DIR)/extmod/webrepl/manifest.py")
diff --git a/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.cmake b/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.cmake
deleted file mode 100644
index 6ac8d7a446..0000000000
--- a/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.cmake
+++ /dev/null
@@ -1 +0,0 @@
-# cmake file for SparkFun Pro Micro RP2040
diff --git a/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.h b/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.h
deleted file mode 100644
index d6c8007ba0..0000000000
--- a/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.h
+++ /dev/null
@@ -1,3 +0,0 @@
-// Board and hardware specific configuration
-#define MICROPY_HW_BOARD_NAME                   "SparkFun Pro Micro RP2040"
-#define MICROPY_HW_FLASH_STORAGE_BYTES          (15 * 1024 * 1024)
diff --git a/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.cmake b/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.cmake
deleted file mode 100644
index b9090bbcec..0000000000
--- a/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.cmake
+++ /dev/null
@@ -1 +0,0 @@
-# cmake file for SparkFun Thing Plus RP2040
diff --git a/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.h b/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.h
deleted file mode 100644
index 9749acd25a..0000000000
--- a/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.h
+++ /dev/null
@@ -1,3 +0,0 @@
-// Board and hardware specific configuration
-#define MICROPY_HW_BOARD_NAME                   "SparkFun Thing Plus RP2040"
-#define MICROPY_HW_FLASH_STORAGE_BYTES          (15 * 1024 * 1024)
diff --git a/ports/rp2/boards/manifest.py b/ports/rp2/boards/manifest.py
deleted file mode 100644
index 9df589f126..0000000000
--- a/ports/rp2/boards/manifest.py
+++ /dev/null
@@ -1,3 +0,0 @@
-freeze("$(PORT_DIR)/modules")
-freeze("$(MPY_DIR)/drivers/onewire")
-include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
diff --git a/ports/rp2/machine_rtc.c b/ports/rp2/machine_rtc.c
deleted file mode 100644
index 797bee5ed3..0000000000
--- a/ports/rp2/machine_rtc.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2021 "Krzysztof Adamski" <k@japko.eu>
- *
- * 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 <stdio.h>
-#include <string.h>
-
-#include <time.h>
-#include <sys/time.h>
-
-#include "py/nlr.h"
-#include "py/obj.h"
-#include "py/runtime.h"
-#include "py/mphal.h"
-#include "py/mperrno.h"
-#include "lib/timeutils/timeutils.h"
-#include "hardware/rtc.h"
-#include "pico/util/datetime.h"
-#include "modmachine.h"
-
-typedef struct _machine_rtc_obj_t {
-    mp_obj_base_t base;
-} machine_rtc_obj_t;
-
-// singleton RTC object
-STATIC const machine_rtc_obj_t machine_rtc_obj = {{&machine_rtc_type}};
-
-STATIC mp_obj_t machine_rtc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    // check arguments
-    mp_arg_check_num(n_args, n_kw, 0, 0, false);
-    bool r = rtc_running();
-
-    if (!r) {
-        // This shouldn't happen as rtc_init() is already called in main so
-        // it's here just in case
-        rtc_init();
-        datetime_t t = { .month = 1, .day = 1 };
-        rtc_set_datetime(&t);
-    }
-    // return constant object
-    return (mp_obj_t)&machine_rtc_obj;
-}
-
-STATIC mp_obj_t machine_rtc_datetime(mp_uint_t n_args, const mp_obj_t *args) {
-    if (n_args == 1) {
-        bool ret;
-        datetime_t t;
-
-        ret = rtc_get_datetime(&t);
-        if (!ret) {
-            mp_raise_OSError(MP_EIO);
-        }
-
-        mp_obj_t tuple[8] = {
-            mp_obj_new_int(t.year),
-            mp_obj_new_int(t.month),
-            mp_obj_new_int(t.day),
-            mp_obj_new_int(t.dotw),
-            mp_obj_new_int(t.hour),
-            mp_obj_new_int(t.min),
-            mp_obj_new_int(t.sec),
-            mp_obj_new_int(0)
-        };
-
-        return mp_obj_new_tuple(8, tuple);
-    } else {
-        mp_obj_t *items;
-
-        mp_obj_get_array_fixed_n(args[1], 8, &items);
-
-        datetime_t t = {
-            .year = mp_obj_get_int(items[0]),
-            .month = mp_obj_get_int(items[1]),
-            .day = mp_obj_get_int(items[2]),
-            .dotw = mp_obj_get_int(items[3]),
-            .hour = mp_obj_get_int(items[4]),
-            .min = mp_obj_get_int(items[5]),
-            .sec = mp_obj_get_int(items[6]),
-        };
-
-        if (!rtc_set_datetime(&t)) {
-            mp_raise_OSError(MP_EINVAL);
-        }
-
-    }
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_rtc_datetime_obj, 1, 2, machine_rtc_datetime);
-
-STATIC const mp_rom_map_elem_t machine_rtc_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_datetime), MP_ROM_PTR(&machine_rtc_datetime_obj) },
-};
-STATIC MP_DEFINE_CONST_DICT(machine_rtc_locals_dict, machine_rtc_locals_dict_table);
-
-const mp_obj_type_t machine_rtc_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_RTC,
-    .make_new = machine_rtc_make_new,
-    .locals_dict = (mp_obj_t)&machine_rtc_locals_dict,
-};
diff --git a/ports/zephyr/boards/nucleo_wb55rg.conf b/ports/zephyr/boards/nucleo_wb55rg.conf
deleted file mode 100644
index baf0f28075..0000000000
--- a/ports/zephyr/boards/nucleo_wb55rg.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-CONFIG_CONSOLE_SUBSYS=n
-CONFIG_NETWORKING=n
-CONFIG_BT=y
-CONFIG_BT_DEVICE_NAME_DYNAMIC=y
-CONFIG_BT_PERIPHERAL=y
-CONFIG_BT_CENTRAL=y
diff --git a/ports/zephyr/modbluetooth_zephyr.c b/ports/zephyr/modbluetooth_zephyr.c
deleted file mode 100644
index 6b3a10d471..0000000000
--- a/ports/zephyr/modbluetooth_zephyr.c
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2019-2021 Damien P. George
- * Copyright (c) 2019-2020 Jim Mussared
- *
- * 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/runtime.h"
-#include "py/mperrno.h"
-#include "py/mphal.h"
-
-#if MICROPY_PY_BLUETOOTH
-
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include "extmod/modbluetooth.h"
-
-#define DEBUG_printf(...) // printk("BLE: " __VA_ARGS__)
-
-#define BLE_HCI_SCAN_ITVL_MIN 0x10
-#define BLE_HCI_SCAN_ITVL_MAX 0xffff
-#define BLE_HCI_SCAN_WINDOW_MIN 0x10
-#define BLE_HCI_SCAN_WINDOW_MAX 0xffff
-
-#define ERRNO_BLUETOOTH_NOT_ACTIVE MP_ENODEV
-
-enum {
-    MP_BLUETOOTH_ZEPHYR_BLE_STATE_OFF,
-    MP_BLUETOOTH_ZEPHYR_BLE_STATE_ACTIVE,
-    MP_BLUETOOTH_ZEPHYR_BLE_STATE_SUSPENDED,
-};
-
-enum {
-    MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_INACTIVE,
-    MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_DEACTIVATING,
-    MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_ACTIVE,
-};
-
-typedef struct _mp_bluetooth_zephyr_root_pointers_t {
-    // Characteristic (and descriptor) value storage.
-    mp_gatts_db_t gatts_db;
-} mp_bluetooth_zephyr_root_pointers_t;
-
-STATIC int mp_bluetooth_zephyr_ble_state;
-
-#if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
-STATIC int mp_bluetooth_zephyr_gap_scan_state;
-STATIC struct k_timer mp_bluetooth_zephyr_gap_scan_timer;
-STATIC struct bt_le_scan_cb mp_bluetooth_zephyr_gap_scan_cb_struct;
-#endif
-
-STATIC int bt_err_to_errno(int err) {
-    // Zephyr uses errno codes directly, but they are negative.
-    return -err;
-}
-
-// modbluetooth (and the layers above it) work in BE for addresses, Zephyr works in LE.
-STATIC void reverse_addr_byte_order(uint8_t *addr_out, const bt_addr_le_t *addr_in) {
-    for (int i = 0; i < 6; ++i) {
-        addr_out[i] = addr_in->a.val[5 - i];
-    }
-}
-
-#if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
-void gap_scan_cb_recv(const struct bt_le_scan_recv_info *info, struct net_buf_simple *buf) {
-    DEBUG_printf("gap_scan_cb_recv: adv_type=%d\n", info->adv_type);
-
-    if (!mp_bluetooth_is_active()) {
-        return;
-    }
-
-    if (mp_bluetooth_zephyr_gap_scan_state != MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_ACTIVE) {
-        return;
-    }
-
-    uint8_t addr[6];
-    reverse_addr_byte_order(addr, info->addr);
-    mp_bluetooth_gap_on_scan_result(info->addr->type, addr, info->adv_type, info->rssi, buf->data, buf->len);
-}
-
-STATIC mp_obj_t gap_scan_stop(mp_obj_t unused) {
-    (void)unused;
-    mp_bluetooth_gap_scan_stop();
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(gap_scan_stop_obj, gap_scan_stop);
-
-void gap_scan_cb_timeout(struct k_timer *timer_id) {
-    DEBUG_printf("gap_scan_cb_timeout\n");
-    // Cannot call bt_le_scan_stop from a timer callback because this callback may be
-    // preempting the BT stack.  So schedule it to be called from the main thread.
-    while (!mp_sched_schedule(MP_OBJ_FROM_PTR(&gap_scan_stop_obj), mp_const_none)) {
-        k_yield();
-    }
-    // Indicate scanning has stopped so that no more scan result events are generated
-    // (they may still come in until bt_le_scan_stop is called by gap_scan_stop).
-    mp_bluetooth_zephyr_gap_scan_state = MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_DEACTIVATING;
-}
-#endif
-
-int mp_bluetooth_init(void) {
-    DEBUG_printf("mp_bluetooth_init\n");
-
-    // Clean up if necessary.
-    mp_bluetooth_deinit();
-
-    // Allocate memory for state.
-    MP_STATE_PORT(bluetooth_zephyr_root_pointers) = m_new0(mp_bluetooth_zephyr_root_pointers_t, 1);
-    mp_bluetooth_gatts_db_create(&MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db);
-
-    #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
-    mp_bluetooth_zephyr_gap_scan_state = MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_INACTIVE;
-    k_timer_init(&mp_bluetooth_zephyr_gap_scan_timer, gap_scan_cb_timeout, NULL);
-    mp_bluetooth_zephyr_gap_scan_cb_struct.recv = gap_scan_cb_recv;
-    mp_bluetooth_zephyr_gap_scan_cb_struct.timeout = NULL; // currently not implemented in Zephyr
-    bt_le_scan_cb_register(&mp_bluetooth_zephyr_gap_scan_cb_struct);
-    #endif
-
-    if (mp_bluetooth_zephyr_ble_state == MP_BLUETOOTH_ZEPHYR_BLE_STATE_OFF) {
-        // bt_enable can only be called once.
-        int ret = bt_enable(NULL);
-        if (ret) {
-            return bt_err_to_errno(ret);
-        }
-    }
-
-    mp_bluetooth_zephyr_ble_state = MP_BLUETOOTH_ZEPHYR_BLE_STATE_ACTIVE;
-
-    DEBUG_printf("mp_bluetooth_init: ready\n");
-
-    return 0;
-}
-
-void mp_bluetooth_deinit(void) {
-    DEBUG_printf("mp_bluetooth_deinit %d\n", mp_bluetooth_zephyr_ble_state);
-    if (mp_bluetooth_zephyr_ble_state == MP_BLUETOOTH_ZEPHYR_BLE_STATE_OFF
-        || mp_bluetooth_zephyr_ble_state == MP_BLUETOOTH_ZEPHYR_BLE_STATE_SUSPENDED) {
-        return;
-    }
-
-    mp_bluetooth_gap_advertise_stop();
-
-    #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
-    mp_bluetooth_gap_scan_stop();
-    bt_le_scan_cb_unregister(&mp_bluetooth_zephyr_gap_scan_cb_struct);
-    #endif
-
-    // There is no way to turn off the BT stack in Zephyr, so just set the
-    // state as suspended so it can be correctly reactivated later.
-    mp_bluetooth_zephyr_ble_state = MP_BLUETOOTH_ZEPHYR_BLE_STATE_SUSPENDED;
-
-    MP_STATE_PORT(bluetooth_zephyr_root_pointers) = NULL;
-}
-
-bool mp_bluetooth_is_active(void) {
-    return mp_bluetooth_zephyr_ble_state == MP_BLUETOOTH_ZEPHYR_BLE_STATE_ACTIVE;
-}
-
-void mp_bluetooth_get_current_address(uint8_t *addr_type, uint8_t *addr) {
-    if (!mp_bluetooth_is_active()) {
-        mp_raise_OSError(ERRNO_BLUETOOTH_NOT_ACTIVE);
-    }
-    bt_addr_le_t le_addr;
-    size_t count = 1;
-    bt_id_get(&le_addr, &count);
-    if (count == 0) {
-        mp_raise_OSError(EIO);
-    }
-    reverse_addr_byte_order(addr, &le_addr);
-    *addr_type = le_addr.type;
-}
-
-void mp_bluetooth_set_address_mode(uint8_t addr_mode) {
-    // TODO: implement
-}
-
-size_t mp_bluetooth_gap_get_device_name(const uint8_t **buf) {
-    const char *name = bt_get_name();
-    *buf = (const uint8_t *)name;
-    return strlen(name);
-}
-
-int mp_bluetooth_gap_set_device_name(const uint8_t *buf, size_t len) {
-    char tmp_buf[CONFIG_BT_DEVICE_NAME_MAX + 1];
-    if (len + 1 > sizeof(tmp_buf)) {
-        return MP_EINVAL;
-    }
-    memcpy(tmp_buf, buf, len);
-    tmp_buf[len] = '\0';
-    return bt_err_to_errno(bt_set_name(tmp_buf));
-}
-
-// Zephyr takes advertising/scan data as an array of (type, len, payload) packets,
-// and this function constructs such an array from raw advertising/scan data.
-STATIC void mp_bluetooth_prepare_bt_data(const uint8_t *data, size_t len, struct bt_data *bt_data, size_t *bt_len) {
-    size_t i = 0;
-    const uint8_t *d = data;
-    while (d < data + len && i < *bt_len) {
-        bt_data[i].type = d[1];
-        bt_data[i].data_len = d[0] - 1;
-        bt_data[i].data = &d[2];
-        i += 1;
-        d += 1 + d[0];
-    }
-    *bt_len = i;
-}
-
-int mp_bluetooth_gap_advertise_start(bool connectable, int32_t interval_us, const uint8_t *adv_data, size_t adv_data_len, const uint8_t *sr_data, size_t sr_data_len) {
-    if (!mp_bluetooth_is_active()) {
-        return ERRNO_BLUETOOTH_NOT_ACTIVE;
-    }
-
-    mp_bluetooth_gap_advertise_stop();
-
-    struct bt_data bt_ad_data[8];
-    size_t bt_ad_len = 0;
-    if (adv_data) {
-        bt_ad_len = MP_ARRAY_SIZE(bt_ad_data);
-        mp_bluetooth_prepare_bt_data(adv_data, adv_data_len, bt_ad_data, &bt_ad_len);
-    }
-
-    struct bt_data bt_sd_data[8];
-    size_t bt_sd_len = 0;
-    if (sr_data) {
-        bt_sd_len = MP_ARRAY_SIZE(bt_sd_data);
-        mp_bluetooth_prepare_bt_data(sr_data, sr_data_len, bt_sd_data, &bt_sd_len);
-    }
-
-    struct bt_le_adv_param param = {
-        .id = 0,
-        .sid = 0,
-        .secondary_max_skip = 0,
-        .options = (connectable ? BT_LE_ADV_OPT_CONNECTABLE : 0)
-            | BT_LE_ADV_OPT_ONE_TIME
-            | BT_LE_ADV_OPT_USE_IDENTITY
-            | BT_LE_ADV_OPT_SCANNABLE,
-        .interval_min = interval_us / 625,
-        .interval_max = interval_us / 625 + 1, // min/max cannot be the same value
-        .peer = NULL,
-    };
-
-    return bt_err_to_errno(bt_le_adv_start(&param, bt_ad_data, bt_ad_len, bt_sd_data, bt_sd_len));
-}
-
-void mp_bluetooth_gap_advertise_stop(void) {
-    // Note: bt_le_adv_stop returns 0 if adv is already stopped.
-    int ret = bt_le_adv_stop();
-    if (ret != 0) {
-        mp_raise_OSError(bt_err_to_errno(ret));
-    }
-}
-
-int mp_bluetooth_gatts_register_service_begin(bool append) {
-    if (!mp_bluetooth_is_active()) {
-        return ERRNO_BLUETOOTH_NOT_ACTIVE;
-    }
-
-    if (append) {
-        // Don't support append yet (modbluetooth.c doesn't support it yet anyway).
-        return MP_EOPNOTSUPP;
-    }
-
-    // Reset the gatt characteristic value db.
-    mp_bluetooth_gatts_db_reset(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db);
-
-    return MP_EOPNOTSUPP;
-}
-
-int mp_bluetooth_gatts_register_service_end(void) {
-    return MP_EOPNOTSUPP;
-}
-
-int mp_bluetooth_gatts_register_service(mp_obj_bluetooth_uuid_t *service_uuid, mp_obj_bluetooth_uuid_t **characteristic_uuids, uint16_t *characteristic_flags, mp_obj_bluetooth_uuid_t **descriptor_uuids, uint16_t *descriptor_flags, uint8_t *num_descriptors, uint16_t *handles, size_t num_characteristics) {
-    return MP_EOPNOTSUPP;
-}
-
-int mp_bluetooth_gap_disconnect(uint16_t conn_handle) {
-    if (!mp_bluetooth_is_active()) {
-        return ERRNO_BLUETOOTH_NOT_ACTIVE;
-    }
-    return MP_EOPNOTSUPP;
-}
-
-int mp_bluetooth_gatts_read(uint16_t value_handle, uint8_t **value, size_t *value_len) {
-    if (!mp_bluetooth_is_active()) {
-        return ERRNO_BLUETOOTH_NOT_ACTIVE;
-    }
-    return mp_bluetooth_gatts_db_read(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db, value_handle, value, value_len);
-}
-
-int mp_bluetooth_gatts_write(uint16_t value_handle, const uint8_t *value, size_t value_len) {
-    if (!mp_bluetooth_is_active()) {
-        return ERRNO_BLUETOOTH_NOT_ACTIVE;
-    }
-    return mp_bluetooth_gatts_db_write(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db, value_handle, value, value_len);
-}
-
-int mp_bluetooth_gatts_notify(uint16_t conn_handle, uint16_t value_handle) {
-    if (!mp_bluetooth_is_active()) {
-        return ERRNO_BLUETOOTH_NOT_ACTIVE;
-    }
-    return MP_EOPNOTSUPP;
-}
-
-int mp_bluetooth_gatts_notify_send(uint16_t conn_handle, uint16_t value_handle, const uint8_t *value, size_t value_len) {
-    if (!mp_bluetooth_is_active()) {
-        return ERRNO_BLUETOOTH_NOT_ACTIVE;
-    }
-    return MP_EOPNOTSUPP;
-}
-
-int mp_bluetooth_gatts_indicate(uint16_t conn_handle, uint16_t value_handle) {
-    if (!mp_bluetooth_is_active()) {
-        return ERRNO_BLUETOOTH_NOT_ACTIVE;
-    }
-    return MP_EOPNOTSUPP;
-}
-
-int mp_bluetooth_gatts_set_buffer(uint16_t value_handle, size_t len, bool append) {
-    if (!mp_bluetooth_is_active()) {
-        return ERRNO_BLUETOOTH_NOT_ACTIVE;
-    }
-    return MP_EOPNOTSUPP;
-}
-
-int mp_bluetooth_get_preferred_mtu(void) {
-    if (!mp_bluetooth_is_active()) {
-        mp_raise_OSError(ERRNO_BLUETOOTH_NOT_ACTIVE);
-    }
-    mp_raise_OSError(MP_EOPNOTSUPP);
-}
-
-int mp_bluetooth_set_preferred_mtu(uint16_t mtu) {
-    if (!mp_bluetooth_is_active()) {
-        return ERRNO_BLUETOOTH_NOT_ACTIVE;
-    }
-    return MP_EOPNOTSUPP;
-}
-
-#if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
-
-int mp_bluetooth_gap_scan_start(int32_t duration_ms, int32_t interval_us, int32_t window_us, bool active_scan) {
-    // Stop any ongoing GAP scan.
-    int ret = mp_bluetooth_gap_scan_stop();
-    if (ret) {
-        return ret;
-    }
-
-    struct bt_le_scan_param param = {
-        .type = active_scan ? BT_HCI_LE_SCAN_ACTIVE : BT_HCI_LE_SCAN_PASSIVE,
-        .options = BT_LE_SCAN_OPT_NONE,
-        .interval = MAX(BLE_HCI_SCAN_ITVL_MIN, MIN(BLE_HCI_SCAN_ITVL_MAX, interval_us / 625)),
-        .window = MAX(BLE_HCI_SCAN_WINDOW_MIN, MIN(BLE_HCI_SCAN_WINDOW_MAX, window_us / 625)),
-    };
-    k_timer_start(&mp_bluetooth_zephyr_gap_scan_timer, K_MSEC(duration_ms), K_NO_WAIT);
-    mp_bluetooth_zephyr_gap_scan_state = MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_ACTIVE;
-    int err = bt_le_scan_start(&param, NULL);
-    return bt_err_to_errno(err);
-}
-
-int mp_bluetooth_gap_scan_stop(void) {
-    DEBUG_printf("mp_bluetooth_gap_scan_stop\n");
-    if (!mp_bluetooth_is_active()) {
-        return ERRNO_BLUETOOTH_NOT_ACTIVE;
-    }
-    if (mp_bluetooth_zephyr_gap_scan_state == MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_INACTIVE) {
-        // Already stopped.
-        return 0;
-    }
-    mp_bluetooth_zephyr_gap_scan_state = MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_INACTIVE;
-    k_timer_stop(&mp_bluetooth_zephyr_gap_scan_timer);
-    int err = bt_le_scan_stop();
-    if (err == 0) {
-        mp_bluetooth_gap_on_scan_complete();
-        return 0;
-    }
-    return bt_err_to_errno(err);
-}
-
-int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr, int32_t duration_ms) {
-    DEBUG_printf("mp_bluetooth_gap_peripheral_connect\n");
-    if (!mp_bluetooth_is_active()) {
-        return ERRNO_BLUETOOTH_NOT_ACTIVE;
-    }
-    return MP_EOPNOTSUPP;
-}
-
-#endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
-
-#endif // MICROPY_PY_BLUETOOTH
diff --git a/ports/zephyr/mphalport.c b/ports/zephyr/mphalport.c
deleted file mode 100644
index 4f00cbd26c..0000000000
--- a/ports/zephyr/mphalport.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2021 Damien P. George
- *
- * 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/runtime.h"
-#include "py/mphal.h"
-
-static struct k_poll_signal wait_signal;
-static struct k_poll_event wait_events[2] = {
-    K_POLL_EVENT_INITIALIZER(K_POLL_TYPE_SIGNAL,
-        K_POLL_MODE_NOTIFY_ONLY,
-        &wait_signal),
-    K_POLL_EVENT_STATIC_INITIALIZER(K_POLL_TYPE_SEM_AVAILABLE,
-        K_POLL_MODE_NOTIFY_ONLY,
-        NULL, 0),
-};
-
-void mp_hal_init(void) {
-    k_poll_signal_init(&wait_signal);
-}
-
-void mp_hal_signal_event(void) {
-    k_poll_signal_raise(&wait_signal, 0);
-}
-
-void mp_hal_wait_sem(struct k_sem *sem, uint32_t timeout_ms) {
-    mp_uint_t t0 = mp_hal_ticks_ms();
-    if (sem) {
-        k_poll_event_init(&wait_events[1], K_POLL_TYPE_SEM_AVAILABLE, K_POLL_MODE_NOTIFY_ONLY, sem);
-    }
-    for (;;) {
-        k_timeout_t wait;
-        if (timeout_ms == (uint32_t)-1) {
-            wait = K_FOREVER;
-        } else {
-            uint32_t dt = mp_hal_ticks_ms() - t0;
-            if (dt >= timeout_ms) {
-                return;
-            }
-            wait = K_MSEC(timeout_ms - dt);
-        }
-        k_poll(wait_events, sem ? 2 : 1, wait);
-        if (wait_events[0].state == K_POLL_STATE_SIGNALED) {
-            wait_events[0].signal->signaled = 0;
-            wait_events[0].state = K_POLL_STATE_NOT_READY;
-            mp_handle_pending(true);
-        } else if (sem && wait_events[1].state == K_POLL_STATE_SEM_AVAILABLE) {
-            wait_events[1].state = K_POLL_STATE_NOT_READY;
-            return;
-        }
-    }
-}
diff --git a/tests/multi_bluetooth/perf_gatt_char_write.py b/tests/multi_bluetooth/perf_gatt_char_write.py
deleted file mode 100644
index 00607f0090..0000000000
--- a/tests/multi_bluetooth/perf_gatt_char_write.py
+++ /dev/null
@@ -1,151 +0,0 @@
-# Write characteristic from central to peripheral and time data rate.
-
-from micropython import const
-import time, machine, bluetooth
-
-TIMEOUT_MS = 2000
-
-_IRQ_CENTRAL_CONNECT = const(1)
-_IRQ_CENTRAL_DISCONNECT = const(2)
-_IRQ_GATTS_WRITE = const(3)
-_IRQ_PERIPHERAL_CONNECT = const(7)
-_IRQ_PERIPHERAL_DISCONNECT = const(8)
-_IRQ_GATTC_CHARACTERISTIC_RESULT = const(11)
-_IRQ_GATTC_CHARACTERISTIC_DONE = const(12)
-_IRQ_GATTC_WRITE_DONE = const(17)
-_IRQ_MTU_EXCHANGED = const(21)
-
-# How long to run the test for.
-_NUM_NOTIFICATIONS = const(40)
-_MTU_SIZE = const(131)
-_CHAR_SIZE = const(_MTU_SIZE - 3)
-
-SERVICE_UUID = bluetooth.UUID("A5A5A5A5-FFFF-9999-1111-5A5A5A5A5A5A")
-CHAR_UUID = bluetooth.UUID("00000000-1111-2222-3333-444444444444")
-CHAR = (CHAR_UUID, bluetooth.FLAG_WRITE | bluetooth.FLAG_WRITE_NO_RESPONSE)
-SERVICE = (SERVICE_UUID, (CHAR,))
-SERVICES = (SERVICE,)
-
-packet_sequence = 0
-waiting_events = {}
-
-
-def irq(event, data):
-    if event == _IRQ_CENTRAL_CONNECT:
-        waiting_events[event] = data[0]
-    elif event == _IRQ_PERIPHERAL_CONNECT:
-        waiting_events[event] = data[0]
-    elif event == _IRQ_GATTS_WRITE:
-        global packet_sequence
-        conn_handle, attr_handle = data
-        data = ble.gatts_read(attr_handle)
-        if not (data[0] == packet_sequence and data[-1] == (256 - packet_sequence) & 0xFF):
-            print("_IRQ_GATTS_WRITE data invalid:", packet_sequence, data)
-        elif packet_sequence % 10 == 0:
-            print("_IRQ_GATTS_WRITE", packet_sequence)
-        packet_sequence += 1
-    elif event == _IRQ_GATTC_CHARACTERISTIC_RESULT:
-        # conn_handle, def_handle, value_handle, properties, uuid = data
-        if data[-1] == CHAR_UUID:
-            waiting_events[event] = data[2]
-        else:
-            return
-    elif event == _IRQ_MTU_EXCHANGED:
-        # ATT MTU exchange complete (either initiated by us or the remote device).
-        conn_handle, mtu = data
-        print("_IRQ_MTU_EXCHANGED:", mtu)
-
-    if event not in waiting_events:
-        waiting_events[event] = None
-
-
-def wait_for_event(event, timeout_ms):
-    t0 = time.ticks_ms()
-    while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
-        if event in waiting_events:
-            return waiting_events.pop(event)
-        machine.idle()
-    raise ValueError("Timeout waiting for {}".format(event))
-
-
-# Acting in peripheral role.
-def instance0():
-    multitest.globals(BDADDR=ble.config("mac"))
-    ((char_handle,),) = ble.gatts_register_services(SERVICES)
-    ble.gatts_set_buffer(char_handle, _CHAR_SIZE)
-    print("gap_advertise")
-    ble.gap_advertise(20_000, b"\x02\x01\x06\x04\xffMPY")
-    multitest.next()
-    try:
-        # Wait for central to connect to us.
-        conn_handle = wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS)
-        # Wait for central to disconnect us.
-        wait_for_event(_IRQ_CENTRAL_DISCONNECT, 30000)
-        print("final packet_sequence:", packet_sequence)
-    finally:
-        ble.active(0)
-
-
-# Acting in central role.
-def instance1():
-    global packet_sequence
-    ((char_handle,),) = ble.gatts_register_services(SERVICES)
-    multitest.next()
-    try:
-        # Connect to peripheral and then disconnect.
-        print("gap_connect")
-        ble.config(mtu=_MTU_SIZE)
-        ble.gap_connect(*BDADDR)
-        conn_handle = wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS)
-        ble.gattc_exchange_mtu(conn_handle)
-
-        # Discover characteristics.
-        ble.gattc_discover_characteristics(conn_handle, 1, 65535)
-        value_handle = wait_for_event(_IRQ_GATTC_CHARACTERISTIC_RESULT, TIMEOUT_MS)
-        wait_for_event(_IRQ_GATTC_CHARACTERISTIC_DONE, TIMEOUT_MS)
-
-        # Send data!
-        data = bytearray(ord("A") + (i % 64) for i in range(_CHAR_SIZE))
-        for mode in (0, 1):
-            ticks_start = time.ticks_ms()
-            for i in range(_NUM_NOTIFICATIONS):
-                data[0] = packet_sequence
-                data[-1] = 256 - packet_sequence
-                if packet_sequence % 10 == 0:
-                    print("gattc_write", packet_sequence)
-                if mode == 0:
-                    while True:
-                        try:
-                            ble.gattc_write(conn_handle, value_handle, data, mode)
-                            break
-                        except OSError:
-                            pass
-                else:
-                    ble.gattc_write(conn_handle, value_handle, data, mode)
-                    wait_for_event(_IRQ_GATTC_WRITE_DONE, TIMEOUT_MS)
-                packet_sequence += 1
-
-            ticks_end = time.ticks_ms()
-            ticks_total = time.ticks_diff(ticks_end, ticks_start)
-
-            print(
-                "Did {} writes in {} ms. {} ms/write, {} bytes/sec".format(
-                    _NUM_NOTIFICATIONS,
-                    ticks_total,
-                    ticks_total / _NUM_NOTIFICATIONS,
-                    _NUM_NOTIFICATIONS * len(data) * 1000 // ticks_total,
-                )
-            )
-
-            time.sleep_ms(100)
-
-        # DIsconnect the peripheral.
-        print("gap_disconnect:", ble.gap_disconnect(conn_handle))
-        wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, 20000)
-    finally:
-        ble.active(0)
-
-
-ble = bluetooth.BLE()
-ble.active(1)
-ble.irq(irq)
diff --git a/tests/multi_bluetooth/perf_gatt_char_write.py.exp b/tests/multi_bluetooth/perf_gatt_char_write.py.exp
deleted file mode 100644
index 4dda5e04f0..0000000000
--- a/tests/multi_bluetooth/perf_gatt_char_write.py.exp
+++ /dev/null
@@ -1,24 +0,0 @@
---- instance0 ---
-gap_advertise
-_IRQ_MTU_EXCHANGED: 131
-_IRQ_GATTS_WRITE 0
-_IRQ_GATTS_WRITE 10
-_IRQ_GATTS_WRITE 20
-_IRQ_GATTS_WRITE 30
-_IRQ_GATTS_WRITE 40
-_IRQ_GATTS_WRITE 50
-_IRQ_GATTS_WRITE 60
-_IRQ_GATTS_WRITE 70
-final packet_sequence: 80
---- instance1 ---
-gap_connect
-_IRQ_MTU_EXCHANGED: 131
-gattc_write 0
-gattc_write 10
-gattc_write 20
-gattc_write 30
-gattc_write 40
-gattc_write 50
-gattc_write 60
-gattc_write 70
-gap_disconnect: True
diff --git a/tests/multi_net/uasyncio_tcp_readinto.py b/tests/multi_net/uasyncio_tcp_readinto.py
deleted file mode 100644
index 631997652a..0000000000
--- a/tests/multi_net/uasyncio_tcp_readinto.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# Test uasyncio stream readinto() method using TCP server/client
-
-try:
-    import uasyncio as asyncio
-except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
-
-try:
-    import uarray as array
-except ImportError:
-    try:
-        import array
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
-
-PORT = 8000
-
-
-async def handle_connection(reader, writer):
-    writer.write(b"ab")
-    await writer.drain()
-
-    writer.write(b"c")
-    await writer.drain()
-
-    print("close")
-    writer.close()
-    await writer.wait_closed()
-
-    print("done")
-    ev.set()
-
-
-async def tcp_server():
-    global ev
-    ev = asyncio.Event()
-    server = await asyncio.start_server(handle_connection, "0.0.0.0", PORT)
-    print("server running")
-    multitest.next()
-    async with server:
-        await asyncio.wait_for(ev.wait(), 10)
-
-
-async def tcp_client():
-    reader, writer = await asyncio.open_connection(IP, PORT)
-
-    ba = bytearray(2)
-    n = await reader.readinto(ba)
-    print(n)
-    print(ba[:n])
-
-    a = array.array("b", [0, 0])
-    n = await reader.readinto(a)
-    print(n)
-    print(a[:n])
-
-    try:
-        n = await reader.readinto(5)
-    except TypeError as er:
-        print("TypeError")
-
-    try:
-        n = await reader.readinto()
-    except TypeError as er:
-        print("TypeError")
-
-
-def instance0():
-    multitest.globals(IP=multitest.get_network_ip())
-    asyncio.run(tcp_server())
-
-
-def instance1():
-    multitest.next()
-    asyncio.run(tcp_client())
diff --git a/tests/multi_net/uasyncio_tcp_readinto.py.exp b/tests/multi_net/uasyncio_tcp_readinto.py.exp
deleted file mode 100644
index 2d40ba1e63..0000000000
--- a/tests/multi_net/uasyncio_tcp_readinto.py.exp
+++ /dev/null
@@ -1,11 +0,0 @@
---- instance0 ---
-server running
-close
-done
---- instance1 ---
-2
-bytearray(b'ab')
-1
-array('b', [99])
-TypeError
-TypeError
diff --git a/tools/mpremote/LICENSE b/tools/mpremote/LICENSE
deleted file mode 100644
index 5ec904cca1..0000000000
--- a/tools/mpremote/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2021 Damien P. George
-
-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.
diff --git a/tools/mpremote/README.md b/tools/mpremote/README.md
deleted file mode 100644
index a6aaa1755d..0000000000
--- a/tools/mpremote/README.md
+++ /dev/null
@@ -1,71 +0,0 @@
-# mpremote -- MicroPython remote control
-
-This CLI tool provides an integrated set of utilities to remotely interact with
-and automate a MicroPython device over a serial connection.
-
-The simplest way to use this tool is:
-
-    mpremote
-
-This will automatically connect to the device and provide an interactive REPL.
-
-The full list of supported commands are:
-
-    mpremote connect <device>        -- connect to given device
-                                        device may be: list, auto, id:x, port:x
-                                        or any valid device name/path
-    mpremote disconnect              -- disconnect current device
-    mpremote mount <local-dir>       -- mount local directory on device
-    mpremote eval <string>           -- evaluate and print the string
-    mpremote exec <string>           -- execute the string
-    mpremote run <file>              -- run the given local script
-    mpremote fs <command> <args...>  -- execute filesystem commands on the device
-                                        command may be: cat, ls, cp, rm, mkdir, rmdir
-                                        use ":" as a prefix to specify a file on the device
-    mpremote repl                    -- enter REPL
-                                        options:
-                                            --capture <file>
-                                            --inject-code <string>
-                                            --inject-file <file>
-
-Multiple commands can be specified and they will be run sequentially.  Connection
-and disconnection will be done automatically at the start and end of the execution
-of the tool, if such commands are not explicitly given.  Automatic connection will
-search for the first available serial device.  If no action is specified then the
-REPL will be entered.
-
-Shortcuts can be defined using the macro system.  Built-in shortcuts are:
-
-- a0, a1, a2, a3: connect to `/dev/ttyACM?`
-- u0, u1, u2, u3: connect to `/dev/ttyUSB?`
-- c0, c1, c2, c3: connect to `COM?`
-- cat, ls, cp, rm, mkdir, rmdir, df: filesystem commands
-- reset: reset the device
-- bootloader: make the device enter its bootloader
-
-Any user configuration, including user-defined shortcuts, can be placed in
-.config/mpremote/config.py.  For example:
-
-    # Custom macro commands
-    commands = {
-        "c33": "connect id:334D335C3138",
-        "bl": "bootloader",
-        "double x=4": "eval x*2",
-    }
-
-Examples:
-
-    mpremote
-    mpremote a1
-    mpremote connect /dev/ttyUSB0 repl
-    mpremote ls
-    mpremote a1 ls
-    mpremote exec "import micropython; micropython.mem_info()"
-    mpremote eval 1/2 eval 3/4
-    mpremote mount .
-    mpremote mount . exec "import local_script"
-    mpremote ls
-    mpremote cat boot.py
-    mpremote cp :main.py .
-    mpremote cp main.py :
-    mpremote cp -r dir/ :
diff --git a/tools/mpremote/mpremote.py b/tools/mpremote/mpremote.py
deleted file mode 100755
index a91ff67b15..0000000000
--- a/tools/mpremote/mpremote.py
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-from mpremote import main
-
-sys.exit(main.main())
diff --git a/tools/mpremote/mpremote/__init__.py b/tools/mpremote/mpremote/__init__.py
deleted file mode 100644
index 1bb8bf6d7f..0000000000
--- a/tools/mpremote/mpremote/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# empty
diff --git a/tools/mpremote/mpremote/console.py b/tools/mpremote/mpremote/console.py
deleted file mode 100644
index 2652c7393b..0000000000
--- a/tools/mpremote/mpremote/console.py
+++ /dev/null
@@ -1,171 +0,0 @@
-import sys, time
-
-try:
-    import select, termios
-except ImportError:
-    termios = None
-    select = None
-    import msvcrt, signal
-
-
-class ConsolePosix:
-    def __init__(self):
-        self.infd = sys.stdin.fileno()
-        self.infile = sys.stdin.buffer.raw
-        self.outfile = sys.stdout.buffer.raw
-        self.orig_attr = termios.tcgetattr(self.infd)
-
-    def enter(self):
-        # attr is: [iflag, oflag, cflag, lflag, ispeed, ospeed, cc]
-        attr = termios.tcgetattr(self.infd)
-        attr[0] &= ~(
-            termios.BRKINT | termios.ICRNL | termios.INPCK | termios.ISTRIP | termios.IXON
-        )
-        attr[1] = 0
-        attr[2] = attr[2] & ~(termios.CSIZE | termios.PARENB) | termios.CS8
-        attr[3] = 0
-        attr[6][termios.VMIN] = 1
-        attr[6][termios.VTIME] = 0
-        termios.tcsetattr(self.infd, termios.TCSANOW, attr)
-
-    def exit(self):
-        termios.tcsetattr(self.infd, termios.TCSANOW, self.orig_attr)
-
-    def waitchar(self, pyb_serial):
-        # TODO pyb_serial might not have fd
-        select.select([self.infd, pyb_serial.fd], [], [])
-
-    def readchar(self):
-        res = select.select([self.infd], [], [], 0)
-        if res[0]:
-            return self.infile.read(1)
-        else:
-            return None
-
-    def write(self, buf):
-        self.outfile.write(buf)
-
-
-class ConsoleWindows:
-    KEY_MAP = {
-        b"H": b"A",  # UP
-        b"P": b"B",  # DOWN
-        b"M": b"C",  # RIGHT
-        b"K": b"D",  # LEFT
-        b"G": b"H",  # POS1
-        b"O": b"F",  # END
-        b"Q": b"6~",  # PGDN
-        b"I": b"5~",  # PGUP
-        b"s": b"1;5D",  # CTRL-LEFT,
-        b"t": b"1;5C",  # CTRL-RIGHT,
-        b"\x8d": b"1;5A",  #  CTRL-UP,
-        b"\x91": b"1;5B",  # CTRL-DOWN,
-        b"w": b"1;5H",  # CTRL-POS1
-        b"u": b"1;5F",  # CTRL-END
-        b"\x98": b"1;3A",  #  ALT-UP,
-        b"\xa0": b"1;3B",  # ALT-DOWN,
-        b"\x9d": b"1;3C",  #  ALT-RIGHT,
-        b"\x9b": b"1;3D",  # ALT-LEFT,
-        b"\x97": b"1;3H",  #  ALT-POS1,
-        b"\x9f": b"1;3F",  # ALT-END,
-        b"S": b"3~",  # DEL,
-        b"\x93": b"3;5~",  # CTRL-DEL
-        b"R": b"2~",  # INS
-        b"\x92": b"2;5~",  # CTRL-INS
-        b"\x94": b"Z",  # Ctrl-Tab = BACKTAB,
-    }
-
-    def __init__(self):
-        self.ctrl_c = 0
-
-    def _sigint_handler(self, signo, frame):
-        self.ctrl_c += 1
-
-    def enter(self):
-        signal.signal(signal.SIGINT, self._sigint_handler)
-
-    def exit(self):
-        signal.signal(signal.SIGINT, signal.SIG_DFL)
-
-    def inWaiting(self):
-        return 1 if self.ctrl_c or msvcrt.kbhit() else 0
-
-    def waitchar(self, pyb_serial):
-        while not (self.inWaiting() or pyb_serial.inWaiting()):
-            time.sleep(0.01)
-
-    def readchar(self):
-        if self.ctrl_c:
-            self.ctrl_c -= 1
-            return b"\x03"
-        if msvcrt.kbhit():
-            ch = msvcrt.getch()
-            while ch in b"\x00\xe0":  # arrow or function key prefix?
-                if not msvcrt.kbhit():
-                    return None
-                ch = msvcrt.getch()  # second call returns the actual key code
-                try:
-                    ch = b"\x1b[" + self.KEY_MAP[ch]
-                except KeyError:
-                    return None
-            return ch
-
-    def write(self, buf):
-        buf = buf.decode() if isinstance(buf, bytes) else buf
-        sys.stdout.write(buf)
-        sys.stdout.flush()
-        # for b in buf:
-        #     if isinstance(b, bytes):
-        #         msvcrt.putch(b)
-        #     else:
-        #         msvcrt.putwch(b)
-
-
-if termios:
-    Console = ConsolePosix
-    VT_ENABLED = True
-else:
-    Console = ConsoleWindows
-
-    # Windows VT mode ( >= win10 only)
-    # https://bugs.python.org/msg291732
-    import ctypes, os
-    from ctypes import wintypes
-
-    kernel32 = ctypes.WinDLL("kernel32", use_last_error=True)
-
-    ERROR_INVALID_PARAMETER = 0x0057
-    ENABLE_VIRTUAL_TERMINAL_PROCESSING = 0x0004
-
-    def _check_bool(result, func, args):
-        if not result:
-            raise ctypes.WinError(ctypes.get_last_error())
-        return args
-
-    LPDWORD = ctypes.POINTER(wintypes.DWORD)
-    kernel32.GetConsoleMode.errcheck = _check_bool
-    kernel32.GetConsoleMode.argtypes = (wintypes.HANDLE, LPDWORD)
-    kernel32.SetConsoleMode.errcheck = _check_bool
-    kernel32.SetConsoleMode.argtypes = (wintypes.HANDLE, wintypes.DWORD)
-
-    def set_conout_mode(new_mode, mask=0xFFFFFFFF):
-        # don't assume StandardOutput is a console.
-        # open CONOUT$ instead
-        fdout = os.open("CONOUT$", os.O_RDWR)
-        try:
-            hout = msvcrt.get_osfhandle(fdout)
-            old_mode = wintypes.DWORD()
-            kernel32.GetConsoleMode(hout, ctypes.byref(old_mode))
-            mode = (new_mode & mask) | (old_mode.value & ~mask)
-            kernel32.SetConsoleMode(hout, mode)
-            return old_mode.value
-        finally:
-            os.close(fdout)
-
-    # def enable_vt_mode():
-    mode = mask = ENABLE_VIRTUAL_TERMINAL_PROCESSING
-    try:
-        set_conout_mode(mode, mask)
-        VT_ENABLED = True
-    except WindowsError as e:
-        VT_ENABLED = False
diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
deleted file mode 100644
index b7c46a1f11..0000000000
--- a/tools/mpremote/mpremote/main.py
+++ /dev/null
@@ -1,455 +0,0 @@
-"""
-MicroPython Remote - Interaction and automation tool for MicroPython
-MIT license; Copyright (c) 2019-2021 Damien P. George
-
-This program provides a set of utilities to interact with and automate a
-MicroPython device over a serial connection.  Commands supported are:
-
-    mpremote                         -- auto-detect, connect and enter REPL
-    mpremote <device-shortcut>       -- connect to given device
-    mpremote connect <device>        -- connect to given device
-    mpremote disconnect              -- disconnect current device
-    mpremote mount <local-dir>       -- mount local directory on device
-    mpremote eval <string>           -- evaluate and print the string
-    mpremote exec <string>           -- execute the string
-    mpremote run <script>            -- run the given local script
-    mpremote fs <command> <args...>  -- execute filesystem commands on the device
-    mpremote repl                    -- enter REPL
-"""
-
-import os, sys
-import serial.tools.list_ports
-
-from . import pyboardextended as pyboard
-from .console import Console, ConsolePosix
-
-_PROG = "mpremote"
-
-_BUILTIN_COMMAND_EXPANSIONS = {
-    # Device connection shortcuts.
-    "a0": "connect /dev/ttyACM0",
-    "a1": "connect /dev/ttyACM1",
-    "a2": "connect /dev/ttyACM2",
-    "a3": "connect /dev/ttyACM3",
-    "u0": "connect /dev/ttyUSB0",
-    "u1": "connect /dev/ttyUSB1",
-    "u2": "connect /dev/ttyUSB2",
-    "u3": "connect /dev/ttyUSB3",
-    "c0": "connect COM0",
-    "c1": "connect COM1",
-    "c2": "connect COM2",
-    "c3": "connect COM3",
-    # Filesystem shortcuts.
-    "cat": "fs cat",
-    "ls": "fs ls",
-    "cp": "fs cp",
-    "rm": "fs rm",
-    "mkdir": "fs mkdir",
-    "rmdir": "fs rmdir",
-    "df": [
-        "exec",
-        "import uos\nprint('mount \\tsize \\tused \\tavail \\tuse%')\nfor _m in [''] + uos.listdir('/'):\n _s = uos.stat('/' + _m)\n if not _s[0] & 1 << 14: continue\n _s = uos.statvfs(_m)\n if _s[0]:\n  _size = _s[0] * _s[2]; _free = _s[0] * _s[3]; print(_m, _size, _size - _free, _free, int(100 * (_size - _free) / _size), sep='\\t')",
-    ],
-    # Other shortcuts.
-    "reset t_ms=100": [
-        "exec",
-        "--no-follow",
-        "import utime, umachine; utime.sleep_ms(t_ms); umachine.reset()",
-    ],
-    "bootloader t_ms=100": [
-        "exec",
-        "--no-follow",
-        "import utime, umachine; utime.sleep_ms(t_ms); umachine.bootloader()",
-    ],
-    "setrtc": [
-        "exec",
-        "import machine; machine.RTC().datetime((2020, 1, 1, 0, 10, 0, 0, 0))",
-    ],
-}
-
-
-def load_user_config():
-    # Create empty config object.
-    config = __build_class__(lambda: None, "Config")()
-    config.commands = {}
-
-    # Get config file name.
-    path = os.getenv("XDG_CONFIG_HOME")
-    if path is None:
-        path = os.getenv("HOME")
-        if path is None:
-            return config
-        path = os.path.join(path, ".config")
-    path = os.path.join(path, _PROG)
-    config_file = os.path.join(path, "config.py")
-
-    # Check if config file exists.
-    if not os.path.exists(config_file):
-        return config
-
-    # Exec the config file in its directory.
-    with open(config_file) as f:
-        config_data = f.read()
-    prev_cwd = os.getcwd()
-    os.chdir(path)
-    exec(config_data, config.__dict__)
-    os.chdir(prev_cwd)
-
-    return config
-
-
-def prepare_command_expansions(config):
-    global _command_expansions
-
-    _command_expansions = {}
-
-    for command_set in (_BUILTIN_COMMAND_EXPANSIONS, config.commands):
-        for cmd, sub in command_set.items():
-            cmd = cmd.split()
-            if len(cmd) == 1:
-                args = ()
-            else:
-                args = tuple(c.split("=") for c in cmd[1:])
-            if isinstance(sub, str):
-                sub = sub.split()
-            _command_expansions[cmd[0]] = (args, sub)
-
-
-def do_command_expansion(args):
-    def usage_error(cmd, exp_args, msg):
-        print(f"Command {cmd} {msg}; signature is:")
-        print("   ", cmd, " ".join("=".join(a) for a in exp_args))
-        sys.exit(1)
-
-    last_arg_idx = len(args)
-    pre = []
-    while args and args[0] in _command_expansions:
-        cmd = args.pop(0)
-        exp_args, exp_sub = _command_expansions[cmd]
-        for exp_arg in exp_args:
-            exp_arg_name = exp_arg[0]
-            if args and "=" not in args[0]:
-                # Argument given without a name.
-                value = args.pop(0)
-            elif args and args[0].startswith(exp_arg_name + "="):
-                # Argument given with correct name.
-                value = args.pop(0).split("=", 1)[1]
-            else:
-                # No argument given, or argument given with a different name.
-                if len(exp_arg) == 1:
-                    # Required argument (it has no default).
-                    usage_error(cmd, exp_args, f"missing argument {exp_arg_name}")
-                else:
-                    # Optional argument with a default.
-                    value = exp_arg[1]
-            pre.append(f"{exp_arg_name}={value}")
-
-        args[0:0] = exp_sub
-        last_arg_idx = len(exp_sub)
-
-    if last_arg_idx < len(args) and "=" in args[last_arg_idx]:
-        # Extra unknown arguments given.
-        arg = args[last_arg_idx].split("=", 1)[0]
-        usage_error(cmd, exp_args, f"given unexpected argument {arg}")
-        sys.exit(1)
-
-    # Insert expansion with optional setting of arguments.
-    if pre:
-        args[0:0] = ["exec", ";".join(pre)]
-
-
-def do_connect(args):
-    dev = args.pop(0)
-    try:
-        if dev == "list":
-            # List attached devices.
-            for p in sorted(serial.tools.list_ports.comports()):
-                print(
-                    "{} {} {:04x}:{:04x} {} {}".format(
-                        p.device, p.serial_number, p.pid, p.vid, p.manufacturer, p.product
-                    )
-                )
-            return None
-        elif dev == "auto":
-            # Auto-detect and auto-connect to the first available device.
-            for p in sorted(serial.tools.list_ports.comports()):
-                try:
-                    return pyboard.PyboardExtended(p.device, baudrate=115200)
-                except pyboard.PyboardError as er:
-                    if not er.args[0].startswith("failed to access"):
-                        raise er
-            raise pyboard.PyboardError("no device found")
-        elif dev.startswith("id:"):
-            # Search for a device with the given serial number.
-            serial_number = dev[len("id:") :]
-            dev = None
-            for p in serial.tools.list_ports.comports():
-                if p.serial_number == serial_number:
-                    return pyboard.PyboardExtended(p.device, baudrate=115200)
-            raise pyboard.PyboardError("no device with serial number {}".format(serial_number))
-        else:
-            # Connect to the given device.
-            if dev.startswith("port:"):
-                dev = dev[len("port:") :]
-            return pyboard.PyboardExtended(dev, baudrate=115200)
-    except pyboard.PyboardError as er:
-        msg = er.args[0]
-        if msg.startswith("failed to access"):
-            msg += " (it may be in use by another program)"
-        print(msg)
-        sys.exit(1)
-
-
-def do_disconnect(pyb):
-    try:
-        if pyb.mounted:
-            if not pyb.in_raw_repl:
-                pyb.enter_raw_repl(soft_reset=False)
-            pyb.umount_local()
-        if pyb.in_raw_repl:
-            pyb.exit_raw_repl()
-    except OSError:
-        # Ignore any OSError exceptions when shutting down, eg:
-        # - pyboard.filesystem_command will close the connecton if it had an error
-        # - umounting will fail if serial port disappeared
-        pass
-    pyb.close()
-
-
-def do_filesystem(pyb, args):
-    def _list_recursive(files, path):
-        if os.path.isdir(path):
-            for entry in os.listdir(path):
-                _list_recursive(files, os.path.join(path, entry))
-        else:
-            files.append(os.path.split(path))
-
-    if args[0] == "cp" and args[1] == "-r":
-        args.pop(0)
-        args.pop(0)
-        assert args[-1] == ":"
-        args.pop()
-        src_files = []
-        for path in args:
-            _list_recursive(src_files, path)
-        known_dirs = {""}
-        pyb.exec_("import uos")
-        for dir, file in src_files:
-            dir_parts = dir.split("/")
-            for i in range(len(dir_parts)):
-                d = "/".join(dir_parts[: i + 1])
-                if d not in known_dirs:
-                    pyb.exec_("try:\n uos.mkdir('%s')\nexcept OSError as e:\n print(e)" % d)
-                    known_dirs.add(d)
-            pyboard.filesystem_command(pyb, ["cp", os.path.join(dir, file), ":" + dir + "/"])
-    else:
-        pyboard.filesystem_command(pyb, args)
-    args.clear()
-
-
-def do_repl_main_loop(pyb, console_in, console_out_write, *, code_to_inject, file_to_inject):
-    while True:
-        console_in.waitchar(pyb.serial)
-        c = console_in.readchar()
-        if c:
-            if c == b"\x1d":  # ctrl-], quit
-                break
-            elif c == b"\x04":  # ctrl-D
-                # do a soft reset and reload the filesystem hook
-                pyb.soft_reset_with_mount(console_out_write)
-            elif c == b"\x0a" and code_to_inject is not None:  # ctrl-j, inject code
-                pyb.serial.write(code_to_inject)
-            elif c == b"\x0b" and file_to_inject is not None:  # ctrl-k, inject script
-                console_out_write(bytes("Injecting %s\r\n" % file_to_inject, "utf8"))
-                pyb.enter_raw_repl(soft_reset=False)
-                with open(file_to_inject, "rb") as f:
-                    pyfile = f.read()
-                try:
-                    pyb.exec_raw_no_follow(pyfile)
-                except pyboard.PyboardError as er:
-                    console_out_write(b"Error:\r\n")
-                    console_out_write(er)
-                pyb.exit_raw_repl()
-            else:
-                pyb.serial.write(c)
-
-        try:
-            n = pyb.serial.inWaiting()
-        except OSError as er:
-            if er.args[0] == 5:  # IO error, device disappeared
-                print("device disconnected")
-                break
-
-        if n > 0:
-            c = pyb.serial.read(1)
-            if c is not None:
-                # pass character through to the console
-                oc = ord(c)
-                if oc in (8, 9, 10, 13, 27) or 32 <= oc <= 126:
-                    console_out_write(c)
-                else:
-                    console_out_write(b"[%02x]" % ord(c))
-
-
-def do_repl(pyb, args):
-    capture_file = None
-    code_to_inject = None
-    file_to_inject = None
-
-    while len(args):
-        if args[0] == "--capture":
-            args.pop(0)
-            capture_file = args.pop(0)
-        elif args[0] == "--inject-code":
-            args.pop(0)
-            code_to_inject = bytes(args.pop(0).replace("\\n", "\r\n"), "utf8")
-        elif args[0] == "--inject-file":
-            args.pop(0)
-            file_to_inject = args.pop(0)
-        else:
-            break
-
-    print("Connected to MicroPython at %s" % pyb.device_name)
-    print("Use Ctrl-] to exit this shell")
-    if capture_file is not None:
-        print('Capturing session to file "%s"' % capture_file)
-        capture_file = open(capture_file, "wb")
-    if code_to_inject is not None:
-        print("Use Ctrl-J to inject", code_to_inject)
-    if file_to_inject is not None:
-        print('Use Ctrl-K to inject file "%s"' % file_to_inject)
-
-    console = Console()
-    console.enter()
-
-    def console_out_write(b):
-        console.write(b)
-        if capture_file is not None:
-            capture_file.write(b)
-            capture_file.flush()
-
-    try:
-        do_repl_main_loop(
-            pyb,
-            console,
-            console_out_write,
-            code_to_inject=code_to_inject,
-            file_to_inject=file_to_inject,
-        )
-    finally:
-        console.exit()
-        if capture_file is not None:
-            capture_file.close()
-
-
-def execbuffer(pyb, buf, follow):
-    ret_val = 0
-    try:
-        pyb.exec_raw_no_follow(buf)
-        if follow:
-            ret, ret_err = pyb.follow(timeout=None, data_consumer=pyboard.stdout_write_bytes)
-            if ret_err:
-                pyboard.stdout_write_bytes(ret_err)
-                ret_val = 1
-    except pyboard.PyboardError as er:
-        print(er)
-        ret_val = 1
-    except KeyboardInterrupt:
-        ret_val = 1
-    return ret_val
-
-
-def main():
-    config = load_user_config()
-    prepare_command_expansions(config)
-
-    args = sys.argv[1:]
-    pyb = None
-    did_action = False
-
-    try:
-        while args:
-            do_command_expansion(args)
-
-            cmds = {
-                "connect": (False, False, 1),
-                "disconnect": (False, False, 0),
-                "mount": (True, False, 1),
-                "repl": (False, True, 0),
-                "eval": (True, True, 1),
-                "exec": (True, True, 1),
-                "run": (True, True, 1),
-                "fs": (True, True, 1),
-            }
-            cmd = args.pop(0)
-            try:
-                need_raw_repl, is_action, num_args_min = cmds[cmd]
-            except KeyError:
-                print(f"{_PROG}: '{cmd}' is not a command")
-                return 1
-
-            if len(args) < num_args_min:
-                print(f"{_PROG}: '{cmd}' neads at least {num_args_min} argument(s)")
-                return 1
-
-            if cmd == "connect":
-                if pyb is not None:
-                    do_disconnect(pyb)
-                pyb = do_connect(args)
-                if pyb is None:
-                    did_action = True
-                continue
-
-            if pyb is None:
-                pyb = do_connect(["auto"])
-
-            if need_raw_repl:
-                if not pyb.in_raw_repl:
-                    pyb.enter_raw_repl()
-            else:
-                if pyb.in_raw_repl:
-                    pyb.exit_raw_repl()
-            if is_action:
-                did_action = True
-
-            if cmd == "disconnect":
-                do_disconnect(pyb)
-                pyb = None
-            elif cmd == "mount":
-                path = args.pop(0)
-                pyb.mount_local(path)
-                print(f"Local directory {path} is mounted at /remote")
-            elif cmd in ("exec", "eval", "run"):
-                follow = True
-                if args[0] == "--no-follow":
-                    args.pop(0)
-                    follow = False
-                if cmd == "exec":
-                    buf = args.pop(0)
-                elif cmd == "eval":
-                    buf = "print(" + args.pop(0) + ")"
-                else:
-                    filename = args.pop(0)
-                    try:
-                        with open(filename, "rb") as f:
-                            buf = f.read()
-                    except OSError:
-                        print(f"{_PROG}: could not read file '{filename}'")
-                        return 1
-                ret = execbuffer(pyb, buf, follow)
-                if ret:
-                    return ret
-            elif cmd == "fs":
-                do_filesystem(pyb, args)
-            elif cmd == "repl":
-                do_repl(pyb, args)
-
-        if not did_action:
-            if pyb is None:
-                pyb = do_connect(["auto"])
-            if pyb.in_raw_repl:
-                pyb.exit_raw_repl()
-            do_repl(pyb, args)
-    finally:
-        if pyb is not None:
-            do_disconnect(pyb)
diff --git a/tools/mpremote/mpremote/pyboardextended.py b/tools/mpremote/mpremote/pyboardextended.py
deleted file mode 100644
index e3f259b395..0000000000
--- a/tools/mpremote/mpremote/pyboardextended.py
+++ /dev/null
@@ -1,621 +0,0 @@
-import os, re, serial, struct, time
-from errno import EPERM
-from .console import VT_ENABLED
-
-try:
-    from .pyboard import Pyboard, PyboardError, stdout_write_bytes, filesystem_command
-except ImportError:
-    import sys
-
-    sys.path.append(os.path.dirname(__file__) + "/../..")
-    from pyboard import Pyboard, PyboardError, stdout_write_bytes, filesystem_command
-
-fs_hook_cmds = {
-    "CMD_STAT": 1,
-    "CMD_ILISTDIR_START": 2,
-    "CMD_ILISTDIR_NEXT": 3,
-    "CMD_OPEN": 4,
-    "CMD_CLOSE": 5,
-    "CMD_READ": 6,
-    "CMD_WRITE": 7,
-    "CMD_SEEK": 8,
-    "CMD_REMOVE": 9,
-    "CMD_RENAME": 10,
-}
-
-fs_hook_code = """\
-import uos, uio, ustruct, micropython, usys
-
-
-class RemoteCommand:
-    def __init__(self, use_second_port):
-        self.buf4 = bytearray(4)
-        try:
-            import pyb
-            self.fout = pyb.USB_VCP()
-            if use_second_port:
-                self.fin = pyb.USB_VCP(1)
-            else:
-                self.fin = pyb.USB_VCP()
-        except:
-            import usys
-            self.fout = usys.stdout.buffer
-            self.fin = usys.stdin.buffer
-        import select
-        self.poller = select.poll()
-        self.poller.register(self.fin, select.POLLIN)
-
-    def poll_in(self):
-        for _ in self.poller.ipoll(1000):
-            return
-        self.end()
-        raise Exception('timeout waiting for remote')
-
-    def rd(self, n):
-        buf = bytearray(n)
-        self.rd_into(buf, n)
-        return buf
-
-    def rd_into(self, buf, n):
-        # implement reading with a timeout in case other side disappears
-        if n == 0:
-            return
-        self.poll_in()
-        r = self.fin.readinto(buf, n)
-        if r < n:
-            mv = memoryview(buf)
-            while r < n:
-                self.poll_in()
-                r += self.fin.readinto(mv[r:], n - r)
-
-    def begin(self, type):
-        micropython.kbd_intr(-1)
-        buf4 = self.buf4
-        buf4[0] = 0x18
-        buf4[1] = type
-        self.fout.write(buf4, 2)
-        # Wait for sync byte 0x18, but don't get stuck forever
-        for i in range(30):
-            self.poller.poll(1000)
-            self.fin.readinto(buf4, 1)
-            if buf4[0] == 0x18:
-                break
-
-    def end(self):
-        micropython.kbd_intr(3)
-
-    def rd_s8(self):
-        self.rd_into(self.buf4, 1)
-        n = self.buf4[0]
-        if n & 0x80:
-            n -= 0x100
-        return n
-
-    def rd_s32(self):
-        buf4 = self.buf4
-        self.rd_into(buf4, 4)
-        n = buf4[0] | buf4[1] << 8 | buf4[2] << 16 | buf4[3] << 24
-        if buf4[3] & 0x80:
-            n -= 0x100000000
-        return n
-
-    def rd_u32(self):
-        buf4 = self.buf4
-        self.rd_into(buf4, 4)
-        return buf4[0] | buf4[1] << 8 | buf4[2] << 16 | buf4[3] << 24
-
-    def rd_bytes(self, buf):
-        # TODO if n is large (eg >256) then we may miss bytes on stdin
-        n = self.rd_s32()
-        if buf is None:
-            ret = buf = bytearray(n)
-        else:
-            ret = n
-        self.rd_into(buf, n)
-        return ret
-
-    def rd_str(self):
-        n = self.rd_s32()
-        if n == 0:
-            return ''
-        else:
-            return str(self.rd(n), 'utf8')
-
-    def wr_s8(self, i):
-        self.buf4[0] = i
-        self.fout.write(self.buf4, 1)
-
-    def wr_s32(self, i):
-        ustruct.pack_into('<i', self.buf4, 0, i)
-        self.fout.write(self.buf4)
-
-    def wr_bytes(self, b):
-        self.wr_s32(len(b))
-        self.fout.write(b)
-
-    # str and bytes act the same in MicroPython
-    wr_str = wr_bytes
-
-
-class RemoteFile(uio.IOBase):
-    def __init__(self, cmd, fd, is_text):
-        self.cmd = cmd
-        self.fd = fd
-        self.is_text = is_text
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, a, b, c):
-        self.close()
-
-    def ioctl(self, request, arg):
-        if request == 4:  # CLOSE
-            self.close()
-        return 0
-
-    def flush(self):
-        pass
-
-    def close(self):
-        if self.fd is None:
-            return
-        c = self.cmd
-        c.begin(CMD_CLOSE)
-        c.wr_s8(self.fd)
-        c.end()
-        self.fd = None
-
-    def read(self, n=-1):
-        c = self.cmd
-        c.begin(CMD_READ)
-        c.wr_s8(self.fd)
-        c.wr_s32(n)
-        data = c.rd_bytes(None)
-        c.end()
-        if self.is_text:
-            data = str(data, 'utf8')
-        else:
-            data = bytes(data)
-        return data
-
-    def readinto(self, buf):
-        c = self.cmd
-        c.begin(CMD_READ)
-        c.wr_s8(self.fd)
-        c.wr_s32(len(buf))
-        n = c.rd_bytes(buf)
-        c.end()
-        return n
-
-    def readline(self):
-        l = ''
-        while 1:
-            c = self.read(1)
-            l += c
-            if c == '\\n' or c == '':
-                return l
-
-    def readlines(self):
-        ls = []
-        while 1:
-            l = self.readline()
-            if not l:
-                return ls
-            ls.append(l)
-
-    def write(self, buf):
-        c = self.cmd
-        c.begin(CMD_WRITE)
-        c.wr_s8(self.fd)
-        c.wr_bytes(buf)
-        n = c.rd_s32()
-        c.end()
-        return n
-
-    def seek(self, n):
-        c = self.cmd
-        c.begin(CMD_SEEK)
-        c.wr_s8(self.fd)
-        c.wr_s32(n)
-        n = c.rd_s32()
-        c.end()
-        return n
-
-
-class RemoteFS:
-    def __init__(self, cmd):
-        self.cmd = cmd
-
-    def mount(self, readonly, mkfs):
-        pass
-
-    def umount(self):
-        pass
-
-    def chdir(self, path):
-        if not path.startswith("/"):
-            path = self.path + path
-        if not path.endswith("/"):
-            path += "/"
-        if path != "/":
-            self.stat(path)
-        self.path = path
-
-    def getcwd(self):
-        return self.path
-
-    def remove(self, path):
-        c = self.cmd
-        c.begin(CMD_REMOVE)
-        c.wr_str(self.path + path)
-        res = c.rd_s32()
-        c.end()
-        if res < 0:
-            raise OSError(-res)
-
-    def rename(self, old, new):
-        c = self.cmd
-        c.begin(CMD_RENAME)
-        c.wr_str(self.path + old)
-        c.wr_str(self.path + new)
-        res = c.rd_s32()
-        c.end()
-        if res < 0:
-            raise OSError(-res)
-
-    def stat(self, path):
-        c = self.cmd
-        c.begin(CMD_STAT)
-        c.wr_str(self.path + path)
-        res = c.rd_s8()
-        if res < 0:
-            c.end()
-            raise OSError(-res)
-        mode = c.rd_u32()
-        size = c.rd_u32()
-        atime = c.rd_u32()
-        mtime = c.rd_u32()
-        ctime = c.rd_u32()
-        c.end()
-        return mode, 0, 0, 0, 0, 0, size, atime, mtime, ctime
-
-    def ilistdir(self, path):
-        c = self.cmd
-        c.begin(CMD_ILISTDIR_START)
-        c.wr_str(self.path + path)
-        res = c.rd_s8()
-        c.end()
-        if res < 0:
-            raise OSError(-res)
-        def next():
-            while True:
-                c.begin(CMD_ILISTDIR_NEXT)
-                name = c.rd_str()
-                if name:
-                    type = c.rd_u32()
-                    c.end()
-                    yield (name, type, 0)
-                else:
-                    c.end()
-                    break
-        return next()
-
-    def open(self, path, mode):
-        c = self.cmd
-        c.begin(CMD_OPEN)
-        c.wr_str(self.path + path)
-        c.wr_str(mode)
-        fd = c.rd_s8()
-        c.end()
-        if fd < 0:
-            raise OSError(-fd)
-        return RemoteFile(c, fd, mode.find('b') == -1)
-
-
-def __mount(use_second_port):
-    uos.mount(RemoteFS(RemoteCommand(use_second_port)), '/remote')
-    uos.chdir('/remote')
-"""
-
-# Apply basic compression on hook code.
-for key, value in fs_hook_cmds.items():
-    fs_hook_code = re.sub(key, str(value), fs_hook_code)
-fs_hook_code = re.sub(" *#.*$", "", fs_hook_code, flags=re.MULTILINE)
-fs_hook_code = re.sub("\n\n+", "\n", fs_hook_code)
-fs_hook_code = re.sub("    ", " ", fs_hook_code)
-fs_hook_code = re.sub("rd_", "r", fs_hook_code)
-fs_hook_code = re.sub("wr_", "w", fs_hook_code)
-fs_hook_code = re.sub("buf4", "b4", fs_hook_code)
-
-
-class PyboardCommand:
-    def __init__(self, fin, fout, path):
-        self.fin = fin
-        self.fout = fout
-        self.root = path + "/"
-        self.data_ilistdir = ["", []]
-        self.data_files = []
-
-    def rd_s8(self):
-        return struct.unpack("<b", self.fin.read(1))[0]
-
-    def rd_s32(self):
-        return struct.unpack("<i", self.fin.read(4))[0]
-
-    def rd_bytes(self):
-        n = self.rd_s32()
-        return self.fin.read(n)
-
-    def rd_str(self):
-        n = self.rd_s32()
-        if n == 0:
-            return ""
-        else:
-            return str(self.fin.read(n), "utf8")
-
-    def wr_s8(self, i):
-        self.fout.write(struct.pack("<b", i))
-
-    def wr_s32(self, i):
-        self.fout.write(struct.pack("<i", i))
-
-    def wr_u32(self, i):
-        self.fout.write(struct.pack("<I", i))
-
-    def wr_bytes(self, b):
-        self.wr_s32(len(b))
-        self.fout.write(b)
-
-    def wr_str(self, s):
-        b = bytes(s, "utf8")
-        self.wr_s32(len(b))
-        self.fout.write(b)
-
-    def log_cmd(self, msg):
-        print(f"[{msg}]", end="\r\n")
-
-    def path_check(self, path):
-        parent = os.path.realpath(self.root)
-        child = os.path.realpath(path)
-        if parent != os.path.commonpath([parent, child]):
-            raise OSError(EPERM, "")  # File is outside mounted dir
-
-    def do_stat(self):
-        path = self.root + self.rd_str()
-        # self.log_cmd(f"stat {path}")
-        try:
-            self.path_check(path)
-            stat = os.stat(path)
-        except OSError as er:
-            self.wr_s8(-abs(er.errno))
-        else:
-            self.wr_s8(0)
-            # Note: st_ino would need to be 64-bit if added here
-            self.wr_u32(stat.st_mode)
-            self.wr_u32(stat.st_size)
-            self.wr_u32(int(stat.st_atime))
-            self.wr_u32(int(stat.st_mtime))
-            self.wr_u32(int(stat.st_ctime))
-
-    def do_ilistdir_start(self):
-        path = self.root + self.rd_str()
-        try:
-            self.path_check(path)
-            self.wr_s8(0)
-        except OSError as er:
-            self.wr_s8(-abs(er.errno))
-        else:
-            self.data_ilistdir[0] = path
-            self.data_ilistdir[1] = os.listdir(path)
-
-    def do_ilistdir_next(self):
-        if self.data_ilistdir[1]:
-            entry = self.data_ilistdir[1].pop(0)
-            try:
-                stat = os.lstat(self.data_ilistdir[0] + "/" + entry)
-                mode = stat.st_mode & 0xC000
-            except OSError as er:
-                mode = 0
-            self.wr_str(entry)
-            self.wr_u32(mode)
-        else:
-            self.wr_str("")
-
-    def do_open(self):
-        path = self.root + self.rd_str()
-        mode = self.rd_str()
-        # self.log_cmd(f"open {path} {mode}")
-        try:
-            self.path_check(path)
-            f = open(path, mode)
-        except OSError as er:
-            self.wr_s8(-abs(er.errno))
-        else:
-            is_text = mode.find("b") == -1
-            try:
-                fd = self.data_files.index(None)
-                self.data_files[fd] = (f, is_text)
-            except ValueError:
-                fd = len(self.data_files)
-                self.data_files.append((f, is_text))
-            self.wr_s8(fd)
-
-    def do_close(self):
-        fd = self.rd_s8()
-        # self.log_cmd(f"close {fd}")
-        self.data_files[fd][0].close()
-        self.data_files[fd] = None
-
-    def do_read(self):
-        fd = self.rd_s8()
-        n = self.rd_s32()
-        buf = self.data_files[fd][0].read(n)
-        if self.data_files[fd][1]:
-            buf = bytes(buf, "utf8")
-        self.wr_bytes(buf)
-        # self.log_cmd(f"read {fd} {n} -> {len(buf)}")
-
-    def do_seek(self):
-        fd = self.rd_s8()
-        n = self.rd_s32()
-        # self.log_cmd(f"seek {fd} {n}")
-        self.data_files[fd][0].seek(n)
-        self.wr_s32(n)
-
-    def do_write(self):
-        fd = self.rd_s8()
-        buf = self.rd_bytes()
-        if self.data_files[fd][1]:
-            buf = str(buf, "utf8")
-        n = self.data_files[fd][0].write(buf)
-        self.wr_s32(n)
-        # self.log_cmd(f"write {fd} {len(buf)} -> {n}")
-
-    def do_remove(self):
-        path = self.root + self.rd_str()
-        # self.log_cmd(f"remove {path}")
-        try:
-            self.path_check(path)
-            os.remove(path)
-            ret = 0
-        except OSError as er:
-            ret = -abs(er.errno)
-        self.wr_s32(ret)
-
-    def do_rename(self):
-        old = self.root + self.rd_str()
-        new = self.root + self.rd_str()
-        # self.log_cmd(f"rename {old} {new}")
-        try:
-            self.path_check(old)
-            self.path_check(new)
-            os.rename(old, new)
-            ret = 0
-        except OSError as er:
-            ret = -abs(er.errno)
-        self.wr_s32(ret)
-
-    cmd_table = {
-        fs_hook_cmds["CMD_STAT"]: do_stat,
-        fs_hook_cmds["CMD_ILISTDIR_START"]: do_ilistdir_start,
-        fs_hook_cmds["CMD_ILISTDIR_NEXT"]: do_ilistdir_next,
-        fs_hook_cmds["CMD_OPEN"]: do_open,
-        fs_hook_cmds["CMD_CLOSE"]: do_close,
-        fs_hook_cmds["CMD_READ"]: do_read,
-        fs_hook_cmds["CMD_WRITE"]: do_write,
-        fs_hook_cmds["CMD_SEEK"]: do_seek,
-        fs_hook_cmds["CMD_REMOVE"]: do_remove,
-        fs_hook_cmds["CMD_RENAME"]: do_rename,
-    }
-
-
-class SerialIntercept:
-    def __init__(self, serial, cmd):
-        self.orig_serial = serial
-        self.cmd = cmd
-        self.buf = b""
-        self.orig_serial.timeout = 5.0
-
-    def _check_input(self, blocking):
-        if blocking or self.orig_serial.inWaiting() > 0:
-            c = self.orig_serial.read(1)
-            if c == b"\x18":
-                # a special command
-                c = self.orig_serial.read(1)[0]
-                self.orig_serial.write(b"\x18")  # Acknowledge command
-                PyboardCommand.cmd_table[c](self.cmd)
-            elif not VT_ENABLED and c == b"\x1b":
-                # ESC code, ignore these on windows
-                esctype = self.orig_serial.read(1)
-                if esctype == b"[":  # CSI
-                    while not (0x40 < self.orig_serial.read(1)[0] < 0x7E):
-                        # Looking for "final byte" of escape sequence
-                        pass
-            else:
-                self.buf += c
-
-    @property
-    def fd(self):
-        return self.orig_serial.fd
-
-    def close(self):
-        self.orig_serial.close()
-
-    def inWaiting(self):
-        self._check_input(False)
-        return len(self.buf)
-
-    def read(self, n):
-        while len(self.buf) < n:
-            self._check_input(True)
-        out = self.buf[:n]
-        self.buf = self.buf[n:]
-        return out
-
-    def write(self, buf):
-        self.orig_serial.write(buf)
-
-
-class PyboardExtended(Pyboard):
-    def __init__(self, dev, *args, **kwargs):
-        super().__init__(dev, *args, **kwargs)
-        self.device_name = dev
-        self.mounted = False
-
-    def mount_local(self, path, dev_out=None):
-        fout = self.serial
-        if dev_out is not None:
-            try:
-                fout = serial.Serial(dev_out)
-            except serial.SerialException:
-                port = list(serial.tools.list_ports.grep(dev_out))
-                if not port:
-                    raise
-                for p in port:
-                    try:
-                        fout = serial.Serial(p.device)
-                        break
-                    except serial.SerialException:
-                        pass
-        self.mounted = True
-        if self.eval('"RemoteFS" in globals()') == b"False":
-            self.exec_(fs_hook_code)
-        self.exec_("__mount(%s)" % (dev_out is not None))
-        self.cmd = PyboardCommand(self.serial, fout, path)
-        self.serial = SerialIntercept(self.serial, self.cmd)
-        self.dev_out = dev_out
-
-    def soft_reset_with_mount(self, out_callback):
-        self.serial.write(b"\x04")
-        if not self.mounted:
-            return
-
-        # Wait for a response to the soft-reset command.
-        for i in range(10):
-            if self.serial.inWaiting():
-                break
-            time.sleep(0.05)
-        else:
-            # Device didn't respond so it wasn't in a state to do a soft reset.
-            return
-
-        out_callback(self.serial.read(1))
-        self.serial = self.serial.orig_serial
-        n = self.serial.inWaiting()
-        while n > 0:
-            buf = self.serial.read(n)
-            out_callback(buf)
-            time.sleep(0.1)
-            n = self.serial.inWaiting()
-        self.serial.write(b"\x01")
-        self.exec_(fs_hook_code)
-        self.exec_("__mount(%s)" % (self.dev_out is not None))
-        self.exit_raw_repl()
-        self.read_until(4, b">>> ")
-        self.serial = SerialIntercept(self.serial, self.cmd)
-
-    def umount_local(self):
-        if self.mounted:
-            self.exec_('uos.umount("/remote")')
-            self.mounted = False
diff --git a/tools/mpremote/pyproject.toml b/tools/mpremote/pyproject.toml
deleted file mode 100644
index 374b58cbf4..0000000000
--- a/tools/mpremote/pyproject.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[build-system]
-requires = [
-    "setuptools>=42",
-    "wheel"
-]
-build-backend = "setuptools.build_meta"
diff --git a/tools/mpremote/setup.cfg b/tools/mpremote/setup.cfg
deleted file mode 100644
index 4e78d05a94..0000000000
--- a/tools/mpremote/setup.cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-[metadata]
-name = mpremote
-version = 0.0.5
-author = Damien George
-author_email = damien@micropython.org
-description = Tool for interacting remotely with MicroPython
-long_description = file: README.md
-long_description_content_type = text/markdown
-url = https://github.com/micropython/micropython
-project_urls =
-    Bug Tracker = https://github.com/micropython/micropython/issues
-classifiers =
-    Programming Language :: Python :: 3
-    License :: OSI Approved :: MIT License
-    Operating System :: OS Independent
-
-[options]
-packages = mpremote
-python_requires = >= 3.4
-install_requires =
-    pyserial >= 3.3
-
-[options.entry_points]
-console_scripts =
-  mpremote = mpremote.main:main

From b1785eb3f173889c4efc58418915873e8ec47257 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Mon, 21 Jun 2021 19:52:08 -0500
Subject: [PATCH 287/349] finish copyright-notice suggestion

---
 tools/pyboard.py | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index e281f9be86..3fca47b0b7 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -1,36 +1,11 @@
 #!/usr/bin/env python3
-#
+
 # SPDX-FileCopyrightText: Copyright (c) 2014-2021 Damien P. George
 # SPDX-FileCopyrightText: Copyright (c) 2017 Paul Sokolovsky
 # SPDX-FileCopyrightText: 2014 MicroPython & CircuitPython contributors (https://github.com/adafruit/circuitpython/graphs/contributors)
+#
 # SPDX-License-Identifier: MIT
 
-#
-# This file is part of the MicroPython project, http://micropython.org/
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2014-2021 Damien P. George
-# Copyright (c) 2017 Paul Sokolovsky
-#
-# 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.
-
 """
 pyboard interface
 

From 4fd946682d614168c25697f08bd51a78298bf236 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 22 Jun 2021 14:00:58 -0500
Subject: [PATCH 288/349] another file to remove

---
 ports/qemu-arm/imx6.ld | 47 ------------------------------------------
 1 file changed, 47 deletions(-)
 delete mode 100644 ports/qemu-arm/imx6.ld

diff --git a/ports/qemu-arm/imx6.ld b/ports/qemu-arm/imx6.ld
deleted file mode 100644
index 7155956f15..0000000000
--- a/ports/qemu-arm/imx6.ld
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Vector table is at 0x00000000, entry point is 0x10000000. */
-
-MEMORY
-{
-    ROM : ORIGIN = 0x00000000, LENGTH = 96K
-    RAM : ORIGIN = 0x10000000, LENGTH = 128M
-}
-
-_estack = ORIGIN(RAM) + LENGTH(RAM);
-
-SECTIONS
-{
-    .rom : {
-        . = ALIGN(4);
-        KEEP(*(.isr_vector))
-        . = ALIGN(4);
-    } > ROM
-
-    .text : {
-        . = ALIGN(4);
-        *(.text.Reset_Handler)
-        *(.text*)
-        *(.rodata*)
-        . = ALIGN(4);
-        _etext = .;
-        _sidata = _etext;
-    } > RAM
-
-    .data : AT ( _sidata )
-    {
-        . = ALIGN(4);
-        _sdata = .;
-        *(.data*)
-        . = ALIGN(4);
-        _edata = .;
-    } > RAM
-
-    .bss :
-    {
-        . = ALIGN(4);
-        _sbss = .;
-        *(.bss*)
-        *(COMMON)
-        . = ALIGN(4);
-        _ebss = .;
-    } > RAM
-}

From acf90fbb43f399970c66a34d2a0258b56bb306ef Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Wed, 23 Jun 2021 09:18:40 -0400
Subject: [PATCH 289/349] many renamings; add overflowed flag to EventQuque

---
 shared-bindings/keypad/Event.c             |  49 ++++----
 shared-bindings/keypad/Event.h             |   5 +-
 shared-bindings/keypad/EventQueue.c        |  53 ++++++--
 shared-bindings/keypad/EventQueue.h        |   7 +-
 shared-bindings/keypad/KeyMatrix.c         | 135 +++++++++++++--------
 shared-bindings/keypad/KeyMatrix.h         |  15 +--
 shared-bindings/keypad/Keys.c              |  46 ++++---
 shared-bindings/keypad/Keys.h              |   6 +-
 shared-bindings/keypad/ShiftRegisterKeys.c |  60 +++++----
 shared-bindings/keypad/ShiftRegisterKeys.h |   8 +-
 shared-module/keypad/Event.c               |   8 +-
 shared-module/keypad/Event.h               |   2 +-
 shared-module/keypad/EventQueue.c          |  40 +++---
 shared-module/keypad/EventQueue.h          |   3 +-
 shared-module/keypad/KeyMatrix.c           |  81 +++++++------
 shared-module/keypad/KeyMatrix.h           |   2 +-
 shared-module/keypad/Keys.c                |  32 +++--
 shared-module/keypad/ShiftRegisterKeys.c   |  38 +++---
 shared-module/keypad/ShiftRegisterKeys.h   |   2 +-
 19 files changed, 346 insertions(+), 246 deletions(-)

diff --git a/shared-bindings/keypad/Event.c b/shared-bindings/keypad/Event.c
index ff1323eac0..11cd0c120c 100644
--- a/shared-bindings/keypad/Event.c
+++ b/shared-bindings/keypad/Event.c
@@ -32,44 +32,44 @@
 
 //| class Event:
 //|     """A key transition event."""
-//|     def __init__(self, key_num: int=0, pressed: bool=True) -> None:
+//|     def __init__(self, key_number: int=0, pressed: bool=True) -> None:
 //|         """Create a key transition event, which reports a key-pressed or key-released transition.
 //|
-//|         :param int key_num: the key number
+//|         :param int key_number: the key number
 //|         :param bool pressed: ``True`` if the key was pressed; ``False`` if it was released.
 //|         """
 //|         ...
 //|
-
 STATIC mp_obj_t keypad_event_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     keypad_event_obj_t *self = m_new_obj(keypad_event_obj_t);
     self->base.type = &keypad_event_type;
-    enum { ARG_key_num, ARG_pressed };
+    enum { ARG_key_number, ARG_pressed };
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_key_num, MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_key_number, MP_ARG_INT, {.u_int = 0} },
         { MP_QSTR_pressed, MP_ARG_BOOL, {.u_bool = true} },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const mp_uint_t key_num = (mp_uint_t)mp_arg_validate_int_min(args[ARG_key_num].u_int, 0, MP_QSTR_key_num);
+    const mp_uint_t key_number =
+        (mp_uint_t)mp_arg_validate_int_min(args[ARG_key_number].u_int, 0, MP_QSTR_key_number);
 
-    common_hal_keypad_event_construct(self, key_num, args[ARG_pressed].u_bool);
+    common_hal_keypad_event_construct(self, key_number, args[ARG_pressed].u_bool);
     return MP_OBJ_FROM_PTR(self);
 }
 
-//|     key_num: int
+//|     key_number: int
 //|     """The key number."""
 //|
-STATIC mp_obj_t keypad_event_get_key_num(mp_obj_t self_in) {
+STATIC mp_obj_t keypad_event_get_key_number(mp_obj_t self_in) {
     keypad_event_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return MP_OBJ_NEW_SMALL_INT(common_hal_keypad_event_get_key_num(self));
+    return MP_OBJ_NEW_SMALL_INT(common_hal_keypad_event_get_key_number(self));
 }
-MP_DEFINE_CONST_FUN_OBJ_1(keypad_event_get_key_num_obj, keypad_event_get_key_num);
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_event_get_key_number_obj, keypad_event_get_key_number);
 
-const mp_obj_property_t keypad_event_key_num_obj = {
+const mp_obj_property_t keypad_event_key_number_obj = {
     .base.type = &mp_type_property,
-    .proxy = {(mp_obj_t)&keypad_event_get_key_num_obj,
+    .proxy = {(mp_obj_t)&keypad_event_get_key_number_obj,
               MP_ROM_NONE,
               MP_ROM_NONE},
 };
@@ -111,7 +111,7 @@ const mp_obj_property_t keypad_event_released_obj = {
 };
 
 //|     def __eq__(self, other: object) -> bool:
-//|         """Two `Event` objects are equal if their `key_num`
+//|         """Two `Event` objects are equal if their `key_number`
 //|         and `pressed`/`released` values are equal.
 //|         """
 //|         ...
@@ -123,10 +123,11 @@ STATIC mp_obj_t keypad_event_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_ob
                 keypad_event_obj_t *lhs = MP_OBJ_TO_PTR(lhs_in);
                 keypad_event_obj_t *rhs = MP_OBJ_TO_PTR(rhs_in);
                 return mp_obj_new_bool(
-                    (common_hal_keypad_event_get_key_num(lhs) ==
-                        common_hal_keypad_event_get_key_num(rhs)) &&
+                    (common_hal_keypad_event_get_key_number(lhs) ==
+                        common_hal_keypad_event_get_key_number(rhs)) &&
                     (common_hal_keypad_event_get_pressed(lhs) ==
-                        common_hal_keypad_event_get_pressed(rhs)));
+                        common_hal_keypad_event_get_pressed(rhs))
+                    );
             } else {
                 return mp_const_false;
             }
@@ -144,9 +145,9 @@ STATIC mp_obj_t keypad_event_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     keypad_event_obj_t *self = MP_OBJ_TO_PTR(self);
     switch (op) {
         case MP_UNARY_OP_HASH: {
-            const mp_int_t key_num = common_hal_keypad_event_get_key_num(self);
+            const mp_int_t key_number = common_hal_keypad_event_get_key_number(self);
             const bool pressed = common_hal_keypad_event_get_pressed(self);
-            return MP_OBJ_NEW_SMALL_INT((pressed << 15) + key_num);
+            return MP_OBJ_NEW_SMALL_INT((pressed << 15) + key_number);
         }
         default:
             return MP_OBJ_NULL; // op not supported
@@ -155,16 +156,16 @@ STATIC mp_obj_t keypad_event_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 
 STATIC void keypad_event_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     keypad_event_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "<Event: keynum %d %s>",
-        common_hal_keypad_event_get_key_num(self),
+    mp_printf(print, "<Event: key_number %d %s>",
+        common_hal_keypad_event_get_key_number(self),
         common_hal_keypad_event_get_pressed(self) ? "pressed" : "released");
 }
 
 STATIC const mp_rom_map_elem_t keypad_event_locals_dict_table[] = {
     // Properties
-    { MP_ROM_QSTR(MP_QSTR_key_num),  MP_ROM_PTR(&keypad_event_key_num_obj) },
-    { MP_ROM_QSTR(MP_QSTR_pressed),  MP_ROM_PTR(&keypad_event_pressed_obj) },
-    { MP_ROM_QSTR(MP_QSTR_released), MP_ROM_PTR(&keypad_event_released_obj) },
+    { MP_ROM_QSTR(MP_QSTR_key_number), MP_ROM_PTR(&keypad_event_key_number_obj) },
+    { MP_ROM_QSTR(MP_QSTR_pressed),    MP_ROM_PTR(&keypad_event_pressed_obj) },
+    { MP_ROM_QSTR(MP_QSTR_released),   MP_ROM_PTR(&keypad_event_released_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(keypad_event_locals_dict, keypad_event_locals_dict_table);
 
diff --git a/shared-bindings/keypad/Event.h b/shared-bindings/keypad/Event.h
index 23017f1dc5..35cfdcdc64 100644
--- a/shared-bindings/keypad/Event.h
+++ b/shared-bindings/keypad/Event.h
@@ -32,10 +32,9 @@
 
 extern const mp_obj_type_t keypad_event_type;
 
-void common_hal_keypad_event_construct(keypad_event_obj_t *self, mp_uint_t key_num, bool pressed);
-mp_int_t common_hal_keypad_event_get_key_num(keypad_event_obj_t *self);
+void common_hal_keypad_event_construct(keypad_event_obj_t *self, mp_uint_t key_number, bool pressed);
+mp_int_t common_hal_keypad_event_get_key_number(keypad_event_obj_t *self);
 bool common_hal_keypad_event_get_pressed(keypad_event_obj_t *self);
 bool common_hal_keypad_event_get_released(keypad_event_obj_t *self);
 
-
 #endif // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_EVENT__H
diff --git a/shared-bindings/keypad/EventQueue.c b/shared-bindings/keypad/EventQueue.c
index ae544a6665..72bbd06452 100644
--- a/shared-bindings/keypad/EventQueue.c
+++ b/shared-bindings/keypad/EventQueue.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include "py/objproperty.h"
 #include "py/runtime.h"
 #include "shared-bindings/keypad/Event.h"
 #include "shared-bindings/keypad/EventQueue.h"
@@ -36,50 +37,50 @@
 //|     """
 //|     ...
 
-//|     def next(self) -> Optional[Event]:
+//|     def get(self) -> Optional[Event]:
 //|         """Return the next key transition event. Return ``None`` if no events are pending.
 //|
 //|         Note that the queue size is limited; see ``max_events`` in the constructor of
 //|         a scanner such as `Keys` or `KeyMatrix`.
-//|         If a new event arrives when the queue is full, the oldest event is discarded.
+//|         If a new event arrives when the queue is full, the queue is cleared, and
+//|         `overflowed` is set to ``True``.
 //|
 //|         :return: the next queued key transition `Event`
 //|         :rtype: Optional[Event]
 //|         """
 //|         ...
 //|
-STATIC mp_obj_t keypad_eventqueue_next(mp_obj_t self_in) {
+STATIC mp_obj_t keypad_eventqueue_get(mp_obj_t self_in) {
     keypad_eventqueue_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
-    return common_hal_keypad_eventqueue_next(self);
+    return common_hal_keypad_eventqueue_get(self);
 }
-MP_DEFINE_CONST_FUN_OBJ_1(keypad_eventqueue_next_obj, keypad_eventqueue_next);
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_eventqueue_get_obj, keypad_eventqueue_get);
 
-//|     def store_next(self, event: Event) -> bool:
+//|     def get_into(self, event: Event) -> bool:
 //|         """Store the next key transition event in the supplied event, if available,
 //|         and return ``True``.
 //|         If there are no queued events, do not touch ``event`` and return ``False``.
 //|
-//|         The advantage of this method over ``next()`` is that it does not allocate storage.
+//|         The advantage of this method over ``get()`` is that it does not allocate storage.
 //|         Instead you can reuse an existing ``Event`` object.
 //|
 //|         Note that the queue size is limited; see ``max_events`` in the constructor of
 //|         a scanner such as `Keys` or `KeyMatrix`.
-//|         If a new event arrives when the queue is full, the oldest event is discarded.
 //|
 //|         :return ``True`` if an event was available and stored, ``False`` if not.
 //|         :rtype: bool
 //|         """
 //|         ...
 //|
-STATIC mp_obj_t keypad_eventqueue_store_next(mp_obj_t self_in, mp_obj_t event_in) {
+STATIC mp_obj_t keypad_eventqueue_get_into(mp_obj_t self_in, mp_obj_t event_in) {
     keypad_eventqueue_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     keypad_event_obj_t *event = MP_OBJ_TO_PTR(mp_arg_validate_type(event_in, &keypad_event_type, MP_QSTR_event));
 
-    return mp_obj_new_bool(common_hal_keypad_eventqueue_store_next(self, event));
+    return mp_obj_new_bool(common_hal_keypad_eventqueue_get_into(self, event));
 }
-MP_DEFINE_CONST_FUN_OBJ_2(keypad_eventqueue_store_next_obj, keypad_eventqueue_store_next);
+MP_DEFINE_CONST_FUN_OBJ_2(keypad_eventqueue_get_into_obj, keypad_eventqueue_get_into);
 
 //|     def clear(self) -> None:
 //|         """Clear any queued key transition events.
@@ -117,10 +118,36 @@ STATIC mp_obj_t keypad_eventqueue_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     }
 }
 
+//|     overflowed: bool
+//|     """``True`` if an event could not be added to the event queue because it was full.
+//|     When this happens, the event queue is cleared.
+//|     The `overflowed` flag is persistent. Reset it by setting it to ``False``.
+//|     """
+//|
+STATIC mp_obj_t keypad_eventqueue_get_overflowed(mp_obj_t self_in) {
+    keypad_eventqueue_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_bool(common_hal_keypad_eventqueue_get_overflowed(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_eventqueue_get_overflowed_obj, keypad_eventqueue_get_overflowed);
+
+STATIC mp_obj_t keypad_eventqueue_set_overflowed(mp_obj_t self_in, mp_obj_t overflowed_in) {
+    keypad_eventqueue_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_keypad_eventqueue_set_overflowed(self, mp_obj_is_true(overflowed_in));
+    return MP_ROM_NONE;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(keypad_eventqueue_set_overflowed_obj, keypad_eventqueue_set_overflowed);
+
+const mp_obj_property_t keypad_eventqueue_overflowed_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&keypad_eventqueue_get_overflowed_obj,
+              (mp_obj_t)&keypad_eventqueue_set_overflowed_obj,
+              MP_ROM_NONE},
+};
+
 STATIC const mp_rom_map_elem_t keypad_eventqueue_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_clear),       MP_ROM_PTR(&keypad_eventqueue_clear_obj) },
-    { MP_ROM_QSTR(MP_QSTR_next),        MP_ROM_PTR(&keypad_eventqueue_next_obj) },
-    { MP_ROM_QSTR(MP_QSTR_store_next),  MP_ROM_PTR(&keypad_eventqueue_store_next_obj) },
+    { MP_ROM_QSTR(MP_QSTR_get),        MP_ROM_PTR(&keypad_eventqueue_get_obj) },
+    { MP_ROM_QSTR(MP_QSTR_get_into),  MP_ROM_PTR(&keypad_eventqueue_get_into_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(keypad_eventqueue_locals_dict, keypad_eventqueue_locals_dict_table);
diff --git a/shared-bindings/keypad/EventQueue.h b/shared-bindings/keypad/EventQueue.h
index 6faa2971fd..fbbd9df0cb 100644
--- a/shared-bindings/keypad/EventQueue.h
+++ b/shared-bindings/keypad/EventQueue.h
@@ -36,7 +36,10 @@ void common_hal_keypad_eventqueue_construct(keypad_eventqueue_obj_t *self, size_
 
 void common_hal_keypad_eventqueue_clear(keypad_eventqueue_obj_t *self);
 size_t common_hal_keypad_eventqueue_get_length(keypad_eventqueue_obj_t *self);
-mp_obj_t common_hal_keypad_eventqueue_next(keypad_eventqueue_obj_t *self);
-bool common_hal_keypad_eventqueue_store_next(keypad_eventqueue_obj_t *self, keypad_event_obj_t *event);
+mp_obj_t common_hal_keypad_eventqueue_get(keypad_eventqueue_obj_t *self);
+bool common_hal_keypad_eventqueue_get_into(keypad_eventqueue_obj_t *self, keypad_event_obj_t *event);
+
+bool common_hal_keypad_eventqueue_get_overflowed(keypad_eventqueue_obj_t *self);
+void common_hal_keypad_eventqueue_set_overflowed(keypad_eventqueue_obj_t *self, bool overflowed);
 
 #endif  // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_EVENTQUEUE_H
diff --git a/shared-bindings/keypad/KeyMatrix.c b/shared-bindings/keypad/KeyMatrix.c
index f2c80b42e5..fc29f67e33 100644
--- a/shared-bindings/keypad/KeyMatrix.c
+++ b/shared-bindings/keypad/KeyMatrix.c
@@ -36,26 +36,25 @@
 //| class KeyMatrix:
 //|     """Manage a 2D matrix of keys with row and column pins."""
 //|
-//|     def __init__(self, row_pins: Sequence[microcontroller.Pin], col_pins: Sequence[microcontroller.Pin], columns_to_anodes: bool = True, interval: float = 0.020, max_events: int = 64) -> None:
+//|     def __init__(self, row_pins: Sequence[microcontroller.Pin], column_pins: Sequence[microcontroller.Pin], columns_to_anodes: bool = True, interval: float = 0.020, max_events: int = 64) -> None:
 //|         """
 //|         Create a `Keys` object that will scan the key matrix attached to the given row and column pins.
-//|         There should not be any pull-ups or pull-downs on the matrix.
+//|         There should not be any external pull-ups or pull-downs on the matrix:
+//|         ``KeyMatrix`` enables internal pull-ups or pull-downs on the pins as necessary.
 //|
 //|         The keys are numbered sequentially from zero. A key number can be computed
-//|         by ``row * len(col_pins) + col``.
+//|         by ``row * len(column_pins) + column``.
 //|
 //|         An `EventQueue` is created when this object is created and is available in the `events` attribute.
 //|
-//|         The keys are debounced by waiting about 20 msecs before reporting a transition.
-//|
 //|         :param Sequence[microcontroller.Pin] row_pins: The pins attached to the rows.
-//|         :param Sequence[microcontroller.Pin] col_pins: The pins attached to the colums.
+//|         :param Sequence[microcontroller.Pin] column_pins: The pins attached to the colums.
 //|         :param bool columns_to_anodes: Default ``True``.
 //|           If the matrix uses diodes, the diode anodes are typically connected to the column pins,
 //|           and the cathodes should be connected to the row pins. If your diodes are reversed,
 //|           set ``columns_to_anodes`` to ``False``.
-//|         :param float interval: Scan keys no more often
-//|           to allow for debouncing. Given in seconds.
+//|         :param float interval: Scan keys no more often than ``interval`` to allow for debouncing.
+//|           ``interval`` is in float seconds. The default is 0.020 (20 msecs).
 //|         :param int max_events: maximum size of `events` `EventQueue`:
 //|           maximum number of key transition events that are saved.
 //|           Must be >= 1.
@@ -66,10 +65,10 @@
 STATIC mp_obj_t keypad_keymatrix_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     keypad_keymatrix_obj_t *self = m_new_obj(keypad_keymatrix_obj_t);
     self->base.type = &keypad_keymatrix_type;
-    enum { ARG_row_pins, ARG_col_pins, ARG_columns_to_anodes, ARG_interval, ARG_max_events };
+    enum { ARG_row_pins, ARG_column_pins, ARG_columns_to_anodes, ARG_interval, ARG_max_events };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_row_pins, MP_ARG_REQUIRED | MP_ARG_OBJ },
-        { MP_QSTR_col_pins, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_column_pins, MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_columns_to_anodes, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} },
         { MP_QSTR_interval, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_max_events, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 64} },
@@ -81,15 +80,15 @@ STATIC mp_obj_t keypad_keymatrix_make_new(const mp_obj_type_t *type, size_t n_ar
     // mp_obj_len() will be >= 0.
     const size_t num_row_pins = (size_t)MP_OBJ_SMALL_INT_VALUE(mp_obj_len(row_pins));
 
-    mp_obj_t col_pins = args[ARG_col_pins].u_obj;
-    const size_t num_col_pins = (size_t)MP_OBJ_SMALL_INT_VALUE(mp_obj_len(col_pins));
+    mp_obj_t column_pins = args[ARG_column_pins].u_obj;
+    const size_t num_column_pins = (size_t)MP_OBJ_SMALL_INT_VALUE(mp_obj_len(column_pins));
 
     const mp_float_t interval =
         mp_arg_validate_obj_float_non_negative(args[ARG_interval].u_obj, 0.020f, MP_QSTR_interval);
     const size_t max_events = (size_t)mp_arg_validate_int_min(args[ARG_max_events].u_int, 1, MP_QSTR_max_events);
 
     mcu_pin_obj_t *row_pins_array[num_row_pins];
-    mcu_pin_obj_t *col_pins_array[num_col_pins];
+    mcu_pin_obj_t *column_pins_array[num_column_pins];
 
     for (size_t row = 0; row < num_row_pins; row++) {
         mcu_pin_obj_t *pin =
@@ -97,13 +96,13 @@ STATIC mp_obj_t keypad_keymatrix_make_new(const mp_obj_type_t *type, size_t n_ar
         row_pins_array[row] = pin;
     }
 
-    for (size_t col = 0; col < num_col_pins; col++) {
+    for (size_t column = 0; column < num_column_pins; column++) {
         mcu_pin_obj_t *pin =
-            validate_obj_is_free_pin(mp_obj_subscr(col_pins, MP_OBJ_NEW_SMALL_INT(col), MP_OBJ_SENTINEL));
-        col_pins_array[col] = pin;
+            validate_obj_is_free_pin(mp_obj_subscr(column_pins, MP_OBJ_NEW_SMALL_INT(column), MP_OBJ_SENTINEL));
+        column_pins_array[column] = pin;
     }
 
-    common_hal_keypad_keymatrix_construct(self, num_row_pins, row_pins_array, num_col_pins, col_pins_array, args[ARG_columns_to_anodes].u_bool, interval, max_events);
+    common_hal_keypad_keymatrix_construct(self, num_row_pins, row_pins_array, num_column_pins, column_pins_array, args[ARG_columns_to_anodes].u_bool, interval, max_events);
     return MP_OBJ_FROM_PTR(self);
 }
 
@@ -142,71 +141,102 @@ STATIC void check_for_deinit(keypad_keymatrix_obj_t *self) {
     }
 }
 
-//|     num_keys: int
+//|     key_count: int
 //|     """The number of keys that are being scanned. (read-only)
 //|     """
 //|
-STATIC mp_obj_t keypad_keymatrix_get_num_keys(mp_obj_t self_in) {
+STATIC mp_obj_t keypad_keymatrix_get_key_count(mp_obj_t self_in) {
     keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return MP_OBJ_NEW_SMALL_INT(common_hal_keypad_keymatrix_get_num_keys(self));
+    return MP_OBJ_NEW_SMALL_INT(common_hal_keypad_keymatrix_get_key_count(self));
 }
-MP_DEFINE_CONST_FUN_OBJ_1(keypad_keymatrix_get_num_keys_obj, keypad_keymatrix_get_num_keys);
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_keymatrix_get_key_count_obj, keypad_keymatrix_get_key_count);
 
-const mp_obj_property_t keypad_keymatrix_num_keys_obj = {
+const mp_obj_property_t keypad_keymatrix_key_count_obj = {
     .base.type = &mp_type_property,
-    .proxy = {(mp_obj_t)&keypad_keymatrix_get_num_keys_obj,
+    .proxy = {(mp_obj_t)&keypad_keymatrix_get_key_count_obj,
               MP_ROM_NONE,
               MP_ROM_NONE},
 };
 
-//|     def key_num(self, row: int, col: int) -> int:
-//|         """Return the key number for a given row and column.
-//|         The key number is calculated by ``row * len(col_pins) + col``.
+//|     def key_number_to_row_column(self, row: int, column: int) -> Tuple[int]:
+//|         """Return the row and column for the given key number.
+//|         The row is ``key_number // len(column_pins)``.
+//|         The column is ``key_number % len(column_pins)``.
+//|
+//|         :return: ``(row, column)``
+//|         :rtype: Tuple[int]
 //|         """
 //|         ...
 //|
-STATIC mp_obj_t keypad_keymatrix_key_num(mp_obj_t self_in, mp_obj_t row_in, mp_obj_t col_in) {
+STATIC mp_obj_t keypad_keymatrix_key_number_to_row_column(mp_obj_t self_in, mp_obj_t key_number_in) {
+    keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+
+    const mp_uint_t key_number = (mp_uint_t)mp_arg_validate_int_range(
+        mp_obj_get_int(key_number_in),
+        0, (mp_int_t)common_hal_keypad_keymatrix_get_key_count(self),
+        MP_QSTR_key_number);
+
+    mp_uint_t row;
+    mp_uint_t column;
+    common_hal_keypad_keymatrix_key_number_to_row_column(self, key_number, &row, &column);
+
+    mp_obj_t row_column[2];
+    row_column[0] = MP_OBJ_NEW_SMALL_INT(row);
+    row_column[1] = MP_OBJ_NEW_SMALL_INT(column);
+
+    return mp_obj_new_tuple(2, row_column);
+}
+MP_DEFINE_CONST_FUN_OBJ_2(keypad_keymatrix_key_number_to_row_column_obj, keypad_keymatrix_key_number_to_row_column);
+
+//|     def row_column_to_key_number(self, row: int, column: int) -> int:
+//|         """Return the key number for a given row and column.
+//|         The key number is ``row * len(column_pins) + column``.
+//|         """
+//|         ...
+//|
+STATIC mp_obj_t keypad_keymatrix_row_column_to_key_number(mp_obj_t self_in, mp_obj_t row_in, mp_obj_t column_in) {
     keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
 
     const mp_uint_t row = (mp_uint_t)mp_arg_validate_int_range(
-        mp_obj_get_int(row_in), 0, (mp_int_t)common_hal_keypad_keymatrix_get_num_rows(self), MP_QSTR_row);
+        mp_obj_get_int(row_in), 0, (mp_int_t)common_hal_keypad_keymatrix_get_row_count(self), MP_QSTR_row);
 
-    const mp_int_t col = (mp_uint_t)mp_arg_validate_int_range(
-        mp_obj_get_int(col_in), 0, (mp_int_t)common_hal_keypad_keymatrix_get_num_cols(self), MP_QSTR_col);
+    const mp_int_t column = (mp_uint_t)mp_arg_validate_int_range(
+        mp_obj_get_int(column_in), 0, (mp_int_t)common_hal_keypad_keymatrix_get_column_count(self), MP_QSTR_column);
 
     return MP_OBJ_NEW_SMALL_INT(
-        (mp_int_t)common_hal_keypad_keymatrix_key_num(self, row, col));
+        (mp_int_t)common_hal_keypad_keymatrix_row_column_to_key_number(self, row, column));
 }
-MP_DEFINE_CONST_FUN_OBJ_3(keypad_keymatrix_key_num_obj, keypad_keymatrix_key_num);
+MP_DEFINE_CONST_FUN_OBJ_3(keypad_keymatrix_row_column_to_key_number_obj, keypad_keymatrix_row_column_to_key_number);
 
-//|     def pressed(self, key_num: int) -> None:
+//|     def pressed(self, key_number: int) -> None:
 //|         """Return ``True`` if the given key is pressed. This is a debounced read
 //|         of the key state which bypasses the `events` `EventQueue`.
 //|         """
 //|         ...
 //|
-STATIC mp_obj_t keypad_keymatrix_pressed(mp_obj_t self_in, mp_obj_t key_num_in) {
+STATIC mp_obj_t keypad_keymatrix_pressed(mp_obj_t self_in, mp_obj_t key_number_in) {
     keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
 
-    mp_uint_t key_num = mp_arg_validate_int_range(
-        mp_obj_get_int(key_num_in), 0, (mp_int_t)common_hal_keypad_keymatrix_get_num_keys(self), MP_QSTR_key_num);
+    mp_uint_t key_number = mp_arg_validate_int_range(
+        mp_obj_get_int(key_number_in), 0, (mp_int_t)common_hal_keypad_keymatrix_get_key_count(self), MP_QSTR_key_number);
 
-    return mp_obj_new_bool(common_hal_keypad_keymatrix_pressed(self, (mp_uint_t)key_num));
+    return mp_obj_new_bool(common_hal_keypad_keymatrix_pressed(self, (mp_uint_t)key_number));
 }
 MP_DEFINE_CONST_FUN_OBJ_2(keypad_keymatrix_pressed_obj, keypad_keymatrix_pressed);
 
-//|     def store_states(self, states: _typing.WriteableBuffer) -> None:
+//|     def get_states_into(self, states: _typing.WriteableBuffer) -> None:
 //|         """Write the state of all the keys into ``states``.
 //|         Write a ``1`` if pressed, and ``0`` if released.
-//|         The ``length`` of ``states`` must be `num_keys`.
+//|         The ``length`` of ``states`` must be `key_count`.
 //|         This is a debounced read of the state of all the keys, and bypasses the `events` `EventQueue`.
 //|         The read is done atomically.
 //|         """
 //|         ...
 //|
-STATIC mp_obj_t keypad_keymatrix_store_states(mp_obj_t self_in, mp_obj_t pressed) {
+STATIC mp_obj_t keypad_keymatrix_get_states_into(mp_obj_t self_in, mp_obj_t pressed) {
     keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
 
@@ -216,13 +246,13 @@ STATIC mp_obj_t keypad_keymatrix_store_states(mp_obj_t self_in, mp_obj_t pressed
         mp_raise_ValueError_varg(translate("%q must store bytes"), MP_QSTR_states);
     }
 
-    (void)mp_arg_validate_length_with_name(bufinfo.len, common_hal_keypad_keymatrix_get_num_keys(self),
-        MP_QSTR_states, MP_QSTR_num_keys);
+    (void)mp_arg_validate_length_with_name(bufinfo.len, common_hal_keypad_keymatrix_get_key_count(self),
+        MP_QSTR_states, MP_QSTR_key_count);
 
-    common_hal_keypad_keymatrix_store_states(self, (uint8_t *)bufinfo.buf);
+    common_hal_keypad_keymatrix_get_states_into(self, (uint8_t *)bufinfo.buf);
     return MP_ROM_NONE;
 }
-MP_DEFINE_CONST_FUN_OBJ_2(keypad_keymatrix_store_states_obj, keypad_keymatrix_store_states);
+MP_DEFINE_CONST_FUN_OBJ_2(keypad_keymatrix_get_states_into_obj, keypad_keymatrix_get_states_into);
 
 //|     events: EventQueue
 //|     """The `EventQueue` associated with this `Keys` object. (read-only)
@@ -242,15 +272,16 @@ const mp_obj_property_t keypad_keymatrix_events_obj = {
 };
 
 STATIC const mp_rom_map_elem_t keypad_keymatrix_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_deinit),       MP_ROM_PTR(&keypad_keymatrix_deinit_obj) },
-    { MP_ROM_QSTR(MP_QSTR___enter__),    MP_ROM_PTR(&default___enter___obj) },
-    { MP_ROM_QSTR(MP_QSTR___exit__),     MP_ROM_PTR(&keypad_keymatrix___exit___obj) },
+    { MP_ROM_QSTR(MP_QSTR_deinit),                   MP_ROM_PTR(&keypad_keymatrix_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR___enter__),                MP_ROM_PTR(&default___enter___obj) },
+    { MP_ROM_QSTR(MP_QSTR___exit__),                 MP_ROM_PTR(&keypad_keymatrix___exit___obj) },
 
-    { MP_ROM_QSTR(MP_QSTR_events),       MP_ROM_PTR(&keypad_keymatrix_events_obj) },
-    { MP_ROM_QSTR(MP_QSTR_key_num),      MP_ROM_PTR(&keypad_keymatrix_key_num_obj) },
-    { MP_ROM_QSTR(MP_QSTR_num_keys),     MP_ROM_PTR(&keypad_keymatrix_num_keys_obj) },
-    { MP_ROM_QSTR(MP_QSTR_pressed),      MP_ROM_PTR(&keypad_keymatrix_pressed_obj) },
-    { MP_ROM_QSTR(MP_QSTR_store_states), MP_ROM_PTR(&keypad_keymatrix_store_states_obj) },
+    { MP_ROM_QSTR(MP_QSTR_events),                   MP_ROM_PTR(&keypad_keymatrix_events_obj) },
+    { MP_ROM_QSTR(MP_QSTR_get_states_into),          MP_ROM_PTR(&keypad_keymatrix_get_states_into_obj) },
+    { MP_ROM_QSTR(MP_QSTR_key_number_to_row_column), MP_ROM_PTR(&keypad_keymatrix_key_number_to_row_column_obj) },
+    { MP_ROM_QSTR(MP_QSTR_row_column_to_key_number), MP_ROM_PTR(&keypad_keymatrix_row_column_to_key_number_obj) },
+    { MP_ROM_QSTR(MP_QSTR_key_count),                MP_ROM_PTR(&keypad_keymatrix_key_count_obj) },
+    { MP_ROM_QSTR(MP_QSTR_pressed),                  MP_ROM_PTR(&keypad_keymatrix_pressed_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(keypad_keymatrix_locals_dict, keypad_keymatrix_locals_dict_table);
diff --git a/shared-bindings/keypad/KeyMatrix.h b/shared-bindings/keypad/KeyMatrix.h
index 72e1847c44..98152f759a 100644
--- a/shared-bindings/keypad/KeyMatrix.h
+++ b/shared-bindings/keypad/KeyMatrix.h
@@ -32,19 +32,20 @@
 
 extern const mp_obj_type_t keypad_keymatrix_type;
 
-void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint_t num_row_pins, mcu_pin_obj_t *row_pins[], mp_uint_t num_col_pins, mcu_pin_obj_t *col_pins[], bool columns_to_anodes, mp_float_t interval, size_t max_events);
+void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint_t num_row_pins, mcu_pin_obj_t *row_pins[], mp_uint_t num_column_pins, mcu_pin_obj_t *column_pins[], bool columns_to_anodes, mp_float_t interval, size_t max_events);
 
 void common_hal_keypad_keymatrix_deinit(keypad_keymatrix_obj_t *self);
 bool common_hal_keypad_keymatrix_deinited(keypad_keymatrix_obj_t *self);
 
-mp_uint_t common_hal_keypad_keymatrix_key_num(keypad_keymatrix_obj_t *self, mp_uint_t row, mp_uint_t col);
+void common_hal_keypad_keymatrix_key_number_to_row_column(keypad_keymatrix_obj_t *self, mp_uint_t key_number, mp_uint_t *row, mp_uint_t *column);
+mp_uint_t common_hal_keypad_keymatrix_row_column_to_key_number(keypad_keymatrix_obj_t *self, mp_uint_t row, mp_uint_t column);
 
-mp_uint_t common_hal_keypad_keymatrix_get_num_keys(keypad_keymatrix_obj_t *self);
-mp_uint_t common_hal_keypad_keymatrix_get_num_cols(keypad_keymatrix_obj_t *self);
-mp_uint_t common_hal_keypad_keymatrix_get_num_rows(keypad_keymatrix_obj_t *self);
+mp_uint_t common_hal_keypad_keymatrix_get_key_count(keypad_keymatrix_obj_t *self);
+mp_uint_t common_hal_keypad_keymatrix_get_column_count(keypad_keymatrix_obj_t *self);
+mp_uint_t common_hal_keypad_keymatrix_get_row_count(keypad_keymatrix_obj_t *self);
 
 mp_obj_t common_hal_keypad_keymatrix_get_events(keypad_keymatrix_obj_t *self);
-bool common_hal_keypad_keymatrix_pressed(keypad_keymatrix_obj_t *self, mp_uint_t key_num);
-void common_hal_keypad_keymatrix_store_states(keypad_keymatrix_obj_t *self, uint8_t *states);
+bool common_hal_keypad_keymatrix_pressed(keypad_keymatrix_obj_t *self, mp_uint_t key_number);
+void common_hal_keypad_keymatrix_get_states_into(keypad_keymatrix_obj_t *self, uint8_t *states);
 
 #endif  // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_KEYMATRIX_H
diff --git a/shared-bindings/keypad/Keys.c b/shared-bindings/keypad/Keys.c
index 5f1d0ecc7d..95e68e9bd1 100644
--- a/shared-bindings/keypad/Keys.c
+++ b/shared-bindings/keypad/Keys.c
@@ -43,8 +43,6 @@
 //|
 //|         An `EventQueue` is created when this object is created and is available in the `events` attribute.
 //|
-//|         The keys are debounced by waiting about 20 msecs before reporting a transition.
-//|
 //|         :param Sequence[microcontroller.Pin] pins: The pins attached to the keys.
 //|           The key numbers correspond to indices into this sequence.
 //|         :param bool value_when_pressed: ``True`` if the pin reads high when the key is pressed.
@@ -56,8 +54,8 @@
 //|           If an external pull is already provided for all the pins, you can set ``pull`` to ``False``.
 //|           However, enabling an internal pull when an external one is already present is not a problem;
 //|           it simply uses slightly more current.
-//|         :param float interval: Scan keys no more often
-//|           to allow for debouncing. Given in seconds.
+//|         :param float interval: Scan keys no more often than ``interval`` to allow for debouncing.
+//|           ``interval`` is in float seconds. The default is 0.020 (20 msecs).
 //|         :param int max_events: maximum size of `events` `EventQueue`:
 //|           maximum number of key transition events that are saved.
 //|           Must be >= 1.
@@ -137,50 +135,50 @@ STATIC void check_for_deinit(keypad_keys_obj_t *self) {
     }
 }
 
-//|     num_keys: int
+//|     key_count: int
 //|     """The number of keys that are being scanned. (read-only)
 //|     """
 //|
-STATIC mp_obj_t keypad_keys_get_num_keys(mp_obj_t self_in) {
+STATIC mp_obj_t keypad_keys_get_key_count(mp_obj_t self_in) {
     keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return MP_OBJ_NEW_SMALL_INT(common_hal_keypad_keys_get_num_keys(self));
+    return MP_OBJ_NEW_SMALL_INT(common_hal_keypad_keys_get_key_count(self));
 }
-MP_DEFINE_CONST_FUN_OBJ_1(keypad_keys_get_num_keys_obj, keypad_keys_get_num_keys);
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_keys_get_key_count_obj, keypad_keys_get_key_count);
 
-const mp_obj_property_t keypad_keys_num_keys_obj = {
+const mp_obj_property_t keypad_keys_key_count_obj = {
     .base.type = &mp_type_property,
-    .proxy = {(mp_obj_t)&keypad_keys_get_num_keys_obj,
+    .proxy = {(mp_obj_t)&keypad_keys_get_key_count_obj,
               MP_ROM_NONE,
               MP_ROM_NONE},
 };
 
-//|     def pressed(self, key_num: int) -> None:
+//|     def pressed(self, key_number: int) -> None:
 //|         """Return ``True`` if the given key is pressed.
 //          This is a debounced read of the key state which bypasses the `events` `EventQueue`.
 //|         """
 //|         ...
 //|
-STATIC mp_obj_t keypad_keys_pressed(mp_obj_t self_in, mp_obj_t key_num_in) {
+STATIC mp_obj_t keypad_keys_pressed(mp_obj_t self_in, mp_obj_t key_number_in) {
     keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
 
-    const mp_int_t key_num = mp_obj_get_int(key_num_in);
-    (void)mp_arg_validate_int_range(key_num, 0, common_hal_keypad_keys_get_num_keys(self), MP_QSTR_key_num);
+    const mp_int_t key_number = mp_obj_get_int(key_number_in);
+    (void)mp_arg_validate_int_range(key_number, 0, common_hal_keypad_keys_get_key_count(self), MP_QSTR_key_number);
 
-    return mp_obj_new_bool(common_hal_keypad_keys_pressed(self, (mp_uint_t)key_num));
+    return mp_obj_new_bool(common_hal_keypad_keys_pressed(self, (mp_uint_t)key_number));
 }
 MP_DEFINE_CONST_FUN_OBJ_2(keypad_keys_pressed_obj, keypad_keys_pressed);
 
-//|     def store_states(self, states: _typing.WriteableBuffer) -> None:
+//|     def get_states_into(self, states: _typing.WriteableBuffer) -> None:
 //|         """Write the states of all the keys into ``states``.
 //|         Write a ``1`` if pressed, and ``0`` if released.
-//|         The ``length`` of ``states`` must be `num_keys`.
+//|         The ``length`` of ``states`` must be `key_count`.
 //|         This is a debounced read of the state of all the keys, and bypasses the `events` `EventQueue`.
 //|         The read is done atomically.
 //|         """
 //|         ...
 //|
-STATIC mp_obj_t keypad_keys_store_states(mp_obj_t self_in, mp_obj_t pressed) {
+STATIC mp_obj_t keypad_keys_get_states_into(mp_obj_t self_in, mp_obj_t pressed) {
     keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
 
@@ -189,13 +187,13 @@ STATIC mp_obj_t keypad_keys_store_states(mp_obj_t self_in, mp_obj_t pressed) {
     if (bufinfo.typecode != 'b' && bufinfo.typecode != 'B' && bufinfo.typecode != BYTEARRAY_TYPECODE) {
         mp_raise_ValueError_varg(translate("%q must store bytes"), MP_QSTR_pressed);
     }
-    (void)mp_arg_validate_length_with_name(bufinfo.len,common_hal_keypad_keys_get_num_keys(self),
-        MP_QSTR_pressed, MP_QSTR_num_keys);
+    (void)mp_arg_validate_length_with_name(bufinfo.len,common_hal_keypad_keys_get_key_count(self),
+        MP_QSTR_pressed, MP_QSTR_key_count);
 
-    common_hal_keypad_keys_store_states(self, (uint8_t *)bufinfo.buf);
+    common_hal_keypad_keys_get_states_into(self, (uint8_t *)bufinfo.buf);
     return MP_ROM_NONE;
 }
-MP_DEFINE_CONST_FUN_OBJ_2(keypad_keys_store_states_obj, keypad_keys_store_states);
+MP_DEFINE_CONST_FUN_OBJ_2(keypad_keys_get_states_into_obj, keypad_keys_get_states_into);
 
 //|     events: EventQueue
 //|     """The `EventQueue` associated with this `Keys` object. (read-only)
@@ -220,9 +218,9 @@ STATIC const mp_rom_map_elem_t keypad_keys_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR___exit__),     MP_ROM_PTR(&keypad_keys___exit___obj) },
 
     { MP_ROM_QSTR(MP_QSTR_events),       MP_ROM_PTR(&keypad_keys_events_obj) },
-    { MP_ROM_QSTR(MP_QSTR_num_keys),     MP_ROM_PTR(&keypad_keys_num_keys_obj) },
+    { MP_ROM_QSTR(MP_QSTR_key_count),     MP_ROM_PTR(&keypad_keys_key_count_obj) },
     { MP_ROM_QSTR(MP_QSTR_pressed),      MP_ROM_PTR(&keypad_keys_pressed_obj) },
-    { MP_ROM_QSTR(MP_QSTR_store_states), MP_ROM_PTR(&keypad_keys_store_states_obj) },
+    { MP_ROM_QSTR(MP_QSTR_get_states_into), MP_ROM_PTR(&keypad_keys_get_states_into_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(keypad_keys_locals_dict, keypad_keys_locals_dict_table);
diff --git a/shared-bindings/keypad/Keys.h b/shared-bindings/keypad/Keys.h
index 6160b8b959..3ac3dd43b2 100644
--- a/shared-bindings/keypad/Keys.h
+++ b/shared-bindings/keypad/Keys.h
@@ -38,8 +38,8 @@ void common_hal_keypad_keys_deinit(keypad_keys_obj_t *self);
 bool common_hal_keypad_keys_deinited(keypad_keys_obj_t *self);
 
 mp_obj_t common_hal_keypad_keys_get_events(keypad_keys_obj_t *self);
-mp_uint_t common_hal_keypad_keys_get_num_keys(keypad_keys_obj_t *self);
-bool common_hal_keypad_keys_pressed(keypad_keys_obj_t *self, mp_uint_t key_num);
-void common_hal_keypad_keys_store_states(keypad_keys_obj_t *self, uint8_t *states);
+mp_uint_t common_hal_keypad_keys_get_key_count(keypad_keys_obj_t *self);
+bool common_hal_keypad_keys_pressed(keypad_keys_obj_t *self, mp_uint_t key_number);
+void common_hal_keypad_keys_get_states_into(keypad_keys_obj_t *self, uint8_t *states);
 
 #endif  // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_KEYS_H
diff --git a/shared-bindings/keypad/ShiftRegisterKeys.c b/shared-bindings/keypad/ShiftRegisterKeys.c
index 2946ba3f98..e5d959348c 100644
--- a/shared-bindings/keypad/ShiftRegisterKeys.c
+++ b/shared-bindings/keypad/ShiftRegisterKeys.c
@@ -36,7 +36,7 @@
 //| class ShiftRegisterKeys:
 //|     """Manage a set of keys attached to an incoming shift register."""
 //|
-//|     def __init__(self, *, clock: microcontroller.Pin, data: microcontroller.Pin, latch: microcontroller.Pin, value_to_latch: bool = True, num_keys: int, value_when_pressed: bool, interval: float = 0.020, max_events: int = 64) -> None:
+//|     def __init__(self, *, clock: microcontroller.Pin, data: microcontroller.Pin, latch: microcontroller.Pin, value_to_latch: bool = True, key_count: int, value_when_pressed: bool, interval: float = 0.020, max_events: int = 64) -> None:
 //|         """
 //|         Create a `Keys` object that will scan keys attached to a parallel-in serial-out shift register
 //|         like the 74HC165 or CD4021.
@@ -47,8 +47,6 @@
 //|
 //|         An `EventQueue` is created when this object is created and is available in the `events` attribute.
 //|
-//|         The keys are debounced by waiting about 20 msecs before reporting a transition.
-//|
 //|         :param microcontroller.Pin clock: The shift register clock pin.
 //|           The shift register should clock on a low-to-high transition.
 //|         :param microcontroller.Pin data: the incoming shift register data pin
@@ -59,11 +57,11 @@
 //|           ``False`` if the data is latched when ``latch goes low.
 //|           The default is ``True``, which is how the 74HC165 operates. The CD4021 latch is the opposite.
 //|           Once the data is latched, it will be shifted out by toggling the clock pin.
-//|         :param int num_keys: number of data lines to clock in
+//|         :param int key_count: number of data lines to clock in
 //|         :param bool value_when_pressed: ``True`` if the pin reads high when the key is pressed.
 //|           ``False`` if the pin reads low (is grounded) when the key is pressed.
-//|         :param float interval: Scan keys no more often
-//|           to allow for debouncing. Given in seconds.
+//|         :param float interval: Scan keys no more often than ``interval`` to allow for debouncing.
+//|           ``interval`` is in float seconds. The default is 0.020 (20 msecs).
 //|         :param int max_events: maximum size of `events` `EventQueue`:
 //|           maximum number of key transition events that are saved.
 //|           Must be >= 1.
@@ -74,13 +72,13 @@
 STATIC mp_obj_t keypad_shiftregisterkeys_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     keypad_shiftregisterkeys_obj_t *self = m_new_obj(keypad_shiftregisterkeys_obj_t);
     self->base.type = &keypad_shiftregisterkeys_type;
-    enum { ARG_clock, ARG_data, ARG_latch, ARG_value_to_latch, ARG_num_keys, ARG_value_when_pressed, ARG_interval, ARG_max_events };
+    enum { ARG_clock, ARG_data, ARG_latch, ARG_value_to_latch, ARG_key_count, ARG_value_when_pressed, ARG_interval, ARG_max_events };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_clock, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_data, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_latch, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_value_to_latch, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} },
-        { MP_QSTR_num_keys, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT },
+        { MP_QSTR_key_count, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT },
         { MP_QSTR_value_when_pressed, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_BOOL },
         { MP_QSTR_interval, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_max_events, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 64} },
@@ -93,14 +91,14 @@ STATIC mp_obj_t keypad_shiftregisterkeys_make_new(const mp_obj_type_t *type, siz
     mcu_pin_obj_t *latch = validate_obj_is_free_pin(args[ARG_latch].u_obj);
     const bool value_to_latch = args[ARG_value_to_latch].u_bool;
 
-    const size_t num_keys = (size_t)mp_arg_validate_int_min(args[ARG_num_keys].u_int, 1, MP_QSTR_num_keys);
+    const size_t key_count = (size_t)mp_arg_validate_int_min(args[ARG_key_count].u_int, 1, MP_QSTR_key_count);
     const bool value_when_pressed = args[ARG_value_when_pressed].u_bool;
     const mp_float_t interval =
         mp_arg_validate_obj_float_non_negative(args[ARG_interval].u_obj, 0.020f, MP_QSTR_interval);
     const size_t max_events = (size_t)mp_arg_validate_int_min(args[ARG_max_events].u_int, 1, MP_QSTR_max_events);
 
     common_hal_keypad_shiftregisterkeys_construct(
-        self, clock, data, latch, value_to_latch, num_keys, value_when_pressed, interval, max_events);
+        self, clock, data, latch, value_to_latch, key_count, value_when_pressed, interval, max_events);
 
     return MP_OBJ_FROM_PTR(self);
 }
@@ -141,51 +139,51 @@ STATIC void check_for_deinit(keypad_shiftregisterkeys_obj_t *self) {
     }
 }
 
-//|     num_keys: int
+//|     key_count: int
 //|     """The number of keys that are being scanned. (read-only)
 //|     """
 //|
-STATIC mp_obj_t keypad_shiftregisterkeys_get_num_keys(mp_obj_t self_in) {
+STATIC mp_obj_t keypad_shiftregisterkeys_get_key_count(mp_obj_t self_in) {
     keypad_shiftregisterkeys_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return MP_OBJ_NEW_SMALL_INT(common_hal_keypad_shiftregisterkeys_get_num_keys(self));
+    return MP_OBJ_NEW_SMALL_INT(common_hal_keypad_shiftregisterkeys_get_key_count(self));
 }
-MP_DEFINE_CONST_FUN_OBJ_1(keypad_shiftregisterkeys_get_num_keys_obj, keypad_shiftregisterkeys_get_num_keys);
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_shiftregisterkeys_get_key_count_obj, keypad_shiftregisterkeys_get_key_count);
 
-const mp_obj_property_t keypad_shiftregisterkeys_num_keys_obj = {
+const mp_obj_property_t keypad_shiftregisterkeys_key_count_obj = {
     .base.type = &mp_type_property,
-    .proxy = {(mp_obj_t)&keypad_shiftregisterkeys_get_num_keys_obj,
+    .proxy = {(mp_obj_t)&keypad_shiftregisterkeys_get_key_count_obj,
               MP_ROM_NONE,
               MP_ROM_NONE},
 };
 
-//|     def pressed(self, key_num: int) -> None:
+//|     def pressed(self, key_number: int) -> None:
 //|         """Return ``True`` if the given key is pressed.
 //          This is a debounced read of the key state which bypasses the `events` `EventQueue`.
 //|         """
 //|         ...
 //|
-STATIC mp_obj_t keypad_shiftregisterkeys_pressed(mp_obj_t self_in, mp_obj_t key_num_in) {
+STATIC mp_obj_t keypad_shiftregisterkeys_pressed(mp_obj_t self_in, mp_obj_t key_number_in) {
     keypad_shiftregisterkeys_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
 
-    mp_uint_t key_num = mp_arg_validate_int_range(
-        mp_obj_get_int(key_num_in), 0, (mp_int_t)common_hal_keypad_shiftregisterkeys_get_num_keys(self),
-        MP_QSTR_key_num);
+    mp_uint_t key_number = mp_arg_validate_int_range(
+        mp_obj_get_int(key_number_in), 0, (mp_int_t)common_hal_keypad_shiftregisterkeys_get_key_count(self),
+        MP_QSTR_key_number);
 
-    return mp_obj_new_bool(common_hal_keypad_shiftregisterkeys_pressed(self, key_num));
+    return mp_obj_new_bool(common_hal_keypad_shiftregisterkeys_pressed(self, key_number));
 }
 MP_DEFINE_CONST_FUN_OBJ_2(keypad_shiftregisterkeys_pressed_obj, keypad_shiftregisterkeys_pressed);
 
-//|     def store_states(self, states: _typing.WriteableBuffer) -> None:
+//|     def get_states_into(self, states: _typing.WriteableBuffer) -> None:
 //|         """Write the states of all the keys into ``states``.
 //|         Write a ``1`` if pressed, and ``0`` if released.
-//|         The ``length`` of ``states`` must be `num_keys`.
+//|         The ``length`` of ``states`` must be `key_count`.
 //|         This is a debounced read of the state of all the keys, and bypasses the `events` `EventQueue`.
 //|         The read is done atomically.
 //|         """
 //|         ...
 //|
-STATIC mp_obj_t keypad_shiftregisterkeys_store_states(mp_obj_t self_in, mp_obj_t pressed) {
+STATIC mp_obj_t keypad_shiftregisterkeys_get_states_into(mp_obj_t self_in, mp_obj_t pressed) {
     keypad_shiftregisterkeys_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_for_deinit(self);
 
@@ -194,13 +192,13 @@ STATIC mp_obj_t keypad_shiftregisterkeys_store_states(mp_obj_t self_in, mp_obj_t
     if (bufinfo.typecode != 'b' && bufinfo.typecode != 'B' && bufinfo.typecode != BYTEARRAY_TYPECODE) {
         mp_raise_ValueError_varg(translate("%q must store bytes"), MP_QSTR_pressed);
     }
-    (void)mp_arg_validate_length_with_name(bufinfo.len, common_hal_keypad_shiftregisterkeys_get_num_keys(self),
-        MP_QSTR_states, MP_QSTR_num_keys);
+    (void)mp_arg_validate_length_with_name(bufinfo.len, common_hal_keypad_shiftregisterkeys_get_key_count(self),
+        MP_QSTR_states, MP_QSTR_key_count);
 
-    common_hal_keypad_shiftregisterkeys_store_states(self, (uint8_t *)bufinfo.buf);
+    common_hal_keypad_shiftregisterkeys_get_states_into(self, (uint8_t *)bufinfo.buf);
     return MP_ROM_NONE;
 }
-MP_DEFINE_CONST_FUN_OBJ_2(keypad_shiftregisterkeys_store_states_obj, keypad_shiftregisterkeys_store_states);
+MP_DEFINE_CONST_FUN_OBJ_2(keypad_shiftregisterkeys_get_states_into_obj, keypad_shiftregisterkeys_get_states_into);
 
 //|     events: EventQueue
 //|     """The `EventQueue` associated with this `Keys` object. (read-only)
@@ -225,9 +223,9 @@ STATIC const mp_rom_map_elem_t keypad_shiftregisterkeys_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR___exit__),     MP_ROM_PTR(&keypad_shiftregisterkeys___exit___obj) },
 
     { MP_ROM_QSTR(MP_QSTR_events),       MP_ROM_PTR(&keypad_shiftregisterkeys_events_obj) },
-    { MP_ROM_QSTR(MP_QSTR_num_keys),     MP_ROM_PTR(&keypad_shiftregisterkeys_num_keys_obj) },
+    { MP_ROM_QSTR(MP_QSTR_key_count),     MP_ROM_PTR(&keypad_shiftregisterkeys_key_count_obj) },
     { MP_ROM_QSTR(MP_QSTR_pressed),      MP_ROM_PTR(&keypad_shiftregisterkeys_pressed_obj) },
-    { MP_ROM_QSTR(MP_QSTR_store_states), MP_ROM_PTR(&keypad_shiftregisterkeys_store_states_obj) },
+    { MP_ROM_QSTR(MP_QSTR_get_states_into), MP_ROM_PTR(&keypad_shiftregisterkeys_get_states_into_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(keypad_shiftregisterkeys_locals_dict, keypad_shiftregisterkeys_locals_dict_table);
diff --git a/shared-bindings/keypad/ShiftRegisterKeys.h b/shared-bindings/keypad/ShiftRegisterKeys.h
index 6a27d3cc73..9aced14466 100644
--- a/shared-bindings/keypad/ShiftRegisterKeys.h
+++ b/shared-bindings/keypad/ShiftRegisterKeys.h
@@ -32,14 +32,14 @@
 
 extern const mp_obj_type_t keypad_shiftregisterkeys_type;
 
-void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_t *self, mcu_pin_obj_t *clock_pin, mcu_pin_obj_t *data_pin, mcu_pin_obj_t *latch_pin, bool value_to_latch, size_t num_keys, bool value_when_pressed, mp_float_t interval, size_t max_events);
+void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_t *self, mcu_pin_obj_t *clock_pin, mcu_pin_obj_t *data_pin, mcu_pin_obj_t *latch_pin, bool value_to_latch, size_t key_count, bool value_when_pressed, mp_float_t interval, size_t max_events);
 
 void common_hal_keypad_shiftregisterkeys_deinit(keypad_shiftregisterkeys_obj_t *self);
 bool common_hal_keypad_shiftregisterkeys_deinited(keypad_shiftregisterkeys_obj_t *self);
 
 mp_obj_t common_hal_keypad_shiftregisterkeys_get_events(keypad_shiftregisterkeys_obj_t *self);
-mp_uint_t common_hal_keypad_shiftregisterkeys_get_num_keys(keypad_shiftregisterkeys_obj_t *self);
-bool common_hal_keypad_shiftregisterkeys_pressed(keypad_shiftregisterkeys_obj_t *self, mp_uint_t key_num);
-void common_hal_keypad_shiftregisterkeys_store_states(keypad_shiftregisterkeys_obj_t *self, uint8_t *states);
+mp_uint_t common_hal_keypad_shiftregisterkeys_get_key_count(keypad_shiftregisterkeys_obj_t *self);
+bool common_hal_keypad_shiftregisterkeys_pressed(keypad_shiftregisterkeys_obj_t *self, mp_uint_t key_number);
+void common_hal_keypad_shiftregisterkeys_get_states_into(keypad_shiftregisterkeys_obj_t *self, uint8_t *states);
 
 #endif  // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_SHIFTREGISTERKEYS_H
diff --git a/shared-module/keypad/Event.c b/shared-module/keypad/Event.c
index 21b4ad18d3..d938002cc5 100644
--- a/shared-module/keypad/Event.c
+++ b/shared-module/keypad/Event.c
@@ -26,13 +26,13 @@
 
 #include "shared-module/keypad/Event.h"
 
-void common_hal_keypad_event_construct(keypad_event_obj_t *self, mp_uint_t key_num, bool pressed) {
-    self->key_num = key_num;
+void common_hal_keypad_event_construct(keypad_event_obj_t *self, mp_int_t key_number, bool pressed) {
+    self->key_number = key_number;
     self->pressed = pressed;
 }
 
-mp_int_t common_hal_keypad_event_get_key_num(keypad_event_obj_t *self) {
-    return self->key_num;
+mp_int_t common_hal_keypad_event_get_key_number(keypad_event_obj_t *self) {
+    return self->key_number;
 }
 
 bool common_hal_keypad_event_get_pressed(keypad_event_obj_t *self) {
diff --git a/shared-module/keypad/Event.h b/shared-module/keypad/Event.h
index 4780df0aa2..3c47b0e636 100644
--- a/shared-module/keypad/Event.h
+++ b/shared-module/keypad/Event.h
@@ -31,7 +31,7 @@
 
 typedef struct {
     mp_obj_base_t base;
-    uint16_t key_num;
+    uint16_t key_number;
     bool pressed;
 } keypad_event_obj_t;
 
diff --git a/shared-module/keypad/EventQueue.c b/shared-module/keypad/EventQueue.c
index 556e425e4b..204c5d21dc 100644
--- a/shared-module/keypad/EventQueue.c
+++ b/shared-module/keypad/EventQueue.c
@@ -27,17 +27,17 @@
 #include "shared-bindings/keypad/Event.h"
 #include "shared-module/keypad/EventQueue.h"
 
-// Top bit of 16-bit event indicates pressed or released. Rest is key_num.
+// Key number is lower 15 bits of a 16-bit value.
 #define EVENT_PRESSED (1 << 15)
-#define EVENT_RELEASED (0)
-#define EVENT_KEY_NUM_MASK (~EVENT_PRESSED)
+#define EVENT_KEY_NUM_MASK ((1 << 15) - 1)
 
 void common_hal_keypad_eventqueue_construct(keypad_eventqueue_obj_t *self, size_t max_events) {
     // Event queue is 16-bit values.
     ringbuf_alloc(&self->encoded_events, max_events * 2, false);
+    self->overflowed = false;
 }
 
-mp_obj_t common_hal_keypad_eventqueue_next(keypad_eventqueue_obj_t *self) {
+mp_obj_t common_hal_keypad_eventqueue_get(keypad_eventqueue_obj_t *self) {
     int encoded_event = ringbuf_get16(&self->encoded_events);
     if (encoded_event == -1) {
         return MP_ROM_NONE;
@@ -49,7 +49,7 @@ mp_obj_t common_hal_keypad_eventqueue_next(keypad_eventqueue_obj_t *self) {
     return MP_OBJ_FROM_PTR(event);
 }
 
-bool common_hal_keypad_eventqueue_store_next(keypad_eventqueue_obj_t *self, keypad_event_obj_t *event) {
+bool common_hal_keypad_eventqueue_get_into(keypad_eventqueue_obj_t *self, keypad_event_obj_t *event) {
     int encoded_event = ringbuf_get16(&self->encoded_events);
     if (encoded_event == -1) {
         return false;
@@ -60,9 +60,6 @@ bool common_hal_keypad_eventqueue_store_next(keypad_eventqueue_obj_t *self, keyp
     return true;
 }
 
-
-
-
 void common_hal_keypad_eventqueue_clear(keypad_eventqueue_obj_t *self) {
     ringbuf_clear(&self->encoded_events);
 }
@@ -71,10 +68,25 @@ size_t common_hal_keypad_eventqueue_get_length(keypad_eventqueue_obj_t *self) {
     return ringbuf_num_filled(&self->encoded_events);
 }
 
-void keypad_eventqueue_record(keypad_eventqueue_obj_t *self, mp_uint_t key_num, bool pressed) {
-    if (ringbuf_num_empty(&self->encoded_events) == 0) {
-        // Discard oldest if full.
-        ringbuf_get16(&self->encoded_events);
-    }
-    ringbuf_put16(&self->encoded_events, key_num | (pressed ? EVENT_PRESSED : EVENT_RELEASED));
+bool common_hal_keypad_eventqueue_get_overflowed(keypad_eventqueue_obj_t *self) {
+    return self->overflowed;
+}
+
+void common_hal_keypad_eventqueue_set_overflowed(keypad_eventqueue_obj_t *self, bool overflowed) {
+    self->overflowed = overflowed;
+}
+
+bool keypad_eventqueue_record(keypad_eventqueue_obj_t *self, mp_uint_t key_number, bool pressed) {
+    if (ringbuf_num_empty(&self->encoded_events) == 0) {
+        // Queue is full. The caller will decide what to do, including whether to set the overflowed flag.
+        return false;
+    }
+
+    uint16_t encoded_event = key_number & EVENT_KEY_NUM_MASK;
+    if (pressed) {
+        encoded_event |= EVENT_PRESSED;
+    }
+    ringbuf_put16(&self->encoded_events, encoded_event);
+
+    return true;
 }
diff --git a/shared-module/keypad/EventQueue.h b/shared-module/keypad/EventQueue.h
index 88e585b23b..ce5e55ef3b 100644
--- a/shared-module/keypad/EventQueue.h
+++ b/shared-module/keypad/EventQueue.h
@@ -33,8 +33,9 @@
 typedef struct {
     mp_obj_base_t base;
     ringbuf_t encoded_events;
+    bool overflowed;
 } keypad_eventqueue_obj_t;
 
-void keypad_eventqueue_record(keypad_eventqueue_obj_t *self, mp_uint_t key_num, bool pressed);
+bool keypad_eventqueue_record(keypad_eventqueue_obj_t *self, mp_uint_t key_number, bool pressed);
 
 #endif  // MICROPY_INCLUDED_SHARED_MODULE_KEYPAD_EVENTQUEUE_H
diff --git a/shared-module/keypad/KeyMatrix.c b/shared-module/keypad/KeyMatrix.c
index 8ac3abe837..3cf7c89a91 100644
--- a/shared-module/keypad/KeyMatrix.c
+++ b/shared-module/keypad/KeyMatrix.c
@@ -36,11 +36,11 @@
 #include "supervisor/port.h"
 #include "supervisor/shared/tick.h"
 
-static mp_uint_t row_col_to_key_num(keypad_keymatrix_obj_t *self, mp_uint_t row, mp_uint_t col) {
-    return row * self->col_digitalinouts->len + col;
+static mp_uint_t row_column_to_key_number(keypad_keymatrix_obj_t *self, mp_uint_t row, mp_uint_t column) {
+    return row * self->column_digitalinouts->len + column;
 }
 
-void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint_t num_row_pins, mcu_pin_obj_t *row_pins[], mp_uint_t num_col_pins, mcu_pin_obj_t *col_pins[], bool columns_to_anodes, mp_float_t interval, size_t max_events) {
+void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint_t num_row_pins, mcu_pin_obj_t *row_pins[], mp_uint_t num_column_pins, mcu_pin_obj_t *column_pins[], bool columns_to_anodes, mp_float_t interval, size_t max_events) {
 
     mp_obj_t row_dios[num_row_pins];
     for (size_t row = 0; row < num_row_pins; row++) {
@@ -52,18 +52,18 @@ void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint
     }
     self->row_digitalinouts = mp_obj_new_tuple(num_row_pins, row_dios);
 
-    mp_obj_t col_dios[num_col_pins];
-    for (size_t col = 0; col < num_col_pins; col++) {
+    mp_obj_t column_dios[num_column_pins];
+    for (size_t column = 0; column < num_column_pins; column++) {
         digitalio_digitalinout_obj_t *dio = m_new_obj(digitalio_digitalinout_obj_t);
         dio->base.type = &digitalio_digitalinout_type;
-        common_hal_digitalio_digitalinout_construct(dio, col_pins[col]);
+        common_hal_digitalio_digitalinout_construct(dio, column_pins[column]);
         common_hal_digitalio_digitalinout_switch_to_input(dio, columns_to_anodes ? PULL_UP : PULL_DOWN);
-        col_dios[col] = dio;
+        column_dios[column] = dio;
     }
-    self->col_digitalinouts = mp_obj_new_tuple(num_col_pins, col_dios);
+    self->column_digitalinouts = mp_obj_new_tuple(num_column_pins, column_dios);
 
-    self->currently_pressed = (bool *)gc_alloc(sizeof(bool) * num_row_pins * num_col_pins, false, false);
-    self->previously_pressed = (bool *)gc_alloc(sizeof(bool) * num_row_pins * num_col_pins, false, false);
+    self->currently_pressed = (bool *)gc_alloc(sizeof(bool) * num_row_pins * num_column_pins, false, false);
+    self->previously_pressed = (bool *)gc_alloc(sizeof(bool) * num_row_pins * num_column_pins, false, false);
 
     self->columns_to_anodes = columns_to_anodes;
 
@@ -89,47 +89,53 @@ void common_hal_keypad_keymatrix_deinit(keypad_keymatrix_obj_t *self) {
     // Remove self from the list of active keypad scanners first.
     keypad_deregister_scanner((keypad_scanner_obj_t *)self);
 
-    for (size_t row = 0; row < common_hal_keypad_keymatrix_get_num_rows(self); row++) {
+    for (size_t row = 0; row < common_hal_keypad_keymatrix_get_row_count(self); row++) {
         common_hal_digitalio_digitalinout_deinit(self->row_digitalinouts->items[row]);
     }
     self->row_digitalinouts = MP_ROM_NONE;
 
-    for (size_t col = 0; col < common_hal_keypad_keymatrix_get_num_cols(self); col++) {
-        common_hal_digitalio_digitalinout_deinit(self->col_digitalinouts->items[col]);
+    for (size_t column = 0; column < common_hal_keypad_keymatrix_get_column_count(self); column++) {
+        common_hal_digitalio_digitalinout_deinit(self->column_digitalinouts->items[column]);
     }
-    self->col_digitalinouts = MP_ROM_NONE;
+    self->column_digitalinouts = MP_ROM_NONE;
 }
 
 bool common_hal_keypad_keymatrix_deinited(keypad_keymatrix_obj_t *self) {
     return self->row_digitalinouts == MP_ROM_NONE;
 }
 
-size_t common_hal_keypad_keymatrix_get_num_keys(keypad_keymatrix_obj_t *self) {
-    return common_hal_keypad_keymatrix_get_num_rows(self) * common_hal_keypad_keymatrix_get_num_cols(self);
+size_t common_hal_keypad_keymatrix_get_key_count(keypad_keymatrix_obj_t *self) {
+    return common_hal_keypad_keymatrix_get_row_count(self) * common_hal_keypad_keymatrix_get_column_count(self);
 }
 
-size_t common_hal_keypad_keymatrix_get_num_rows(keypad_keymatrix_obj_t *self) {
+size_t common_hal_keypad_keymatrix_get_row_count(keypad_keymatrix_obj_t *self) {
     return self->row_digitalinouts->len;
 }
 
-size_t common_hal_keypad_keymatrix_get_num_cols(keypad_keymatrix_obj_t *self) {
-    return self->col_digitalinouts->len;
+size_t common_hal_keypad_keymatrix_get_column_count(keypad_keymatrix_obj_t *self) {
+    return self->column_digitalinouts->len;
 }
 
-bool common_hal_keypad_keymatrix_pressed(keypad_keymatrix_obj_t *self, mp_uint_t key_num) {
-    return self->currently_pressed[key_num];
+bool common_hal_keypad_keymatrix_pressed(keypad_keymatrix_obj_t *self, mp_uint_t key_number) {
+    return self->currently_pressed[key_number];
 }
 
 // The length of states has already been validated.
-void common_hal_keypad_keymatrix_store_states(keypad_keymatrix_obj_t *self, uint8_t *states) {
+void common_hal_keypad_keymatrix_get_states_into(keypad_keymatrix_obj_t *self, uint8_t *states) {
     // Read the state atomically.
     supervisor_acquire_lock(&keypad_scanners_linked_list_lock);
-    memcpy(states, self->currently_pressed, common_hal_keypad_keymatrix_get_num_keys(self));
+    memcpy(states, self->currently_pressed, common_hal_keypad_keymatrix_get_key_count(self));
     supervisor_release_lock(&keypad_scanners_linked_list_lock);
 }
 
-mp_uint_t common_hal_keypad_keymatrix_key_num(keypad_keymatrix_obj_t *self, mp_uint_t row, mp_uint_t col) {
-    return row_col_to_key_num(self, row, col);
+mp_uint_t common_hal_keypad_keymatrix_row_column_to_key_number(keypad_keymatrix_obj_t *self, mp_uint_t row, mp_uint_t column) {
+    return row_column_to_key_number(self, row, column);
+}
+
+void common_hal_keypad_keymatrix_key_number_to_row_column(keypad_keymatrix_obj_t *self, mp_uint_t key_number, mp_uint_t *row, mp_uint_t *column) {
+    const size_t num_columns = common_hal_keypad_keymatrix_get_column_count(self);
+    *row = key_number / num_columns;
+    *column = key_number % num_columns;
 }
 
 mp_obj_t common_hal_keypad_keymatrix_get_events(keypad_keymatrix_obj_t *self) {
@@ -147,28 +153,35 @@ void keypad_keymatrix_scan(keypad_keymatrix_obj_t *self) {
 
     // On entry, all pins are set to inputs with a pull-up or pull-down,
     // depending on the diode orientation.
-    for (size_t row = 0; row < common_hal_keypad_keymatrix_get_num_rows(self); row++) {
+    for (size_t row = 0; row < common_hal_keypad_keymatrix_get_row_count(self); row++) {
         // Switch this row to an output and set level appropriately
         // Set low if columns_to_anodes is true, else set high.
         common_hal_digitalio_digitalinout_switch_to_output(
             self->row_digitalinouts->items[row], !self->columns_to_anodes, DRIVE_MODE_PUSH_PULL);
 
-        for (size_t col = 0; col < common_hal_keypad_keymatrix_get_num_cols(self); col++) {
-            mp_uint_t key_num = row_col_to_key_num(self, row, col);
-            const bool previous = self->currently_pressed[key_num];
-            self->previously_pressed[key_num] = previous;
+        for (size_t column = 0; column < common_hal_keypad_keymatrix_get_column_count(self); column++) {
+            mp_uint_t key_number = row_column_to_key_number(self, row, column);
+            const bool previous = self->currently_pressed[key_number];
+            self->previously_pressed[key_number] = previous;
 
-            // Get the current state, by reading whether the col got pulled to the row value or not.
+            // Get the current state, by reading whether the column got pulled to the row value or not.
             // If low and columns_to_anodes is true, the key is pressed.
             // If high and columns_to_anodes is false, the key is pressed.
             const bool current =
-                common_hal_digitalio_digitalinout_get_value(self->col_digitalinouts->items[col]) !=
+                common_hal_digitalio_digitalinout_get_value(self->column_digitalinouts->items[column]) !=
                 self->columns_to_anodes;
-            self->currently_pressed[key_num] = current;
+            self->currently_pressed[key_number] = current;
 
             // Record any transitions.
             if (previous != current) {
-                keypad_eventqueue_record(self->events, key_num, current);
+                if (!keypad_eventqueue_record(self->events, key_number, current)) {
+                    // The event queue is full. Reset all states to initial values and set the overflowed flag.
+                    const size_t key_count = common_hal_keypad_keymatrix_get_key_count(self);
+                    memset(self->previously_pressed, false, key_count);
+                    memset(self->currently_pressed, false, key_count);
+
+                    common_hal_keypad_eventqueue_set_overflowed(self->events, true);
+                }
             }
         }
 
diff --git a/shared-module/keypad/KeyMatrix.h b/shared-module/keypad/KeyMatrix.h
index 4f789aa382..bd7e2d23e2 100644
--- a/shared-module/keypad/KeyMatrix.h
+++ b/shared-module/keypad/KeyMatrix.h
@@ -39,7 +39,7 @@ typedef struct {
     // All scanners have a next field here, to keep a linked list of active scanners.
     keypad_scanner_obj_t *next;
     mp_obj_tuple_t *row_digitalinouts;
-    mp_obj_tuple_t *col_digitalinouts;
+    mp_obj_tuple_t *column_digitalinouts;
     mp_uint_t interval_ticks;
     uint64_t last_scan_ticks;
     bool *previously_pressed;
diff --git a/shared-module/keypad/Keys.c b/shared-module/keypad/Keys.c
index 5f5d2f3880..9443da85b6 100644
--- a/shared-module/keypad/Keys.c
+++ b/shared-module/keypad/Keys.c
@@ -75,7 +75,7 @@ void common_hal_keypad_keys_deinit(keypad_keys_obj_t *self) {
     // Remove self from the list of active keypad scanners first.
     keypad_deregister_scanner((keypad_scanner_obj_t *)self);
 
-    for (size_t key = 0; key < common_hal_keypad_keys_get_num_keys(self); key++) {
+    for (size_t key = 0; key < common_hal_keypad_keys_get_key_count(self); key++) {
         common_hal_digitalio_digitalinout_deinit(self->digitalinouts->items[key]);
     }
     self->digitalinouts = MP_ROM_NONE;
@@ -86,18 +86,18 @@ bool common_hal_keypad_keys_deinited(keypad_keys_obj_t *self) {
     return self->digitalinouts == MP_ROM_NONE;
 }
 
-size_t common_hal_keypad_keys_get_num_keys(keypad_keys_obj_t *self) {
+size_t common_hal_keypad_keys_get_key_count(keypad_keys_obj_t *self) {
     return self->digitalinouts->len;
 }
-bool common_hal_keypad_keys_pressed(keypad_keys_obj_t *self, mp_uint_t key_num) {
-    return self->currently_pressed[key_num];
+bool common_hal_keypad_keys_pressed(keypad_keys_obj_t *self, mp_uint_t key_number) {
+    return self->currently_pressed[key_number];
 }
 
 // The length of states has already been validated.
-void common_hal_keypad_keys_store_states(keypad_keys_obj_t *self, uint8_t *states) {
+void common_hal_keypad_keys_get_states_into(keypad_keys_obj_t *self, uint8_t *states) {
     // Read the state atomically.
     supervisor_acquire_lock(&keypad_scanners_linked_list_lock);
-    memcpy(states, self->currently_pressed, common_hal_keypad_keys_get_num_keys(self));
+    memcpy(states, self->currently_pressed, common_hal_keypad_keys_get_key_count(self));
     supervisor_release_lock(&keypad_scanners_linked_list_lock);
 }
 
@@ -114,20 +114,28 @@ void keypad_keys_scan(keypad_keys_obj_t *self) {
 
     self->last_scan_ticks = now;
 
-    for (mp_uint_t key_num = 0; key_num < common_hal_keypad_keys_get_num_keys(self); key_num++) {
+    const size_t key_count = common_hal_keypad_keys_get_key_count(self);
+
+    for (mp_uint_t key_number = 0; key_number < key_count; key_number++) {
         // Remember the previous up/down state.
-        const bool previous = self->currently_pressed[key_num];
-        self->previously_pressed[key_num] = previous;
+        const bool previous = self->currently_pressed[key_number];
+        self->previously_pressed[key_number] = previous;
 
         // Get the current state.
         const bool current =
-            common_hal_digitalio_digitalinout_get_value(self->digitalinouts->items[key_num]) ==
+            common_hal_digitalio_digitalinout_get_value(self->digitalinouts->items[key_number]) ==
             self->value_when_pressed;
-        self->currently_pressed[key_num] = current;
+        self->currently_pressed[key_number] = current;
 
         // Record any transitions.
         if (previous != current) {
-            keypad_eventqueue_record(self->events, key_num, current);
+            if (!keypad_eventqueue_record(self->events, key_number, current)) {
+                // The event queue is full. Reset all states to initial values and set the overflowed flag.
+                memset(self->previously_pressed, false, key_count);
+                memset(self->currently_pressed, false, key_count);
+
+                common_hal_keypad_eventqueue_set_overflowed(self->events, true);
+            }
         }
     }
 }
diff --git a/shared-module/keypad/ShiftRegisterKeys.c b/shared-module/keypad/ShiftRegisterKeys.c
index 5d7d956632..21bf103642 100644
--- a/shared-module/keypad/ShiftRegisterKeys.c
+++ b/shared-module/keypad/ShiftRegisterKeys.c
@@ -35,7 +35,7 @@
 #include "supervisor/port.h"
 #include "supervisor/shared/tick.h"
 
-void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_t *self, mcu_pin_obj_t *clock_pin, mcu_pin_obj_t *data_pin, mcu_pin_obj_t *latch_pin, bool value_to_latch, size_t num_keys, bool value_when_pressed, mp_float_t interval, size_t max_events) {
+void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_t *self, mcu_pin_obj_t *clock_pin, mcu_pin_obj_t *data_pin, mcu_pin_obj_t *latch_pin, bool value_to_latch, size_t key_count, bool value_when_pressed, mp_float_t interval, size_t max_events) {
 
     digitalio_digitalinout_obj_t *clock = m_new_obj(digitalio_digitalinout_obj_t);
     clock->base.type = &digitalio_digitalinout_type;
@@ -56,10 +56,10 @@ void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_
     self->latch = latch;
     self->value_to_latch = value_to_latch;
 
-    self->currently_pressed = (bool *)gc_alloc(sizeof(bool) * num_keys, false, false);
-    self->previously_pressed = (bool *)gc_alloc(sizeof(bool) * num_keys, false, false);
+    self->currently_pressed = (bool *)gc_alloc(sizeof(bool) * key_count, false, false);
+    self->previously_pressed = (bool *)gc_alloc(sizeof(bool) * key_count, false, false);
     self->value_when_pressed = value_when_pressed;
-    self->num_keys = num_keys;
+    self->key_count = key_count;
 
     self->interval_ticks = (mp_uint_t)(interval * 1024);   // interval * 1000 * (1024/1000)
     self->last_scan_ticks = port_get_raw_ticks(NULL);
@@ -98,18 +98,18 @@ bool common_hal_keypad_shiftregisterkeys_deinited(keypad_shiftregisterkeys_obj_t
     return self->clock == MP_ROM_NONE;
 }
 
-size_t common_hal_keypad_shiftregisterkeys_get_num_keys(keypad_shiftregisterkeys_obj_t *self) {
-    return self->num_keys;
+size_t common_hal_keypad_shiftregisterkeys_get_key_count(keypad_shiftregisterkeys_obj_t *self) {
+    return self->key_count;
 }
-bool common_hal_keypad_shiftregisterkeys_pressed(keypad_shiftregisterkeys_obj_t *self, mp_uint_t key_num) {
-    return self->currently_pressed[key_num];
+bool common_hal_keypad_shiftregisterkeys_pressed(keypad_shiftregisterkeys_obj_t *self, mp_uint_t key_number) {
+    return self->currently_pressed[key_number];
 }
 
 // The length of states has already been validated.
-void common_hal_keypad_shiftregisterkeys_store_states(keypad_shiftregisterkeys_obj_t *self, uint8_t *states) {
+void common_hal_keypad_shiftregisterkeys_get_states_into(keypad_shiftregisterkeys_obj_t *self, uint8_t *states) {
     // Read the state atomically.
     supervisor_acquire_lock(&keypad_scanners_linked_list_lock);
-    memcpy(states, self->currently_pressed, common_hal_keypad_shiftregisterkeys_get_num_keys(self));
+    memcpy(states, self->currently_pressed, common_hal_keypad_shiftregisterkeys_get_key_count(self));
     supervisor_release_lock(&keypad_scanners_linked_list_lock);
 }
 
@@ -129,25 +129,33 @@ void keypad_shiftregisterkeys_scan(keypad_shiftregisterkeys_obj_t *self) {
     // Latch (freeze) the current state of the input pins.
     common_hal_digitalio_digitalinout_set_value(self->latch, self->value_to_latch);
 
-    for (mp_uint_t key_num = 0; key_num < common_hal_keypad_shiftregisterkeys_get_num_keys(self); key_num++) {
+    const size_t key_count = common_hal_keypad_shiftregisterkeys_get_key_count(self);
+
+    for (mp_uint_t key_number = 0; key_number < key_count; key_number++) {
         // Zero-th data appears on on the data pin immediately, without shifting.
         common_hal_digitalio_digitalinout_set_value(self->clock, false);
 
         // Remember the previous up/down state.
-        const bool previous = self->currently_pressed[key_num];
-        self->previously_pressed[key_num] = previous;
+        const bool previous = self->currently_pressed[key_number];
+        self->previously_pressed[key_number] = previous;
 
         // Get the current state.
         const bool current =
             common_hal_digitalio_digitalinout_get_value(self->data) == self->value_when_pressed;
-        self->currently_pressed[key_num] = current;
+        self->currently_pressed[key_number] = current;
 
         // Trigger a shift to get the next bit.
         common_hal_digitalio_digitalinout_set_value(self->clock, true);
 
         // Record any transitions.
         if (previous != current) {
-            keypad_eventqueue_record(self->events, key_num, current);
+            if (!keypad_eventqueue_record(self->events, key_number, current)) {
+                // The event queue is full. Reset all states to initial values and set the overflowed flag.
+                memset(self->previously_pressed, false, key_count);
+                memset(self->currently_pressed, false, key_count);
+
+                common_hal_keypad_eventqueue_set_overflowed(self->events, true);
+            }
         }
     }
 
diff --git a/shared-module/keypad/ShiftRegisterKeys.h b/shared-module/keypad/ShiftRegisterKeys.h
index c685a7141c..b04c622679 100644
--- a/shared-module/keypad/ShiftRegisterKeys.h
+++ b/shared-module/keypad/ShiftRegisterKeys.h
@@ -41,7 +41,7 @@ typedef struct {
     digitalio_digitalinout_obj_t *clock;
     digitalio_digitalinout_obj_t *data;
     digitalio_digitalinout_obj_t *latch;
-    size_t num_keys;
+    size_t key_count;
     mp_uint_t interval_ticks;
     uint64_t last_scan_ticks;
     bool *previously_pressed;

From 9f65ccc61fc151d34f4ffd514c991d839477a1a6 Mon Sep 17 00:00:00 2001
From: hexthat <hexthat@gmail.com>
Date: Wed, 23 Jun 2021 03:32:07 +0000
Subject: [PATCH 290/349] Translated using Weblate (Chinese (Pinyin))

Currently translated at 100.0% (996 of 996 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/zh_Latn/
---
 locale/zh_Latn_pinyin.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 89e0c13a0d..0d245bc4e1 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: circuitpython-cn\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2021-06-19 20:18+0000\n"
+"PO-Revision-Date: 2021-06-23 17:15+0000\n"
 "Last-Translator: hexthat <hexthat@gmail.com>\n"
 "Language-Team: Chinese Hanyu Pinyin\n"
 "Language: zh_Latn_pinyin\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.7\n"
+"X-Generator: Weblate 4.7.1-dev\n"
 
 #: main.c
 msgid ""
@@ -127,7 +127,7 @@ msgstr "%q bìxū shì chángdù wèi 2 de yuán zǔ"
 
 #: ports/esp32s2/common-hal/imagecapture/ParallelImageCapture.c
 msgid "%q must be between %d and %d"
-msgstr ""
+msgstr "%q bì xū zài %d hé %d zhī jiān"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
@@ -1309,7 +1309,7 @@ msgstr "wú xiào data_count %d"
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
 msgid "Invalid data_pins[%d]"
-msgstr ""
+msgstr "wú xiào data_pins[%d]"
 
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid direction."

From b9b8757ca2483e8d6738b80923e8fbb6756ed669 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Wed, 23 Jun 2021 19:15:29 +0200
Subject: [PATCH 291/349] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/
---
 locale/ID.po             | 8 ++++++++
 locale/cs.po             | 8 ++++++++
 locale/de_DE.po          | 8 ++++++++
 locale/el.po             | 8 ++++++++
 locale/en_GB.po          | 8 ++++++++
 locale/es.po             | 8 ++++++++
 locale/fil.po            | 8 ++++++++
 locale/fr.po             | 8 ++++++++
 locale/hi.po             | 8 ++++++++
 locale/it_IT.po          | 8 ++++++++
 locale/ja.po             | 8 ++++++++
 locale/ko.po             | 8 ++++++++
 locale/nl.po             | 8 ++++++++
 locale/pl.po             | 8 ++++++++
 locale/pt_BR.po          | 8 ++++++++
 locale/sv.po             | 8 ++++++++
 locale/zh_Latn_pinyin.po | 8 ++++++++
 17 files changed, 136 insertions(+)

diff --git a/locale/ID.po b/locale/ID.po
index 44622b1cc6..b1de659e15 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -2589,6 +2589,10 @@ msgstr "typecode buruk"
 msgid "binary op %q not implemented"
 msgstr ""
 
+#: extmod/modurandom.c
+msgid "bits must be 32 or less"
+msgstr ""
+
 #: shared-bindings/busio/UART.c
 msgid "bits must be in range 5 to 9"
 msgstr ""
@@ -3200,6 +3204,10 @@ msgstr ""
 msgid "graphic must be 2048 bytes long"
 msgstr ""
 
+#: extmod/moduhashlib.c
+msgid "hash is final"
+msgstr ""
+
 #: extmod/moduheapq.c
 msgid "heap must be a list"
 msgstr "heap harus berupa sebuah list"
diff --git a/locale/cs.po b/locale/cs.po
index e15c1db9f7..a1dbcf69e1 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -2550,6 +2550,10 @@ msgstr ""
 msgid "binary op %q not implemented"
 msgstr ""
 
+#: extmod/modurandom.c
+msgid "bits must be 32 or less"
+msgstr ""
+
 #: shared-bindings/busio/UART.c
 msgid "bits must be in range 5 to 9"
 msgstr ""
@@ -3161,6 +3165,10 @@ msgstr ""
 msgid "graphic must be 2048 bytes long"
 msgstr ""
 
+#: extmod/moduhashlib.c
+msgid "hash is final"
+msgstr ""
+
 #: extmod/moduheapq.c
 msgid "heap must be a list"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index d69eb166d4..95d7ffde57 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2595,6 +2595,10 @@ msgstr "Falscher Typcode"
 msgid "binary op %q not implemented"
 msgstr "Der binäre Operator %q ist nicht implementiert"
 
+#: extmod/modurandom.c
+msgid "bits must be 32 or less"
+msgstr ""
+
 #: shared-bindings/busio/UART.c
 msgid "bits must be in range 5 to 9"
 msgstr ""
@@ -3220,6 +3224,10 @@ msgstr ""
 msgid "graphic must be 2048 bytes long"
 msgstr "graphic muss 2048 Byte lang sein"
 
+#: extmod/moduhashlib.c
+msgid "hash is final"
+msgstr ""
+
 #: extmod/moduheapq.c
 msgid "heap must be a list"
 msgstr "heap muss eine Liste sein"
diff --git a/locale/el.po b/locale/el.po
index c8d5ea37a4..4997e10fd2 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -2547,6 +2547,10 @@ msgstr ""
 msgid "binary op %q not implemented"
 msgstr ""
 
+#: extmod/modurandom.c
+msgid "bits must be 32 or less"
+msgstr ""
+
 #: shared-bindings/busio/UART.c
 msgid "bits must be in range 5 to 9"
 msgstr ""
@@ -3158,6 +3162,10 @@ msgstr ""
 msgid "graphic must be 2048 bytes long"
 msgstr ""
 
+#: extmod/moduhashlib.c
+msgid "hash is final"
+msgstr ""
+
 #: extmod/moduheapq.c
 msgid "heap must be a list"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 970dd26a0e..54df9949a7 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -2582,6 +2582,10 @@ msgstr "bad typecode"
 msgid "binary op %q not implemented"
 msgstr "binary op %q not implemented"
 
+#: extmod/modurandom.c
+msgid "bits must be 32 or less"
+msgstr ""
+
 #: shared-bindings/busio/UART.c
 msgid "bits must be in range 5 to 9"
 msgstr "bits must be in range 5 to 9"
@@ -3196,6 +3200,10 @@ msgstr ""
 msgid "graphic must be 2048 bytes long"
 msgstr "graphic must be 2048 bytes long"
 
+#: extmod/moduhashlib.c
+msgid "hash is final"
+msgstr ""
+
 #: extmod/moduheapq.c
 msgid "heap must be a list"
 msgstr "heap must be a list"
diff --git a/locale/es.po b/locale/es.po
index 720347396d..0e9dc6e851 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -2626,6 +2626,10 @@ msgstr "typecode erroneo"
 msgid "binary op %q not implemented"
 msgstr "operacion binaria %q no implementada"
 
+#: extmod/modurandom.c
+msgid "bits must be 32 or less"
+msgstr ""
+
 #: shared-bindings/busio/UART.c
 msgid "bits must be in range 5 to 9"
 msgstr "los bits deben estar en el rango de 5 a 9"
@@ -3244,6 +3248,10 @@ msgstr "el generador genero StopIteration"
 msgid "graphic must be 2048 bytes long"
 msgstr "graphic debe ser 2048 bytes de largo"
 
+#: extmod/moduhashlib.c
+msgid "hash is final"
+msgstr ""
+
 #: extmod/moduheapq.c
 msgid "heap must be a list"
 msgstr "heap debe ser una lista"
diff --git a/locale/fil.po b/locale/fil.po
index aff73c5fe8..74f638ee46 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -2575,6 +2575,10 @@ msgstr "masamang typecode"
 msgid "binary op %q not implemented"
 msgstr "binary op %q hindi implemented"
 
+#: extmod/modurandom.c
+msgid "bits must be 32 or less"
+msgstr ""
+
 #: shared-bindings/busio/UART.c
 msgid "bits must be in range 5 to 9"
 msgstr ""
@@ -3199,6 +3203,10 @@ msgstr ""
 msgid "graphic must be 2048 bytes long"
 msgstr "graphic ay dapat 2048 bytes ang haba"
 
+#: extmod/moduhashlib.c
+msgid "hash is final"
+msgstr ""
+
 #: extmod/moduheapq.c
 msgid "heap must be a list"
 msgstr "list dapat ang heap"
diff --git a/locale/fr.po b/locale/fr.po
index 8374c09032..ec58a2c8ca 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -2628,6 +2628,10 @@ msgstr "mauvais code type"
 msgid "binary op %q not implemented"
 msgstr "opération binaire '%q' non implémentée"
 
+#: extmod/modurandom.c
+msgid "bits must be 32 or less"
+msgstr ""
+
 #: shared-bindings/busio/UART.c
 msgid "bits must be in range 5 to 9"
 msgstr "les bits doivent être compris entre 5 et 9"
@@ -3252,6 +3256,10 @@ msgstr "générateur (generator) à surlevé StopIteration"
 msgid "graphic must be 2048 bytes long"
 msgstr "graphic doit être long de 2048 octets"
 
+#: extmod/moduhashlib.c
+msgid "hash is final"
+msgstr ""
+
 #: extmod/moduheapq.c
 msgid "heap must be a list"
 msgstr "le tas doit être une liste"
diff --git a/locale/hi.po b/locale/hi.po
index 6462e14c93..b78020f23d 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -2547,6 +2547,10 @@ msgstr ""
 msgid "binary op %q not implemented"
 msgstr ""
 
+#: extmod/modurandom.c
+msgid "bits must be 32 or less"
+msgstr ""
+
 #: shared-bindings/busio/UART.c
 msgid "bits must be in range 5 to 9"
 msgstr ""
@@ -3158,6 +3162,10 @@ msgstr ""
 msgid "graphic must be 2048 bytes long"
 msgstr ""
 
+#: extmod/moduhashlib.c
+msgid "hash is final"
+msgstr ""
+
 #: extmod/moduheapq.c
 msgid "heap must be a list"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 12974df63f..c0f81e37fe 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -2590,6 +2590,10 @@ msgstr ""
 msgid "binary op %q not implemented"
 msgstr "operazione binaria %q non implementata"
 
+#: extmod/modurandom.c
+msgid "bits must be 32 or less"
+msgstr ""
+
 #: shared-bindings/busio/UART.c
 msgid "bits must be in range 5 to 9"
 msgstr ""
@@ -3212,6 +3216,10 @@ msgstr ""
 msgid "graphic must be 2048 bytes long"
 msgstr "graphic deve essere lunga 2048 byte"
 
+#: extmod/moduhashlib.c
+msgid "hash is final"
+msgstr ""
+
 #: extmod/moduheapq.c
 msgid "heap must be a list"
 msgstr "l'heap deve essere una lista"
diff --git a/locale/ja.po b/locale/ja.po
index 93e76b040c..30623960ab 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -2562,6 +2562,10 @@ msgstr "不正なtypecode"
 msgid "binary op %q not implemented"
 msgstr ""
 
+#: extmod/modurandom.c
+msgid "bits must be 32 or less"
+msgstr ""
+
 #: shared-bindings/busio/UART.c
 msgid "bits must be in range 5 to 9"
 msgstr ""
@@ -3177,6 +3181,10 @@ msgstr ""
 msgid "graphic must be 2048 bytes long"
 msgstr "graphicは2048バイトでなければなりません"
 
+#: extmod/moduhashlib.c
+msgid "hash is final"
+msgstr ""
+
 #: extmod/moduheapq.c
 msgid "heap must be a list"
 msgstr "heapにはリストが必要"
diff --git a/locale/ko.po b/locale/ko.po
index 623eeb6b90..85008b8810 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -2551,6 +2551,10 @@ msgstr ""
 msgid "binary op %q not implemented"
 msgstr ""
 
+#: extmod/modurandom.c
+msgid "bits must be 32 or less"
+msgstr ""
+
 #: shared-bindings/busio/UART.c
 msgid "bits must be in range 5 to 9"
 msgstr ""
@@ -3162,6 +3166,10 @@ msgstr ""
 msgid "graphic must be 2048 bytes long"
 msgstr ""
 
+#: extmod/moduhashlib.c
+msgid "hash is final"
+msgstr ""
+
 #: extmod/moduheapq.c
 msgid "heap must be a list"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index be285c0d9b..a8beb7cf7a 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -2588,6 +2588,10 @@ msgstr "verkeerde typecode"
 msgid "binary op %q not implemented"
 msgstr "binaire op %q niet geïmplementeerd"
 
+#: extmod/modurandom.c
+msgid "bits must be 32 or less"
+msgstr ""
+
 #: shared-bindings/busio/UART.c
 msgid "bits must be in range 5 to 9"
 msgstr ""
@@ -3204,6 +3208,10 @@ msgstr ""
 msgid "graphic must be 2048 bytes long"
 msgstr "graphic moet 2048 bytes lang zijn"
 
+#: extmod/moduhashlib.c
+msgid "hash is final"
+msgstr ""
+
 #: extmod/moduheapq.c
 msgid "heap must be a list"
 msgstr "heap moet een lijst zijn"
diff --git a/locale/pl.po b/locale/pl.po
index 195007d9c8..b00fd112c5 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -2564,6 +2564,10 @@ msgstr "zły typecode"
 msgid "binary op %q not implemented"
 msgstr "brak dwu-argumentowego operatora %q"
 
+#: extmod/modurandom.c
+msgid "bits must be 32 or less"
+msgstr ""
+
 #: shared-bindings/busio/UART.c
 msgid "bits must be in range 5 to 9"
 msgstr ""
@@ -3176,6 +3180,10 @@ msgstr ""
 msgid "graphic must be 2048 bytes long"
 msgstr "graphic musi mieć 2048 bajtów długości"
 
+#: extmod/moduhashlib.c
+msgid "hash is final"
+msgstr ""
+
 #: extmod/moduheapq.c
 msgid "heap must be a list"
 msgstr "heap musi być listą"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 79c836bbd1..8150f56432 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -2631,6 +2631,10 @@ msgstr "typecode incorreto"
 msgid "binary op %q not implemented"
 msgstr "a operação binário %q não foi implementada"
 
+#: extmod/modurandom.c
+msgid "bits must be 32 or less"
+msgstr ""
+
 #: shared-bindings/busio/UART.c
 msgid "bits must be in range 5 to 9"
 msgstr "os bits devem estar na faixa entre 5 a 9"
@@ -3251,6 +3255,10 @@ msgstr "gerador StopIteration elevado"
 msgid "graphic must be 2048 bytes long"
 msgstr "o gráfico deve ter 2048 bytes de comprimento"
 
+#: extmod/moduhashlib.c
+msgid "hash is final"
+msgstr ""
+
 #: extmod/moduheapq.c
 msgid "heap must be a list"
 msgstr "a área de alocação dinâmica de variáveis (heap) deve ser uma lista"
diff --git a/locale/sv.po b/locale/sv.po
index 1e1902a596..db863169ba 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -2601,6 +2601,10 @@ msgstr "Ogiltig typkod"
 msgid "binary op %q not implemented"
 msgstr "binär op %q är inte implementerad"
 
+#: extmod/modurandom.c
+msgid "bits must be 32 or less"
+msgstr ""
+
 #: shared-bindings/busio/UART.c
 msgid "bits must be in range 5 to 9"
 msgstr "bits måste mellan 5 och 9"
@@ -3217,6 +3221,10 @@ msgstr "generator kastade StopIteration"
 msgid "graphic must be 2048 bytes long"
 msgstr "graphic måste vara 2048 byte lång"
 
+#: extmod/moduhashlib.c
+msgid "hash is final"
+msgstr ""
+
 #: extmod/moduheapq.c
 msgid "heap must be a list"
 msgstr "heap måste vara en lista"
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 0d245bc4e1..94cb6b0277 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -2600,6 +2600,10 @@ msgstr "cuòwù de dàimǎ lèixíng"
 msgid "binary op %q not implemented"
 msgstr "èrjìnzhì bǎn qián bǎn %q wèi zhíxíng"
 
+#: extmod/modurandom.c
+msgid "bits must be 32 or less"
+msgstr ""
+
 #: shared-bindings/busio/UART.c
 msgid "bits must be in range 5 to 9"
 msgstr "wèi bì xū zài fàn wéi nèi 5 zhì 9"
@@ -3217,6 +3221,10 @@ msgstr "fā diàn jī tí chū tíng zhǐ"
 msgid "graphic must be 2048 bytes long"
 msgstr "túxíng bìxū wèi 2048 zì jié"
 
+#: extmod/moduhashlib.c
+msgid "hash is final"
+msgstr ""
+
 #: extmod/moduheapq.c
 msgid "heap must be a list"
 msgstr "duī bìxū shì yīgè lièbiǎo"

From 7774b18895d4f2bad8d4d4a72acbb33619490daa Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Wed, 23 Jun 2021 14:54:52 -0400
Subject: [PATCH 292/349] Add reset() to scanners. Clear .overflow on
 EventQueue.clear().

---
 shared-bindings/keypad/EventQueue.c        | 16 ++++------------
 shared-bindings/keypad/KeyMatrix.c         | 16 ++++++++++++++++
 shared-bindings/keypad/KeyMatrix.h         |  1 +
 shared-bindings/keypad/Keys.c              | 18 +++++++++++++++++-
 shared-bindings/keypad/Keys.h              |  1 +
 shared-bindings/keypad/ShiftRegisterKeys.c | 20 ++++++++++++++++++--
 shared-bindings/keypad/ShiftRegisterKeys.h |  1 +
 shared-module/keypad/EventQueue.c          | 20 +++++++++++---------
 shared-module/keypad/KeyMatrix.c           | 18 ++++++++++--------
 shared-module/keypad/Keys.c                | 17 ++++++++++-------
 shared-module/keypad/ShiftRegisterKeys.c   | 17 ++++++++++-------
 11 files changed, 99 insertions(+), 46 deletions(-)

diff --git a/shared-bindings/keypad/EventQueue.c b/shared-bindings/keypad/EventQueue.c
index 72bbd06452..6a0e904ed1 100644
--- a/shared-bindings/keypad/EventQueue.c
+++ b/shared-bindings/keypad/EventQueue.c
@@ -83,7 +83,7 @@ STATIC mp_obj_t keypad_eventqueue_get_into(mp_obj_t self_in, mp_obj_t event_in)
 MP_DEFINE_CONST_FUN_OBJ_2(keypad_eventqueue_get_into_obj, keypad_eventqueue_get_into);
 
 //|     def clear(self) -> None:
-//|         """Clear any queued key transition events.
+//|         """Clear any queued key transition events. Also sets `overflowed` to ``False``.
 //|         """
 //|         ...
 //|
@@ -119,9 +119,8 @@ STATIC mp_obj_t keypad_eventqueue_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 }
 
 //|     overflowed: bool
-//|     """``True`` if an event could not be added to the event queue because it was full.
-//|     When this happens, the event queue is cleared.
-//|     The `overflowed` flag is persistent. Reset it by setting it to ``False``.
+//|     """``True`` if an event could not be added to the event queue because it was full. (read-only)
+//|     Set to ``False`` by  `clear()`.
 //|     """
 //|
 STATIC mp_obj_t keypad_eventqueue_get_overflowed(mp_obj_t self_in) {
@@ -130,17 +129,10 @@ STATIC mp_obj_t keypad_eventqueue_get_overflowed(mp_obj_t self_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(keypad_eventqueue_get_overflowed_obj, keypad_eventqueue_get_overflowed);
 
-STATIC mp_obj_t keypad_eventqueue_set_overflowed(mp_obj_t self_in, mp_obj_t overflowed_in) {
-    keypad_eventqueue_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    common_hal_keypad_eventqueue_set_overflowed(self, mp_obj_is_true(overflowed_in));
-    return MP_ROM_NONE;
-}
-MP_DEFINE_CONST_FUN_OBJ_2(keypad_eventqueue_set_overflowed_obj, keypad_eventqueue_set_overflowed);
-
 const mp_obj_property_t keypad_eventqueue_overflowed_obj = {
     .base.type = &mp_type_property,
     .proxy = {(mp_obj_t)&keypad_eventqueue_get_overflowed_obj,
-              (mp_obj_t)&keypad_eventqueue_set_overflowed_obj,
+              MP_ROM_NONE,
               MP_ROM_NONE},
 };
 
diff --git a/shared-bindings/keypad/KeyMatrix.c b/shared-bindings/keypad/KeyMatrix.c
index fc29f67e33..506add0713 100644
--- a/shared-bindings/keypad/KeyMatrix.c
+++ b/shared-bindings/keypad/KeyMatrix.c
@@ -141,6 +141,21 @@ STATIC void check_for_deinit(keypad_keymatrix_obj_t *self) {
     }
 }
 
+//|     def reset(self) -> None:
+//|         """Reset the internal state of the scanner to assume that all keys are now released.
+//|         Any key that is already pressed at the time of this call will therefore immediately cause
+//|         a new key-pressed event to occur.
+//|         """
+//|         ...
+//|
+STATIC mp_obj_t keypad_keymatrix_reset(mp_obj_t self_in) {
+    keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    common_hal_keypad_keymatrix_reset(self);
+    return MP_ROM_NONE;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_keymatrix_reset_obj, keypad_keymatrix_reset);
+
 //|     key_count: int
 //|     """The number of keys that are being scanned. (read-only)
 //|     """
@@ -282,6 +297,7 @@ STATIC const mp_rom_map_elem_t keypad_keymatrix_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_row_column_to_key_number), MP_ROM_PTR(&keypad_keymatrix_row_column_to_key_number_obj) },
     { MP_ROM_QSTR(MP_QSTR_key_count),                MP_ROM_PTR(&keypad_keymatrix_key_count_obj) },
     { MP_ROM_QSTR(MP_QSTR_pressed),                  MP_ROM_PTR(&keypad_keymatrix_pressed_obj) },
+    { MP_ROM_QSTR(MP_QSTR_reset),                    MP_ROM_PTR(&keypad_keymatrix_reset_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(keypad_keymatrix_locals_dict, keypad_keymatrix_locals_dict_table);
diff --git a/shared-bindings/keypad/KeyMatrix.h b/shared-bindings/keypad/KeyMatrix.h
index 98152f759a..6643d2f9fd 100644
--- a/shared-bindings/keypad/KeyMatrix.h
+++ b/shared-bindings/keypad/KeyMatrix.h
@@ -46,6 +46,7 @@ mp_uint_t common_hal_keypad_keymatrix_get_row_count(keypad_keymatrix_obj_t *self
 
 mp_obj_t common_hal_keypad_keymatrix_get_events(keypad_keymatrix_obj_t *self);
 bool common_hal_keypad_keymatrix_pressed(keypad_keymatrix_obj_t *self, mp_uint_t key_number);
+void common_hal_keypad_keymatrix_reset(keypad_keymatrix_obj_t *self);
 void common_hal_keypad_keymatrix_get_states_into(keypad_keymatrix_obj_t *self, uint8_t *states);
 
 #endif  // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_KEYMATRIX_H
diff --git a/shared-bindings/keypad/Keys.c b/shared-bindings/keypad/Keys.c
index 95e68e9bd1..9c5ca08bf3 100644
--- a/shared-bindings/keypad/Keys.c
+++ b/shared-bindings/keypad/Keys.c
@@ -135,6 +135,21 @@ STATIC void check_for_deinit(keypad_keys_obj_t *self) {
     }
 }
 
+//|     def reset(self) -> None:
+//|         """Reset the internal state of the scanner to assume that all keys are now released.
+//|         Any key that is already pressed at the time of this call will therefore immediately cause
+//|         a new key-pressed event to occur.
+//|         """
+//|         ...
+//|
+STATIC mp_obj_t keypad_keys_reset(mp_obj_t self_in) {
+    keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    common_hal_keypad_keys_reset(self);
+    return MP_ROM_NONE;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_keys_reset_obj, keypad_keys_reset);
+
 //|     key_count: int
 //|     """The number of keys that are being scanned. (read-only)
 //|     """
@@ -218,9 +233,10 @@ STATIC const mp_rom_map_elem_t keypad_keys_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR___exit__),     MP_ROM_PTR(&keypad_keys___exit___obj) },
 
     { MP_ROM_QSTR(MP_QSTR_events),       MP_ROM_PTR(&keypad_keys_events_obj) },
+    { MP_ROM_QSTR(MP_QSTR_get_states_into), MP_ROM_PTR(&keypad_keys_get_states_into_obj) },
     { MP_ROM_QSTR(MP_QSTR_key_count),     MP_ROM_PTR(&keypad_keys_key_count_obj) },
     { MP_ROM_QSTR(MP_QSTR_pressed),      MP_ROM_PTR(&keypad_keys_pressed_obj) },
-    { MP_ROM_QSTR(MP_QSTR_get_states_into), MP_ROM_PTR(&keypad_keys_get_states_into_obj) },
+    { MP_ROM_QSTR(MP_QSTR_reset),        MP_ROM_PTR(&keypad_keys_reset_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(keypad_keys_locals_dict, keypad_keys_locals_dict_table);
diff --git a/shared-bindings/keypad/Keys.h b/shared-bindings/keypad/Keys.h
index 3ac3dd43b2..4d45d9e06a 100644
--- a/shared-bindings/keypad/Keys.h
+++ b/shared-bindings/keypad/Keys.h
@@ -40,6 +40,7 @@ bool common_hal_keypad_keys_deinited(keypad_keys_obj_t *self);
 mp_obj_t common_hal_keypad_keys_get_events(keypad_keys_obj_t *self);
 mp_uint_t common_hal_keypad_keys_get_key_count(keypad_keys_obj_t *self);
 bool common_hal_keypad_keys_pressed(keypad_keys_obj_t *self, mp_uint_t key_number);
+void common_hal_keypad_keys_reset(keypad_keys_obj_t *self);
 void common_hal_keypad_keys_get_states_into(keypad_keys_obj_t *self, uint8_t *states);
 
 #endif  // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_KEYS_H
diff --git a/shared-bindings/keypad/ShiftRegisterKeys.c b/shared-bindings/keypad/ShiftRegisterKeys.c
index e5d959348c..c76910726f 100644
--- a/shared-bindings/keypad/ShiftRegisterKeys.c
+++ b/shared-bindings/keypad/ShiftRegisterKeys.c
@@ -139,6 +139,21 @@ STATIC void check_for_deinit(keypad_shiftregisterkeys_obj_t *self) {
     }
 }
 
+//|     def reset(self) -> None:
+//|         """Reset the internal state of the scanner to assume that all keys are now released.
+//|         Any key that is already pressed at the time of this call will therefore immediately cause
+//|         a new key-pressed event to occur.
+//|         """
+//|         ...
+//|
+STATIC mp_obj_t keypad_shiftregisterkeys_reset(mp_obj_t self_in) {
+    keypad_shiftregisterkeys_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    common_hal_keypad_shiftregisterkeys_reset(self);
+    return MP_ROM_NONE;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(keypad_shiftregisterkeys_reset_obj, keypad_shiftregisterkeys_reset);
+
 //|     key_count: int
 //|     """The number of keys that are being scanned. (read-only)
 //|     """
@@ -223,9 +238,10 @@ STATIC const mp_rom_map_elem_t keypad_shiftregisterkeys_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR___exit__),     MP_ROM_PTR(&keypad_shiftregisterkeys___exit___obj) },
 
     { MP_ROM_QSTR(MP_QSTR_events),       MP_ROM_PTR(&keypad_shiftregisterkeys_events_obj) },
-    { MP_ROM_QSTR(MP_QSTR_key_count),     MP_ROM_PTR(&keypad_shiftregisterkeys_key_count_obj) },
-    { MP_ROM_QSTR(MP_QSTR_pressed),      MP_ROM_PTR(&keypad_shiftregisterkeys_pressed_obj) },
     { MP_ROM_QSTR(MP_QSTR_get_states_into), MP_ROM_PTR(&keypad_shiftregisterkeys_get_states_into_obj) },
+    { MP_ROM_QSTR(MP_QSTR_key_count),    MP_ROM_PTR(&keypad_shiftregisterkeys_key_count_obj) },
+    { MP_ROM_QSTR(MP_QSTR_pressed),      MP_ROM_PTR(&keypad_shiftregisterkeys_pressed_obj) },
+    { MP_ROM_QSTR(MP_QSTR_reset),        MP_ROM_PTR(&keypad_shiftregisterkeys_reset_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(keypad_shiftregisterkeys_locals_dict, keypad_shiftregisterkeys_locals_dict_table);
diff --git a/shared-bindings/keypad/ShiftRegisterKeys.h b/shared-bindings/keypad/ShiftRegisterKeys.h
index 9aced14466..b81b3b45e6 100644
--- a/shared-bindings/keypad/ShiftRegisterKeys.h
+++ b/shared-bindings/keypad/ShiftRegisterKeys.h
@@ -40,6 +40,7 @@ bool common_hal_keypad_shiftregisterkeys_deinited(keypad_shiftregisterkeys_obj_t
 mp_obj_t common_hal_keypad_shiftregisterkeys_get_events(keypad_shiftregisterkeys_obj_t *self);
 mp_uint_t common_hal_keypad_shiftregisterkeys_get_key_count(keypad_shiftregisterkeys_obj_t *self);
 bool common_hal_keypad_shiftregisterkeys_pressed(keypad_shiftregisterkeys_obj_t *self, mp_uint_t key_number);
+void common_hal_keypad_shiftregisterkeys_reset(keypad_shiftregisterkeys_obj_t *self);
 void common_hal_keypad_shiftregisterkeys_get_states_into(keypad_shiftregisterkeys_obj_t *self, uint8_t *states);
 
 #endif  // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_SHIFTREGISTERKEYS_H
diff --git a/shared-module/keypad/EventQueue.c b/shared-module/keypad/EventQueue.c
index 204c5d21dc..5986a29ce8 100644
--- a/shared-module/keypad/EventQueue.c
+++ b/shared-module/keypad/EventQueue.c
@@ -60,14 +60,6 @@ bool common_hal_keypad_eventqueue_get_into(keypad_eventqueue_obj_t *self, keypad
     return true;
 }
 
-void common_hal_keypad_eventqueue_clear(keypad_eventqueue_obj_t *self) {
-    ringbuf_clear(&self->encoded_events);
-}
-
-size_t common_hal_keypad_eventqueue_get_length(keypad_eventqueue_obj_t *self) {
-    return ringbuf_num_filled(&self->encoded_events);
-}
-
 bool common_hal_keypad_eventqueue_get_overflowed(keypad_eventqueue_obj_t *self) {
     return self->overflowed;
 }
@@ -76,9 +68,19 @@ void common_hal_keypad_eventqueue_set_overflowed(keypad_eventqueue_obj_t *self,
     self->overflowed = overflowed;
 }
 
+void common_hal_keypad_eventqueue_clear(keypad_eventqueue_obj_t *self) {
+    ringbuf_clear(&self->encoded_events);
+    common_hal_keypad_eventqueue_set_overflowed(self, false);
+}
+
+size_t common_hal_keypad_eventqueue_get_length(keypad_eventqueue_obj_t *self) {
+    return ringbuf_num_filled(&self->encoded_events);
+}
+
 bool keypad_eventqueue_record(keypad_eventqueue_obj_t *self, mp_uint_t key_number, bool pressed) {
     if (ringbuf_num_empty(&self->encoded_events) == 0) {
-        // Queue is full. The caller will decide what to do, including whether to set the overflowed flag.
+        // Queue is full. Set the overflow flag. The caller will decide what else to do.
+        common_hal_keypad_eventqueue_set_overflowed(self, true);
         return false;
     }
 
diff --git a/shared-module/keypad/KeyMatrix.c b/shared-module/keypad/KeyMatrix.c
index 3cf7c89a91..ac2e715dbd 100644
--- a/shared-module/keypad/KeyMatrix.c
+++ b/shared-module/keypad/KeyMatrix.c
@@ -142,6 +142,15 @@ mp_obj_t common_hal_keypad_keymatrix_get_events(keypad_keymatrix_obj_t *self) {
     return MP_OBJ_FROM_PTR(self->events);
 }
 
+void common_hal_keypad_keymatrix_reset(keypad_keymatrix_obj_t *self) {
+    const size_t key_count = common_hal_keypad_keymatrix_get_key_count(self);
+
+    supervisor_acquire_lock(&keypad_scanners_linked_list_lock);
+    memset(self->previously_pressed, false, key_count);
+    memset(self->currently_pressed, false, key_count);
+    supervisor_release_lock(&keypad_scanners_linked_list_lock);
+}
+
 void keypad_keymatrix_scan(keypad_keymatrix_obj_t *self) {
     uint64_t now = port_get_raw_ticks(NULL);
     if (now - self->last_scan_ticks < self->interval_ticks) {
@@ -174,14 +183,7 @@ void keypad_keymatrix_scan(keypad_keymatrix_obj_t *self) {
 
             // Record any transitions.
             if (previous != current) {
-                if (!keypad_eventqueue_record(self->events, key_number, current)) {
-                    // The event queue is full. Reset all states to initial values and set the overflowed flag.
-                    const size_t key_count = common_hal_keypad_keymatrix_get_key_count(self);
-                    memset(self->previously_pressed, false, key_count);
-                    memset(self->currently_pressed, false, key_count);
-
-                    common_hal_keypad_eventqueue_set_overflowed(self->events, true);
-                }
+                keypad_eventqueue_record(self->events, key_number, current);
             }
         }
 
diff --git a/shared-module/keypad/Keys.c b/shared-module/keypad/Keys.c
index 9443da85b6..c621a757d2 100644
--- a/shared-module/keypad/Keys.c
+++ b/shared-module/keypad/Keys.c
@@ -105,6 +105,15 @@ mp_obj_t common_hal_keypad_keys_get_events(keypad_keys_obj_t *self) {
     return MP_OBJ_FROM_PTR(self->events);
 }
 
+void common_hal_keypad_keys_reset(keypad_keys_obj_t *self) {
+    const size_t key_count = common_hal_keypad_keys_get_key_count(self);
+
+    supervisor_acquire_lock(&keypad_scanners_linked_list_lock);
+    memset(self->previously_pressed, false, key_count);
+    memset(self->currently_pressed, false, key_count);
+    supervisor_release_lock(&keypad_scanners_linked_list_lock);
+}
+
 void keypad_keys_scan(keypad_keys_obj_t *self) {
     uint64_t now = port_get_raw_ticks(NULL);
     if (now - self->last_scan_ticks < self->interval_ticks) {
@@ -129,13 +138,7 @@ void keypad_keys_scan(keypad_keys_obj_t *self) {
 
         // Record any transitions.
         if (previous != current) {
-            if (!keypad_eventqueue_record(self->events, key_number, current)) {
-                // The event queue is full. Reset all states to initial values and set the overflowed flag.
-                memset(self->previously_pressed, false, key_count);
-                memset(self->currently_pressed, false, key_count);
-
-                common_hal_keypad_eventqueue_set_overflowed(self->events, true);
-            }
+            keypad_eventqueue_record(self->events, key_number, current);
         }
     }
 }
diff --git a/shared-module/keypad/ShiftRegisterKeys.c b/shared-module/keypad/ShiftRegisterKeys.c
index 21bf103642..fd5d8bbdb1 100644
--- a/shared-module/keypad/ShiftRegisterKeys.c
+++ b/shared-module/keypad/ShiftRegisterKeys.c
@@ -117,6 +117,15 @@ mp_obj_t common_hal_keypad_shiftregisterkeys_get_events(keypad_shiftregisterkeys
     return MP_OBJ_FROM_PTR(self->events);
 }
 
+void common_hal_keypad_shiftregisterkeys_reset(keypad_shiftregisterkeys_obj_t *self) {
+    const size_t key_count = common_hal_keypad_shiftregisterkeys_get_key_count(self);
+
+    supervisor_acquire_lock(&keypad_scanners_linked_list_lock);
+    memset(self->previously_pressed, false, key_count);
+    memset(self->currently_pressed, false, key_count);
+    supervisor_release_lock(&keypad_scanners_linked_list_lock);
+}
+
 void keypad_shiftregisterkeys_scan(keypad_shiftregisterkeys_obj_t *self) {
     uint64_t now = port_get_raw_ticks(NULL);
     if (now - self->last_scan_ticks < self->interval_ticks) {
@@ -149,13 +158,7 @@ void keypad_shiftregisterkeys_scan(keypad_shiftregisterkeys_obj_t *self) {
 
         // Record any transitions.
         if (previous != current) {
-            if (!keypad_eventqueue_record(self->events, key_number, current)) {
-                // The event queue is full. Reset all states to initial values and set the overflowed flag.
-                memset(self->previously_pressed, false, key_count);
-                memset(self->currently_pressed, false, key_count);
-
-                common_hal_keypad_eventqueue_set_overflowed(self->events, true);
-            }
+            keypad_eventqueue_record(self->events, key_number, current);
         }
     }
 

From 4f538b6c09b4956f2ff18dfb757773dddd61e806 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Wed, 23 Jun 2021 15:10:38 -0400
Subject: [PATCH 293/349] remove pressed() and get_states_into()

---
 shared-bindings/keypad/KeyMatrix.c         | 50 +---------------------
 shared-bindings/keypad/KeyMatrix.h         |  8 ++--
 shared-bindings/keypad/Keys.c              | 47 +-------------------
 shared-bindings/keypad/Keys.h              |  4 +-
 shared-bindings/keypad/ShiftRegisterKeys.c | 46 --------------------
 shared-bindings/keypad/ShiftRegisterKeys.h |  4 +-
 shared-module/keypad/KeyMatrix.c           | 12 ------
 shared-module/keypad/Keys.c                | 11 -----
 shared-module/keypad/ShiftRegisterKeys.c   | 11 -----
 9 files changed, 8 insertions(+), 185 deletions(-)

diff --git a/shared-bindings/keypad/KeyMatrix.c b/shared-bindings/keypad/KeyMatrix.c
index 506add0713..83efdd5f16 100644
--- a/shared-bindings/keypad/KeyMatrix.c
+++ b/shared-bindings/keypad/KeyMatrix.c
@@ -225,50 +225,6 @@ STATIC mp_obj_t keypad_keymatrix_row_column_to_key_number(mp_obj_t self_in, mp_o
 }
 MP_DEFINE_CONST_FUN_OBJ_3(keypad_keymatrix_row_column_to_key_number_obj, keypad_keymatrix_row_column_to_key_number);
 
-//|     def pressed(self, key_number: int) -> None:
-//|         """Return ``True`` if the given key is pressed. This is a debounced read
-//|         of the key state which bypasses the `events` `EventQueue`.
-//|         """
-//|         ...
-//|
-STATIC mp_obj_t keypad_keymatrix_pressed(mp_obj_t self_in, mp_obj_t key_number_in) {
-    keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-
-    mp_uint_t key_number = mp_arg_validate_int_range(
-        mp_obj_get_int(key_number_in), 0, (mp_int_t)common_hal_keypad_keymatrix_get_key_count(self), MP_QSTR_key_number);
-
-    return mp_obj_new_bool(common_hal_keypad_keymatrix_pressed(self, (mp_uint_t)key_number));
-}
-MP_DEFINE_CONST_FUN_OBJ_2(keypad_keymatrix_pressed_obj, keypad_keymatrix_pressed);
-
-//|     def get_states_into(self, states: _typing.WriteableBuffer) -> None:
-//|         """Write the state of all the keys into ``states``.
-//|         Write a ``1`` if pressed, and ``0`` if released.
-//|         The ``length`` of ``states`` must be `key_count`.
-//|         This is a debounced read of the state of all the keys, and bypasses the `events` `EventQueue`.
-//|         The read is done atomically.
-//|         """
-//|         ...
-//|
-STATIC mp_obj_t keypad_keymatrix_get_states_into(mp_obj_t self_in, mp_obj_t pressed) {
-    keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-
-    mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(pressed, &bufinfo, MP_BUFFER_WRITE);
-    if (bufinfo.typecode != 'b' && bufinfo.typecode != 'B' && bufinfo.typecode != BYTEARRAY_TYPECODE) {
-        mp_raise_ValueError_varg(translate("%q must store bytes"), MP_QSTR_states);
-    }
-
-    (void)mp_arg_validate_length_with_name(bufinfo.len, common_hal_keypad_keymatrix_get_key_count(self),
-        MP_QSTR_states, MP_QSTR_key_count);
-
-    common_hal_keypad_keymatrix_get_states_into(self, (uint8_t *)bufinfo.buf);
-    return MP_ROM_NONE;
-}
-MP_DEFINE_CONST_FUN_OBJ_2(keypad_keymatrix_get_states_into_obj, keypad_keymatrix_get_states_into);
-
 //|     events: EventQueue
 //|     """The `EventQueue` associated with this `Keys` object. (read-only)
 //|     """
@@ -292,12 +248,10 @@ STATIC const mp_rom_map_elem_t keypad_keymatrix_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR___exit__),                 MP_ROM_PTR(&keypad_keymatrix___exit___obj) },
 
     { MP_ROM_QSTR(MP_QSTR_events),                   MP_ROM_PTR(&keypad_keymatrix_events_obj) },
-    { MP_ROM_QSTR(MP_QSTR_get_states_into),          MP_ROM_PTR(&keypad_keymatrix_get_states_into_obj) },
+    { MP_ROM_QSTR(MP_QSTR_key_count),                MP_ROM_PTR(&keypad_keymatrix_key_count_obj) },
+    { MP_ROM_QSTR(MP_QSTR_reset),                    MP_ROM_PTR(&keypad_keymatrix_reset_obj) },
     { MP_ROM_QSTR(MP_QSTR_key_number_to_row_column), MP_ROM_PTR(&keypad_keymatrix_key_number_to_row_column_obj) },
     { MP_ROM_QSTR(MP_QSTR_row_column_to_key_number), MP_ROM_PTR(&keypad_keymatrix_row_column_to_key_number_obj) },
-    { MP_ROM_QSTR(MP_QSTR_key_count),                MP_ROM_PTR(&keypad_keymatrix_key_count_obj) },
-    { MP_ROM_QSTR(MP_QSTR_pressed),                  MP_ROM_PTR(&keypad_keymatrix_pressed_obj) },
-    { MP_ROM_QSTR(MP_QSTR_reset),                    MP_ROM_PTR(&keypad_keymatrix_reset_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(keypad_keymatrix_locals_dict, keypad_keymatrix_locals_dict_table);
diff --git a/shared-bindings/keypad/KeyMatrix.h b/shared-bindings/keypad/KeyMatrix.h
index 6643d2f9fd..7ebe1af5b7 100644
--- a/shared-bindings/keypad/KeyMatrix.h
+++ b/shared-bindings/keypad/KeyMatrix.h
@@ -40,13 +40,11 @@ bool common_hal_keypad_keymatrix_deinited(keypad_keymatrix_obj_t *self);
 void common_hal_keypad_keymatrix_key_number_to_row_column(keypad_keymatrix_obj_t *self, mp_uint_t key_number, mp_uint_t *row, mp_uint_t *column);
 mp_uint_t common_hal_keypad_keymatrix_row_column_to_key_number(keypad_keymatrix_obj_t *self, mp_uint_t row, mp_uint_t column);
 
-mp_uint_t common_hal_keypad_keymatrix_get_key_count(keypad_keymatrix_obj_t *self);
-mp_uint_t common_hal_keypad_keymatrix_get_column_count(keypad_keymatrix_obj_t *self);
-mp_uint_t common_hal_keypad_keymatrix_get_row_count(keypad_keymatrix_obj_t *self);
+size_t common_hal_keypad_keymatrix_get_key_count(keypad_keymatrix_obj_t *self);
+size_t common_hal_keypad_keymatrix_get_column_count(keypad_keymatrix_obj_t *self);
+size_t common_hal_keypad_keymatrix_get_row_count(keypad_keymatrix_obj_t *self);
 
 mp_obj_t common_hal_keypad_keymatrix_get_events(keypad_keymatrix_obj_t *self);
-bool common_hal_keypad_keymatrix_pressed(keypad_keymatrix_obj_t *self, mp_uint_t key_number);
 void common_hal_keypad_keymatrix_reset(keypad_keymatrix_obj_t *self);
-void common_hal_keypad_keymatrix_get_states_into(keypad_keymatrix_obj_t *self, uint8_t *states);
 
 #endif  // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_KEYMATRIX_H
diff --git a/shared-bindings/keypad/Keys.c b/shared-bindings/keypad/Keys.c
index 9c5ca08bf3..e9ed1346e8 100644
--- a/shared-bindings/keypad/Keys.c
+++ b/shared-bindings/keypad/Keys.c
@@ -167,49 +167,6 @@ const mp_obj_property_t keypad_keys_key_count_obj = {
               MP_ROM_NONE},
 };
 
-//|     def pressed(self, key_number: int) -> None:
-//|         """Return ``True`` if the given key is pressed.
-//          This is a debounced read of the key state which bypasses the `events` `EventQueue`.
-//|         """
-//|         ...
-//|
-STATIC mp_obj_t keypad_keys_pressed(mp_obj_t self_in, mp_obj_t key_number_in) {
-    keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-
-    const mp_int_t key_number = mp_obj_get_int(key_number_in);
-    (void)mp_arg_validate_int_range(key_number, 0, common_hal_keypad_keys_get_key_count(self), MP_QSTR_key_number);
-
-    return mp_obj_new_bool(common_hal_keypad_keys_pressed(self, (mp_uint_t)key_number));
-}
-MP_DEFINE_CONST_FUN_OBJ_2(keypad_keys_pressed_obj, keypad_keys_pressed);
-
-//|     def get_states_into(self, states: _typing.WriteableBuffer) -> None:
-//|         """Write the states of all the keys into ``states``.
-//|         Write a ``1`` if pressed, and ``0`` if released.
-//|         The ``length`` of ``states`` must be `key_count`.
-//|         This is a debounced read of the state of all the keys, and bypasses the `events` `EventQueue`.
-//|         The read is done atomically.
-//|         """
-//|         ...
-//|
-STATIC mp_obj_t keypad_keys_get_states_into(mp_obj_t self_in, mp_obj_t pressed) {
-    keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-
-    mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(pressed, &bufinfo, MP_BUFFER_WRITE);
-    if (bufinfo.typecode != 'b' && bufinfo.typecode != 'B' && bufinfo.typecode != BYTEARRAY_TYPECODE) {
-        mp_raise_ValueError_varg(translate("%q must store bytes"), MP_QSTR_pressed);
-    }
-    (void)mp_arg_validate_length_with_name(bufinfo.len,common_hal_keypad_keys_get_key_count(self),
-        MP_QSTR_pressed, MP_QSTR_key_count);
-
-    common_hal_keypad_keys_get_states_into(self, (uint8_t *)bufinfo.buf);
-    return MP_ROM_NONE;
-}
-MP_DEFINE_CONST_FUN_OBJ_2(keypad_keys_get_states_into_obj, keypad_keys_get_states_into);
-
 //|     events: EventQueue
 //|     """The `EventQueue` associated with this `Keys` object. (read-only)
 //|     """
@@ -233,9 +190,7 @@ STATIC const mp_rom_map_elem_t keypad_keys_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR___exit__),     MP_ROM_PTR(&keypad_keys___exit___obj) },
 
     { MP_ROM_QSTR(MP_QSTR_events),       MP_ROM_PTR(&keypad_keys_events_obj) },
-    { MP_ROM_QSTR(MP_QSTR_get_states_into), MP_ROM_PTR(&keypad_keys_get_states_into_obj) },
-    { MP_ROM_QSTR(MP_QSTR_key_count),     MP_ROM_PTR(&keypad_keys_key_count_obj) },
-    { MP_ROM_QSTR(MP_QSTR_pressed),      MP_ROM_PTR(&keypad_keys_pressed_obj) },
+    { MP_ROM_QSTR(MP_QSTR_key_count),    MP_ROM_PTR(&keypad_keys_key_count_obj) },
     { MP_ROM_QSTR(MP_QSTR_reset),        MP_ROM_PTR(&keypad_keys_reset_obj) },
 };
 
diff --git a/shared-bindings/keypad/Keys.h b/shared-bindings/keypad/Keys.h
index 4d45d9e06a..094220e588 100644
--- a/shared-bindings/keypad/Keys.h
+++ b/shared-bindings/keypad/Keys.h
@@ -38,9 +38,7 @@ void common_hal_keypad_keys_deinit(keypad_keys_obj_t *self);
 bool common_hal_keypad_keys_deinited(keypad_keys_obj_t *self);
 
 mp_obj_t common_hal_keypad_keys_get_events(keypad_keys_obj_t *self);
-mp_uint_t common_hal_keypad_keys_get_key_count(keypad_keys_obj_t *self);
-bool common_hal_keypad_keys_pressed(keypad_keys_obj_t *self, mp_uint_t key_number);
+size_t common_hal_keypad_keys_get_key_count(keypad_keys_obj_t *self);
 void common_hal_keypad_keys_reset(keypad_keys_obj_t *self);
-void common_hal_keypad_keys_get_states_into(keypad_keys_obj_t *self, uint8_t *states);
 
 #endif  // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_KEYS_H
diff --git a/shared-bindings/keypad/ShiftRegisterKeys.c b/shared-bindings/keypad/ShiftRegisterKeys.c
index c76910726f..340960c718 100644
--- a/shared-bindings/keypad/ShiftRegisterKeys.c
+++ b/shared-bindings/keypad/ShiftRegisterKeys.c
@@ -171,50 +171,6 @@ const mp_obj_property_t keypad_shiftregisterkeys_key_count_obj = {
               MP_ROM_NONE},
 };
 
-//|     def pressed(self, key_number: int) -> None:
-//|         """Return ``True`` if the given key is pressed.
-//          This is a debounced read of the key state which bypasses the `events` `EventQueue`.
-//|         """
-//|         ...
-//|
-STATIC mp_obj_t keypad_shiftregisterkeys_pressed(mp_obj_t self_in, mp_obj_t key_number_in) {
-    keypad_shiftregisterkeys_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-
-    mp_uint_t key_number = mp_arg_validate_int_range(
-        mp_obj_get_int(key_number_in), 0, (mp_int_t)common_hal_keypad_shiftregisterkeys_get_key_count(self),
-        MP_QSTR_key_number);
-
-    return mp_obj_new_bool(common_hal_keypad_shiftregisterkeys_pressed(self, key_number));
-}
-MP_DEFINE_CONST_FUN_OBJ_2(keypad_shiftregisterkeys_pressed_obj, keypad_shiftregisterkeys_pressed);
-
-//|     def get_states_into(self, states: _typing.WriteableBuffer) -> None:
-//|         """Write the states of all the keys into ``states``.
-//|         Write a ``1`` if pressed, and ``0`` if released.
-//|         The ``length`` of ``states`` must be `key_count`.
-//|         This is a debounced read of the state of all the keys, and bypasses the `events` `EventQueue`.
-//|         The read is done atomically.
-//|         """
-//|         ...
-//|
-STATIC mp_obj_t keypad_shiftregisterkeys_get_states_into(mp_obj_t self_in, mp_obj_t pressed) {
-    keypad_shiftregisterkeys_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_for_deinit(self);
-
-    mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(pressed, &bufinfo, MP_BUFFER_WRITE);
-    if (bufinfo.typecode != 'b' && bufinfo.typecode != 'B' && bufinfo.typecode != BYTEARRAY_TYPECODE) {
-        mp_raise_ValueError_varg(translate("%q must store bytes"), MP_QSTR_pressed);
-    }
-    (void)mp_arg_validate_length_with_name(bufinfo.len, common_hal_keypad_shiftregisterkeys_get_key_count(self),
-        MP_QSTR_states, MP_QSTR_key_count);
-
-    common_hal_keypad_shiftregisterkeys_get_states_into(self, (uint8_t *)bufinfo.buf);
-    return MP_ROM_NONE;
-}
-MP_DEFINE_CONST_FUN_OBJ_2(keypad_shiftregisterkeys_get_states_into_obj, keypad_shiftregisterkeys_get_states_into);
-
 //|     events: EventQueue
 //|     """The `EventQueue` associated with this `Keys` object. (read-only)
 //|     """
@@ -238,9 +194,7 @@ STATIC const mp_rom_map_elem_t keypad_shiftregisterkeys_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR___exit__),     MP_ROM_PTR(&keypad_shiftregisterkeys___exit___obj) },
 
     { MP_ROM_QSTR(MP_QSTR_events),       MP_ROM_PTR(&keypad_shiftregisterkeys_events_obj) },
-    { MP_ROM_QSTR(MP_QSTR_get_states_into), MP_ROM_PTR(&keypad_shiftregisterkeys_get_states_into_obj) },
     { MP_ROM_QSTR(MP_QSTR_key_count),    MP_ROM_PTR(&keypad_shiftregisterkeys_key_count_obj) },
-    { MP_ROM_QSTR(MP_QSTR_pressed),      MP_ROM_PTR(&keypad_shiftregisterkeys_pressed_obj) },
     { MP_ROM_QSTR(MP_QSTR_reset),        MP_ROM_PTR(&keypad_shiftregisterkeys_reset_obj) },
 };
 
diff --git a/shared-bindings/keypad/ShiftRegisterKeys.h b/shared-bindings/keypad/ShiftRegisterKeys.h
index b81b3b45e6..f1432f1069 100644
--- a/shared-bindings/keypad/ShiftRegisterKeys.h
+++ b/shared-bindings/keypad/ShiftRegisterKeys.h
@@ -38,9 +38,7 @@ void common_hal_keypad_shiftregisterkeys_deinit(keypad_shiftregisterkeys_obj_t *
 bool common_hal_keypad_shiftregisterkeys_deinited(keypad_shiftregisterkeys_obj_t *self);
 
 mp_obj_t common_hal_keypad_shiftregisterkeys_get_events(keypad_shiftregisterkeys_obj_t *self);
-mp_uint_t common_hal_keypad_shiftregisterkeys_get_key_count(keypad_shiftregisterkeys_obj_t *self);
-bool common_hal_keypad_shiftregisterkeys_pressed(keypad_shiftregisterkeys_obj_t *self, mp_uint_t key_number);
+size_t common_hal_keypad_shiftregisterkeys_get_key_count(keypad_shiftregisterkeys_obj_t *self);
 void common_hal_keypad_shiftregisterkeys_reset(keypad_shiftregisterkeys_obj_t *self);
-void common_hal_keypad_shiftregisterkeys_get_states_into(keypad_shiftregisterkeys_obj_t *self, uint8_t *states);
 
 #endif  // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_SHIFTREGISTERKEYS_H
diff --git a/shared-module/keypad/KeyMatrix.c b/shared-module/keypad/KeyMatrix.c
index ac2e715dbd..677a0b7142 100644
--- a/shared-module/keypad/KeyMatrix.c
+++ b/shared-module/keypad/KeyMatrix.c
@@ -116,18 +116,6 @@ size_t common_hal_keypad_keymatrix_get_column_count(keypad_keymatrix_obj_t *self
     return self->column_digitalinouts->len;
 }
 
-bool common_hal_keypad_keymatrix_pressed(keypad_keymatrix_obj_t *self, mp_uint_t key_number) {
-    return self->currently_pressed[key_number];
-}
-
-// The length of states has already been validated.
-void common_hal_keypad_keymatrix_get_states_into(keypad_keymatrix_obj_t *self, uint8_t *states) {
-    // Read the state atomically.
-    supervisor_acquire_lock(&keypad_scanners_linked_list_lock);
-    memcpy(states, self->currently_pressed, common_hal_keypad_keymatrix_get_key_count(self));
-    supervisor_release_lock(&keypad_scanners_linked_list_lock);
-}
-
 mp_uint_t common_hal_keypad_keymatrix_row_column_to_key_number(keypad_keymatrix_obj_t *self, mp_uint_t row, mp_uint_t column) {
     return row_column_to_key_number(self, row, column);
 }
diff --git a/shared-module/keypad/Keys.c b/shared-module/keypad/Keys.c
index c621a757d2..1f232a03ed 100644
--- a/shared-module/keypad/Keys.c
+++ b/shared-module/keypad/Keys.c
@@ -89,17 +89,6 @@ bool common_hal_keypad_keys_deinited(keypad_keys_obj_t *self) {
 size_t common_hal_keypad_keys_get_key_count(keypad_keys_obj_t *self) {
     return self->digitalinouts->len;
 }
-bool common_hal_keypad_keys_pressed(keypad_keys_obj_t *self, mp_uint_t key_number) {
-    return self->currently_pressed[key_number];
-}
-
-// The length of states has already been validated.
-void common_hal_keypad_keys_get_states_into(keypad_keys_obj_t *self, uint8_t *states) {
-    // Read the state atomically.
-    supervisor_acquire_lock(&keypad_scanners_linked_list_lock);
-    memcpy(states, self->currently_pressed, common_hal_keypad_keys_get_key_count(self));
-    supervisor_release_lock(&keypad_scanners_linked_list_lock);
-}
 
 mp_obj_t common_hal_keypad_keys_get_events(keypad_keys_obj_t *self) {
     return MP_OBJ_FROM_PTR(self->events);
diff --git a/shared-module/keypad/ShiftRegisterKeys.c b/shared-module/keypad/ShiftRegisterKeys.c
index fd5d8bbdb1..074f226998 100644
--- a/shared-module/keypad/ShiftRegisterKeys.c
+++ b/shared-module/keypad/ShiftRegisterKeys.c
@@ -101,17 +101,6 @@ bool common_hal_keypad_shiftregisterkeys_deinited(keypad_shiftregisterkeys_obj_t
 size_t common_hal_keypad_shiftregisterkeys_get_key_count(keypad_shiftregisterkeys_obj_t *self) {
     return self->key_count;
 }
-bool common_hal_keypad_shiftregisterkeys_pressed(keypad_shiftregisterkeys_obj_t *self, mp_uint_t key_number) {
-    return self->currently_pressed[key_number];
-}
-
-// The length of states has already been validated.
-void common_hal_keypad_shiftregisterkeys_get_states_into(keypad_shiftregisterkeys_obj_t *self, uint8_t *states) {
-    // Read the state atomically.
-    supervisor_acquire_lock(&keypad_scanners_linked_list_lock);
-    memcpy(states, self->currently_pressed, common_hal_keypad_shiftregisterkeys_get_key_count(self));
-    supervisor_release_lock(&keypad_scanners_linked_list_lock);
-}
 
 mp_obj_t common_hal_keypad_shiftregisterkeys_get_events(keypad_shiftregisterkeys_obj_t *self) {
     return MP_OBJ_FROM_PTR(self->events);

From 2e67d6708dcd50d54bb0757b8745fb61262e1a9c Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Wed, 23 Jun 2021 15:42:31 -0400
Subject: [PATCH 294/349] check_for_deinit() more places in scanners

---
 shared-bindings/keypad/KeyMatrix.c         | 5 +++++
 shared-bindings/keypad/Keys.c              | 5 +++++
 shared-bindings/keypad/ShiftRegisterKeys.c | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/shared-bindings/keypad/KeyMatrix.c b/shared-bindings/keypad/KeyMatrix.c
index 83efdd5f16..0b854ef475 100644
--- a/shared-bindings/keypad/KeyMatrix.c
+++ b/shared-bindings/keypad/KeyMatrix.c
@@ -150,6 +150,7 @@ STATIC void check_for_deinit(keypad_keymatrix_obj_t *self) {
 //|
 STATIC mp_obj_t keypad_keymatrix_reset(mp_obj_t self_in) {
     keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
 
     common_hal_keypad_keymatrix_reset(self);
     return MP_ROM_NONE;
@@ -162,6 +163,8 @@ MP_DEFINE_CONST_FUN_OBJ_1(keypad_keymatrix_reset_obj, keypad_keymatrix_reset);
 //|
 STATIC mp_obj_t keypad_keymatrix_get_key_count(mp_obj_t self_in) {
     keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+
     return MP_OBJ_NEW_SMALL_INT(common_hal_keypad_keymatrix_get_key_count(self));
 }
 MP_DEFINE_CONST_FUN_OBJ_1(keypad_keymatrix_get_key_count_obj, keypad_keymatrix_get_key_count);
@@ -231,6 +234,8 @@ MP_DEFINE_CONST_FUN_OBJ_3(keypad_keymatrix_row_column_to_key_number_obj, keypad_
 //|
 STATIC mp_obj_t keypad_keymatrix_get_events(mp_obj_t self_in) {
     keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+
     return common_hal_keypad_keymatrix_get_events(self);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(keypad_keymatrix_get_events_obj, keypad_keymatrix_get_events);
diff --git a/shared-bindings/keypad/Keys.c b/shared-bindings/keypad/Keys.c
index e9ed1346e8..d616bcff84 100644
--- a/shared-bindings/keypad/Keys.c
+++ b/shared-bindings/keypad/Keys.c
@@ -144,6 +144,7 @@ STATIC void check_for_deinit(keypad_keys_obj_t *self) {
 //|
 STATIC mp_obj_t keypad_keys_reset(mp_obj_t self_in) {
     keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
 
     common_hal_keypad_keys_reset(self);
     return MP_ROM_NONE;
@@ -156,6 +157,8 @@ MP_DEFINE_CONST_FUN_OBJ_1(keypad_keys_reset_obj, keypad_keys_reset);
 //|
 STATIC mp_obj_t keypad_keys_get_key_count(mp_obj_t self_in) {
     keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+
     return MP_OBJ_NEW_SMALL_INT(common_hal_keypad_keys_get_key_count(self));
 }
 MP_DEFINE_CONST_FUN_OBJ_1(keypad_keys_get_key_count_obj, keypad_keys_get_key_count);
@@ -173,6 +176,8 @@ const mp_obj_property_t keypad_keys_key_count_obj = {
 //|
 STATIC mp_obj_t keypad_keys_get_events(mp_obj_t self_in) {
     keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+
     return common_hal_keypad_keys_get_events(self);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(keypad_keys_get_events_obj, keypad_keys_get_events);
diff --git a/shared-bindings/keypad/ShiftRegisterKeys.c b/shared-bindings/keypad/ShiftRegisterKeys.c
index 340960c718..c81e127601 100644
--- a/shared-bindings/keypad/ShiftRegisterKeys.c
+++ b/shared-bindings/keypad/ShiftRegisterKeys.c
@@ -148,6 +148,7 @@ STATIC void check_for_deinit(keypad_shiftregisterkeys_obj_t *self) {
 //|
 STATIC mp_obj_t keypad_shiftregisterkeys_reset(mp_obj_t self_in) {
     keypad_shiftregisterkeys_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
 
     common_hal_keypad_shiftregisterkeys_reset(self);
     return MP_ROM_NONE;
@@ -160,6 +161,8 @@ MP_DEFINE_CONST_FUN_OBJ_1(keypad_shiftregisterkeys_reset_obj, keypad_shiftregist
 //|
 STATIC mp_obj_t keypad_shiftregisterkeys_get_key_count(mp_obj_t self_in) {
     keypad_shiftregisterkeys_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+
     return MP_OBJ_NEW_SMALL_INT(common_hal_keypad_shiftregisterkeys_get_key_count(self));
 }
 MP_DEFINE_CONST_FUN_OBJ_1(keypad_shiftregisterkeys_get_key_count_obj, keypad_shiftregisterkeys_get_key_count);
@@ -177,6 +180,8 @@ const mp_obj_property_t keypad_shiftregisterkeys_key_count_obj = {
 //|
 STATIC mp_obj_t keypad_shiftregisterkeys_get_events(mp_obj_t self_in) {
     keypad_shiftregisterkeys_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+
     return common_hal_keypad_shiftregisterkeys_get_events(self);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(keypad_shiftregisterkeys_get_events_obj, keypad_shiftregisterkeys_get_events);

From 36472a0a8b66b328b98f53fcbbe566fcb9518166 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Wed, 23 Jun 2021 19:23:56 -0400
Subject: [PATCH 295/349] Correct doc in EventQueue.c

Co-authored-by: Scott Shawcroft <scott@tannewt.org>
---
 shared-bindings/keypad/EventQueue.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/keypad/EventQueue.c b/shared-bindings/keypad/EventQueue.c
index 6a0e904ed1..e47ee0772c 100644
--- a/shared-bindings/keypad/EventQueue.c
+++ b/shared-bindings/keypad/EventQueue.c
@@ -42,7 +42,7 @@
 //|
 //|         Note that the queue size is limited; see ``max_events`` in the constructor of
 //|         a scanner such as `Keys` or `KeyMatrix`.
-//|         If a new event arrives when the queue is full, the queue is cleared, and
+//|         If a new event arrives when the queue is full, the event is discarded, and
 //|         `overflowed` is set to ``True``.
 //|
 //|         :return: the next queued key transition `Event`

From ab1d7429f136a437ec648405a1c0ea9f62a11b94 Mon Sep 17 00:00:00 2001
From: root <dwputz@gmail.com>
Date: Wed, 23 Jun 2021 21:09:27 -0500
Subject: [PATCH 296/349] Fix for issue #4908 - pulseout leaving line high

---
 ports/raspberrypi/common-hal/pulseio/PulseOut.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/raspberrypi/common-hal/pulseio/PulseOut.c b/ports/raspberrypi/common-hal/pulseio/PulseOut.c
index 7a1b709b4c..bc0bc307e6 100644
--- a/ports/raspberrypi/common-hal/pulseio/PulseOut.c
+++ b/ports/raspberrypi/common-hal/pulseio/PulseOut.c
@@ -31,6 +31,7 @@
 #include "py/runtime.h"
 #include "shared-bindings/pulseio/PulseOut.h"
 #include "shared-bindings/pwmio/PWMOut.h"
+#include "shared-bindings/microcontroller/__init__.h"
 #include "common-hal/pwmio/PWMOut.h"
 #include "supervisor/shared/translate.h"
 #include "src/rp2_common/hardware_pwm/include/hardware/pwm.h"
@@ -105,5 +106,7 @@ void common_hal_pulseio_pulseout_send(pulseio_pulseout_obj_t *self, uint16_t *pu
         // signal.
         RUN_BACKGROUND_TASKS;
     }
+    // Short delay to give pin time to settle before disabling PWM
+    common_hal_mcu_delay_us(25);
     pwm_set_enabled(pwmout_obj->slice,false);
 }

From cfe73f14fbddc7efcc163589868ec2597152adbc Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl <jonny@bergdahl.it>
Date: Wed, 23 Jun 2021 17:48:30 +0000
Subject: [PATCH 297/349] Translated using Weblate (Swedish)

Currently translated at 100.0% (998 of 998 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/sv/
---
 locale/sv.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/locale/sv.po b/locale/sv.po
index db863169ba..1c517419fa 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2021-06-21 13:39+0000\n"
+"PO-Revision-Date: 2021-06-24 12:16+0000\n"
 "Last-Translator: Jonny Bergdahl <jonny@bergdahl.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: sv\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.7\n"
+"X-Generator: Weblate 4.7.1-dev\n"
 
 #: main.c
 msgid ""
@@ -2603,7 +2603,7 @@ msgstr "binär op %q är inte implementerad"
 
 #: extmod/modurandom.c
 msgid "bits must be 32 or less"
-msgstr ""
+msgstr "bits måste vara 32 eller färre"
 
 #: shared-bindings/busio/UART.c
 msgid "bits must be in range 5 to 9"
@@ -3223,7 +3223,7 @@ msgstr "graphic måste vara 2048 byte lång"
 
 #: extmod/moduhashlib.c
 msgid "hash is final"
-msgstr ""
+msgstr "hash är slutgiltig"
 
 #: extmod/moduheapq.c
 msgid "heap must be a list"

From fae68f0ae34debc6ce797ef626575172dce6a73c Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Thu, 24 Jun 2021 14:16:06 +0200
Subject: [PATCH 298/349] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/
---
 locale/ID.po             | 3 +++
 locale/cs.po             | 3 +++
 locale/de_DE.po          | 3 +++
 locale/el.po             | 3 +++
 locale/en_GB.po          | 3 +++
 locale/es.po             | 3 +++
 locale/fil.po            | 3 +++
 locale/fr.po             | 3 +++
 locale/hi.po             | 3 +++
 locale/it_IT.po          | 3 +++
 locale/ja.po             | 3 +++
 locale/ko.po             | 3 +++
 locale/nl.po             | 3 +++
 locale/pl.po             | 3 +++
 locale/pt_BR.po          | 3 +++
 locale/sv.po             | 3 +++
 locale/zh_Latn_pinyin.po | 3 +++
 17 files changed, 51 insertions(+)

diff --git a/locale/ID.po b/locale/ID.po
index b1de659e15..a6de207fff 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -1727,6 +1727,7 @@ msgstr ""
 
 #: ports/esp32s2/common-hal/alarm/time/TimeAlarm.c
 #: ports/nrf/common-hal/alarm/time/TimeAlarm.c
+#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
 #: ports/stm/common-hal/alarm/time/TimeAlarm.c
 msgid "Only one alarm.time alarm can be set."
 msgstr ""
@@ -2069,6 +2070,7 @@ msgstr ""
 msgid "Size not supported"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/alarm/SleepMemory.c
 #: ports/stm/common-hal/alarm/SleepMemory.c
 msgid "Sleep Memory not available"
 msgstr ""
@@ -2213,6 +2215,7 @@ msgstr "Terlalu banyak tampilan"
 msgid "Total data to write is larger than %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c
 #: ports/stm/common-hal/alarm/touch/TouchAlarm.c
 msgid "Touch alarms not available"
 msgstr ""
diff --git a/locale/cs.po b/locale/cs.po
index a1dbcf69e1..9895b3b7e9 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -1705,6 +1705,7 @@ msgstr ""
 
 #: ports/esp32s2/common-hal/alarm/time/TimeAlarm.c
 #: ports/nrf/common-hal/alarm/time/TimeAlarm.c
+#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
 #: ports/stm/common-hal/alarm/time/TimeAlarm.c
 msgid "Only one alarm.time alarm can be set."
 msgstr ""
@@ -2038,6 +2039,7 @@ msgstr ""
 msgid "Size not supported"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/alarm/SleepMemory.c
 #: ports/stm/common-hal/alarm/SleepMemory.c
 msgid "Sleep Memory not available"
 msgstr ""
@@ -2182,6 +2184,7 @@ msgstr ""
 msgid "Total data to write is larger than %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c
 #: ports/stm/common-hal/alarm/touch/TouchAlarm.c
 msgid "Touch alarms not available"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 95d7ffde57..547ec77433 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -1729,6 +1729,7 @@ msgstr ""
 
 #: ports/esp32s2/common-hal/alarm/time/TimeAlarm.c
 #: ports/nrf/common-hal/alarm/time/TimeAlarm.c
+#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
 #: ports/stm/common-hal/alarm/time/TimeAlarm.c
 msgid "Only one alarm.time alarm can be set."
 msgstr ""
@@ -2067,6 +2068,7 @@ msgstr ""
 msgid "Size not supported"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/alarm/SleepMemory.c
 #: ports/stm/common-hal/alarm/SleepMemory.c
 msgid "Sleep Memory not available"
 msgstr ""
@@ -2214,6 +2216,7 @@ msgstr "Zu viele displays"
 msgid "Total data to write is larger than %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c
 #: ports/stm/common-hal/alarm/touch/TouchAlarm.c
 msgid "Touch alarms not available"
 msgstr ""
diff --git a/locale/el.po b/locale/el.po
index 4997e10fd2..9836599004 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -1702,6 +1702,7 @@ msgstr ""
 
 #: ports/esp32s2/common-hal/alarm/time/TimeAlarm.c
 #: ports/nrf/common-hal/alarm/time/TimeAlarm.c
+#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
 #: ports/stm/common-hal/alarm/time/TimeAlarm.c
 msgid "Only one alarm.time alarm can be set."
 msgstr ""
@@ -2035,6 +2036,7 @@ msgstr ""
 msgid "Size not supported"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/alarm/SleepMemory.c
 #: ports/stm/common-hal/alarm/SleepMemory.c
 msgid "Sleep Memory not available"
 msgstr ""
@@ -2179,6 +2181,7 @@ msgstr ""
 msgid "Total data to write is larger than %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c
 #: ports/stm/common-hal/alarm/touch/TouchAlarm.c
 msgid "Touch alarms not available"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 54df9949a7..8308ef2454 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -1721,6 +1721,7 @@ msgstr "Only one TouchAlarm can be set in deep sleep."
 
 #: ports/esp32s2/common-hal/alarm/time/TimeAlarm.c
 #: ports/nrf/common-hal/alarm/time/TimeAlarm.c
+#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
 #: ports/stm/common-hal/alarm/time/TimeAlarm.c
 msgid "Only one alarm.time alarm can be set."
 msgstr "Only one alarm.time alarm can be set."
@@ -2063,6 +2064,7 @@ msgstr "Side set pin count must be between 1 and 5"
 msgid "Size not supported"
 msgstr "Size not supported"
 
+#: ports/raspberrypi/common-hal/alarm/SleepMemory.c
 #: ports/stm/common-hal/alarm/SleepMemory.c
 msgid "Sleep Memory not available"
 msgstr ""
@@ -2207,6 +2209,7 @@ msgstr "Too many displays"
 msgid "Total data to write is larger than %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c
 #: ports/stm/common-hal/alarm/touch/TouchAlarm.c
 msgid "Touch alarms not available"
 msgstr ""
diff --git a/locale/es.po b/locale/es.po
index 0e9dc6e851..b31d45929f 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -1745,6 +1745,7 @@ msgstr "Solamente una TouchAlarm puede ser configurada durante deep sleep."
 
 #: ports/esp32s2/common-hal/alarm/time/TimeAlarm.c
 #: ports/nrf/common-hal/alarm/time/TimeAlarm.c
+#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
 #: ports/stm/common-hal/alarm/time/TimeAlarm.c
 msgid "Only one alarm.time alarm can be set."
 msgstr "Solamente una alarm.time puede ser configurada."
@@ -2091,6 +2092,7 @@ msgstr "El conteo de pines de Side set debe estar entre 1 y 5"
 msgid "Size not supported"
 msgstr "Sin capacidades para el tamaño"
 
+#: ports/raspberrypi/common-hal/alarm/SleepMemory.c
 #: ports/stm/common-hal/alarm/SleepMemory.c
 msgid "Sleep Memory not available"
 msgstr "Memoria de sueño no disponible"
@@ -2245,6 +2247,7 @@ msgstr "Muchos displays"
 msgid "Total data to write is larger than %q"
 msgstr "La cantidad total de datos es mas grande que %q"
 
+#: ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c
 #: ports/stm/common-hal/alarm/touch/TouchAlarm.c
 msgid "Touch alarms not available"
 msgstr "Alarmas táctiles no disponibles"
diff --git a/locale/fil.po b/locale/fil.po
index 74f638ee46..eab8df305c 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -1720,6 +1720,7 @@ msgstr ""
 
 #: ports/esp32s2/common-hal/alarm/time/TimeAlarm.c
 #: ports/nrf/common-hal/alarm/time/TimeAlarm.c
+#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
 #: ports/stm/common-hal/alarm/time/TimeAlarm.c
 msgid "Only one alarm.time alarm can be set."
 msgstr ""
@@ -2055,6 +2056,7 @@ msgstr ""
 msgid "Size not supported"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/alarm/SleepMemory.c
 #: ports/stm/common-hal/alarm/SleepMemory.c
 msgid "Sleep Memory not available"
 msgstr ""
@@ -2199,6 +2201,7 @@ msgstr ""
 msgid "Total data to write is larger than %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c
 #: ports/stm/common-hal/alarm/touch/TouchAlarm.c
 msgid "Touch alarms not available"
 msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index ec58a2c8ca..34b9a629fd 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -1753,6 +1753,7 @@ msgstr "Seulement une TouchAlarm peu être réglée en someil profond."
 
 #: ports/esp32s2/common-hal/alarm/time/TimeAlarm.c
 #: ports/nrf/common-hal/alarm/time/TimeAlarm.c
+#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
 #: ports/stm/common-hal/alarm/time/TimeAlarm.c
 msgid "Only one alarm.time alarm can be set."
 msgstr "Seulement une alarme alarm.time peut être réglée."
@@ -2100,6 +2101,7 @@ msgstr "Nombre de broches Side configurées doit être entre 1 et 5"
 msgid "Size not supported"
 msgstr "Taille n'est pas supportée"
 
+#: ports/raspberrypi/common-hal/alarm/SleepMemory.c
 #: ports/stm/common-hal/alarm/SleepMemory.c
 msgid "Sleep Memory not available"
 msgstr ""
@@ -2245,6 +2247,7 @@ msgstr "Trop d'affichages"
 msgid "Total data to write is larger than %q"
 msgstr "Quantité de données à écrire est plus que %q"
 
+#: ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c
 #: ports/stm/common-hal/alarm/touch/TouchAlarm.c
 msgid "Touch alarms not available"
 msgstr ""
diff --git a/locale/hi.po b/locale/hi.po
index b78020f23d..0dce59821e 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -1702,6 +1702,7 @@ msgstr ""
 
 #: ports/esp32s2/common-hal/alarm/time/TimeAlarm.c
 #: ports/nrf/common-hal/alarm/time/TimeAlarm.c
+#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
 #: ports/stm/common-hal/alarm/time/TimeAlarm.c
 msgid "Only one alarm.time alarm can be set."
 msgstr ""
@@ -2035,6 +2036,7 @@ msgstr ""
 msgid "Size not supported"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/alarm/SleepMemory.c
 #: ports/stm/common-hal/alarm/SleepMemory.c
 msgid "Sleep Memory not available"
 msgstr ""
@@ -2179,6 +2181,7 @@ msgstr ""
 msgid "Total data to write is larger than %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c
 #: ports/stm/common-hal/alarm/touch/TouchAlarm.c
 msgid "Touch alarms not available"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index c0f81e37fe..4dc81195b8 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -1734,6 +1734,7 @@ msgstr ""
 
 #: ports/esp32s2/common-hal/alarm/time/TimeAlarm.c
 #: ports/nrf/common-hal/alarm/time/TimeAlarm.c
+#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
 #: ports/stm/common-hal/alarm/time/TimeAlarm.c
 msgid "Only one alarm.time alarm can be set."
 msgstr ""
@@ -2076,6 +2077,7 @@ msgstr ""
 msgid "Size not supported"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/alarm/SleepMemory.c
 #: ports/stm/common-hal/alarm/SleepMemory.c
 msgid "Sleep Memory not available"
 msgstr ""
@@ -2220,6 +2222,7 @@ msgstr "Troppi schermi"
 msgid "Total data to write is larger than %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c
 #: ports/stm/common-hal/alarm/touch/TouchAlarm.c
 msgid "Touch alarms not available"
 msgstr ""
diff --git a/locale/ja.po b/locale/ja.po
index 30623960ab..12fee78eb1 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -1715,6 +1715,7 @@ msgstr ""
 
 #: ports/esp32s2/common-hal/alarm/time/TimeAlarm.c
 #: ports/nrf/common-hal/alarm/time/TimeAlarm.c
+#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
 #: ports/stm/common-hal/alarm/time/TimeAlarm.c
 msgid "Only one alarm.time alarm can be set."
 msgstr ""
@@ -2049,6 +2050,7 @@ msgstr ""
 msgid "Size not supported"
 msgstr "サイズは対応していません"
 
+#: ports/raspberrypi/common-hal/alarm/SleepMemory.c
 #: ports/stm/common-hal/alarm/SleepMemory.c
 msgid "Sleep Memory not available"
 msgstr ""
@@ -2193,6 +2195,7 @@ msgstr ""
 msgid "Total data to write is larger than %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c
 #: ports/stm/common-hal/alarm/touch/TouchAlarm.c
 msgid "Touch alarms not available"
 msgstr ""
diff --git a/locale/ko.po b/locale/ko.po
index 85008b8810..26eb8542e5 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -1705,6 +1705,7 @@ msgstr ""
 
 #: ports/esp32s2/common-hal/alarm/time/TimeAlarm.c
 #: ports/nrf/common-hal/alarm/time/TimeAlarm.c
+#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
 #: ports/stm/common-hal/alarm/time/TimeAlarm.c
 msgid "Only one alarm.time alarm can be set."
 msgstr ""
@@ -2038,6 +2039,7 @@ msgstr ""
 msgid "Size not supported"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/alarm/SleepMemory.c
 #: ports/stm/common-hal/alarm/SleepMemory.c
 msgid "Sleep Memory not available"
 msgstr ""
@@ -2182,6 +2184,7 @@ msgstr ""
 msgid "Total data to write is larger than %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c
 #: ports/stm/common-hal/alarm/touch/TouchAlarm.c
 msgid "Touch alarms not available"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index a8beb7cf7a..fbc7e09e14 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -1720,6 +1720,7 @@ msgstr ""
 
 #: ports/esp32s2/common-hal/alarm/time/TimeAlarm.c
 #: ports/nrf/common-hal/alarm/time/TimeAlarm.c
+#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
 #: ports/stm/common-hal/alarm/time/TimeAlarm.c
 msgid "Only one alarm.time alarm can be set."
 msgstr "Slechts één alarm.time alarm kan worden ingesteld."
@@ -2065,6 +2066,7 @@ msgstr ""
 msgid "Size not supported"
 msgstr "Afmeting niet ondersteund"
 
+#: ports/raspberrypi/common-hal/alarm/SleepMemory.c
 #: ports/stm/common-hal/alarm/SleepMemory.c
 msgid "Sleep Memory not available"
 msgstr ""
@@ -2209,6 +2211,7 @@ msgstr "Teveel beeldschermen"
 msgid "Total data to write is larger than %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c
 #: ports/stm/common-hal/alarm/touch/TouchAlarm.c
 msgid "Touch alarms not available"
 msgstr ""
diff --git a/locale/pl.po b/locale/pl.po
index b00fd112c5..a68bf6ccba 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -1713,6 +1713,7 @@ msgstr ""
 
 #: ports/esp32s2/common-hal/alarm/time/TimeAlarm.c
 #: ports/nrf/common-hal/alarm/time/TimeAlarm.c
+#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
 #: ports/stm/common-hal/alarm/time/TimeAlarm.c
 msgid "Only one alarm.time alarm can be set."
 msgstr ""
@@ -2046,6 +2047,7 @@ msgstr ""
 msgid "Size not supported"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/alarm/SleepMemory.c
 #: ports/stm/common-hal/alarm/SleepMemory.c
 msgid "Sleep Memory not available"
 msgstr ""
@@ -2190,6 +2192,7 @@ msgstr "Zbyt wiele wyświetlaczy"
 msgid "Total data to write is larger than %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c
 #: ports/stm/common-hal/alarm/touch/TouchAlarm.c
 msgid "Touch alarms not available"
 msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 8150f56432..e62aab5b80 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -1743,6 +1743,7 @@ msgstr "Apenas um TouchAlarm pode ser colocado em deep sleep."
 
 #: ports/esp32s2/common-hal/alarm/time/TimeAlarm.c
 #: ports/nrf/common-hal/alarm/time/TimeAlarm.c
+#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
 #: ports/stm/common-hal/alarm/time/TimeAlarm.c
 msgid "Only one alarm.time alarm can be set."
 msgstr "Apenas um alarme alarm.time pode ser definido."
@@ -2093,6 +2094,7 @@ msgstr ""
 msgid "Size not supported"
 msgstr "O tamanho não é suportado"
 
+#: ports/raspberrypi/common-hal/alarm/SleepMemory.c
 #: ports/stm/common-hal/alarm/SleepMemory.c
 msgid "Sleep Memory not available"
 msgstr "Sleep memory não está disponível"
@@ -2248,6 +2250,7 @@ msgstr "Exibições demais"
 msgid "Total data to write is larger than %q"
 msgstr "O total dos dados que serão escritos é maior do que %q"
 
+#: ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c
 #: ports/stm/common-hal/alarm/touch/TouchAlarm.c
 msgid "Touch alarms not available"
 msgstr "Alarmes de toque não estão disponíveis"
diff --git a/locale/sv.po b/locale/sv.po
index 1c517419fa..417c615604 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -1727,6 +1727,7 @@ msgstr "Endast ett TouchAlarm kan ställas in för djupsömn."
 
 #: ports/esp32s2/common-hal/alarm/time/TimeAlarm.c
 #: ports/nrf/common-hal/alarm/time/TimeAlarm.c
+#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
 #: ports/stm/common-hal/alarm/time/TimeAlarm.c
 msgid "Only one alarm.time alarm can be set."
 msgstr "Endast ett alarm.time kan ställas in."
@@ -2071,6 +2072,7 @@ msgstr "Sido-setets antal pinnar måste vara mellan 1 och 5"
 msgid "Size not supported"
 msgstr "Storleken stöds inte"
 
+#: ports/raspberrypi/common-hal/alarm/SleepMemory.c
 #: ports/stm/common-hal/alarm/SleepMemory.c
 msgid "Sleep Memory not available"
 msgstr "Sömnminne inte tillgängligt"
@@ -2223,6 +2225,7 @@ msgstr "För många displayer"
 msgid "Total data to write is larger than %q"
 msgstr "Totala data att skriva är större än %q"
 
+#: ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c
 #: ports/stm/common-hal/alarm/touch/TouchAlarm.c
 msgid "Touch alarms not available"
 msgstr "Touchalarm är inte tillgängligt"
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 94cb6b0277..6053f92479 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -1730,6 +1730,7 @@ msgstr "zhǐ yǒu yí gè chù mō bì kě yǐ shè zhì zài shēn dù shuì mi
 
 #: ports/esp32s2/common-hal/alarm/time/TimeAlarm.c
 #: ports/nrf/common-hal/alarm/time/TimeAlarm.c
+#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
 #: ports/stm/common-hal/alarm/time/TimeAlarm.c
 msgid "Only one alarm.time alarm can be set."
 msgstr "zhǐ néng shè zhì yí gè bào jǐng."
@@ -2070,6 +2071,7 @@ msgstr "cè miàn shè zhì yǐn jiǎo shù bì xū jiè yú 1 hé 5 zhī jiān"
 msgid "Size not supported"
 msgstr "bù zhī chí dà xiǎo"
 
+#: ports/raspberrypi/common-hal/alarm/SleepMemory.c
 #: ports/stm/common-hal/alarm/SleepMemory.c
 msgid "Sleep Memory not available"
 msgstr "shuì mián jì yì bù kě yòng"
@@ -2221,6 +2223,7 @@ msgstr "Xiǎnshì tài duō"
 msgid "Total data to write is larger than %q"
 msgstr "yào biān xiě de zǒng shù jù dà yú %q"
 
+#: ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c
 #: ports/stm/common-hal/alarm/touch/TouchAlarm.c
 msgid "Touch alarms not available"
 msgstr "bù kě yòng chù mō bào jǐng qì"

From 15fc4c21b673032f4017131a8150bccfd468e6fd Mon Sep 17 00:00:00 2001
From: Tsutomu IKEGAMI <t-ikegami@aist.go.jp>
Date: Thu, 24 Jun 2021 21:24:23 +0900
Subject: [PATCH 299/349] Fix typo in pin names I2S_SDIN/SDOUT of Wio Terminal

---
 ports/atmel-samd/boards/seeeduino_wio_terminal/pins.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/atmel-samd/boards/seeeduino_wio_terminal/pins.c b/ports/atmel-samd/boards/seeeduino_wio_terminal/pins.c
index a5a8b088c3..fb043349f3 100644
--- a/ports/atmel-samd/boards/seeeduino_wio_terminal/pins.c
+++ b/ports/atmel-samd/boards/seeeduino_wio_terminal/pins.c
@@ -89,8 +89,8 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
 
     // I2S
     { MP_OBJ_NEW_QSTR(MP_QSTR_I2S_LRCLK),  MP_ROM_PTR(&pin_PA20) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_I2S_SDIN),  MP_ROM_PTR(&pin_PA21) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_I2S_SDOUT),  MP_ROM_PTR(&pin_PA22) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_I2S_SDOUT),  MP_ROM_PTR(&pin_PA21) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_I2S_SDIN),  MP_ROM_PTR(&pin_PA22) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_I2S_BCLK),  MP_ROM_PTR(&pin_PB16) },
 
     // RTL8720D

From 63bcee0a2c6da31a1b00d89186c22adfd12db6ac Mon Sep 17 00:00:00 2001
From: Neradoc <neraOnGit@ri1.fr>
Date: Thu, 24 Jun 2021 16:13:15 +0200
Subject: [PATCH 300/349] set hidden_by_parent when adding to displayio group

---
 shared-module/displayio/Group.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/shared-module/displayio/Group.c b/shared-module/displayio/Group.c
index a5c4795a40..ec8ad7ba5a 100644
--- a/shared-module/displayio/Group.c
+++ b/shared-module/displayio/Group.c
@@ -258,6 +258,8 @@ static void _add_layer(displayio_group_t *self, mp_obj_t layer) {
             tilegrid->in_group = true;
         }
         displayio_tilegrid_update_transform(tilegrid, &self->absolute_transform);
+        displayio_tilegrid_set_hidden_by_parent(
+            tilegrid, self->hidden || self->hidden_by_parent);
         return;
     }
     native_layer = mp_obj_cast_to_native_base(layer, &displayio_group_type);
@@ -269,6 +271,8 @@ static void _add_layer(displayio_group_t *self, mp_obj_t layer) {
             group->in_group = true;
         }
         displayio_group_update_transform(group, &self->absolute_transform);
+        displayio_group_set_hidden_by_parent(
+            group, self->hidden || self->hidden_by_parent);
         return;
     }
     mp_raise_ValueError(translate("Layer must be a Group or TileGrid subclass."));

From 6d1818611400c49fbf62065f8f108be59e1a4274 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Thu, 24 Jun 2021 19:25:32 +0200
Subject: [PATCH 301/349] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/
---
 locale/ID.po             | 31 ++++++++++++++++++++++++++++++-
 locale/cs.po             | 31 ++++++++++++++++++++++++++++++-
 locale/de_DE.po          | 31 ++++++++++++++++++++++++++++++-
 locale/el.po             | 31 ++++++++++++++++++++++++++++++-
 locale/en_GB.po          | 31 ++++++++++++++++++++++++++++++-
 locale/es.po             | 31 ++++++++++++++++++++++++++++++-
 locale/fil.po            | 31 ++++++++++++++++++++++++++++++-
 locale/fr.po             | 31 ++++++++++++++++++++++++++++++-
 locale/hi.po             | 31 ++++++++++++++++++++++++++++++-
 locale/it_IT.po          | 31 ++++++++++++++++++++++++++++++-
 locale/ja.po             | 31 ++++++++++++++++++++++++++++++-
 locale/ko.po             | 31 ++++++++++++++++++++++++++++++-
 locale/nl.po             | 31 ++++++++++++++++++++++++++++++-
 locale/pl.po             | 31 ++++++++++++++++++++++++++++++-
 locale/pt_BR.po          | 31 ++++++++++++++++++++++++++++++-
 locale/sv.po             | 31 ++++++++++++++++++++++++++++++-
 locale/zh_Latn_pinyin.po | 31 ++++++++++++++++++++++++++++++-
 17 files changed, 510 insertions(+), 17 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index a6de207fff..1d274a1570 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -90,10 +90,22 @@ msgstr "%q indeks di luar batas"
 msgid "%q indices must be integers, not %s"
 msgstr "indeks %q harus bilangan bulat, bukan %s"
 
+#: py/argcheck.c
+msgid "%q length must be %q"
+msgstr ""
+
 #: shared-bindings/vectorio/Polygon.c
 msgid "%q list must be a list"
 msgstr "daftar %q harus berupa daftar"
 
+#: py/argcheck.c
+msgid "%q must <= %d"
+msgstr ""
+
+#: py/argcheck.c
+msgid "%q must be %d-%d"
+msgstr ""
+
 #: shared-bindings/usb_hid/Device.c
 msgid "%q must be 0-255"
 msgstr ""
@@ -102,7 +114,11 @@ msgstr ""
 msgid "%q must be 1-255"
 msgstr ""
 
-#: shared-bindings/memorymonitor/AllocationAlarm.c
+#: py/argcheck.c
+msgid "%q must be >= %d"
+msgstr ""
+
+#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c
 msgid "%q must be >= 0"
 msgstr "%q harus >= 0"
 
@@ -118,6 +134,10 @@ msgstr "%q harus >= 1"
 msgid "%q must be None or between 1 and len(report_descriptor)-1"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must be a string"
+msgstr ""
+
 #: shared-module/vectorio/Polygon.c
 msgid "%q must be a tuple of length 2"
 msgstr "%q harus berupa tuple dengan panjang 2"
@@ -126,6 +146,15 @@ msgstr "%q harus berupa tuple dengan panjang 2"
 msgid "%q must be between %d and %d"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must of type %q"
+msgstr ""
+
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
+msgid "%q must store bytes"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/cs.po b/locale/cs.po
index 9895b3b7e9..d42bea036a 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -86,10 +86,22 @@ msgstr "Index %q je mimo rozsah"
 msgid "%q indices must be integers, not %s"
 msgstr "Indexy %q musí být celá čísla, nikoli %s"
 
+#: py/argcheck.c
+msgid "%q length must be %q"
+msgstr ""
+
 #: shared-bindings/vectorio/Polygon.c
 msgid "%q list must be a list"
 msgstr "Seznam %q musí být seznam"
 
+#: py/argcheck.c
+msgid "%q must <= %d"
+msgstr ""
+
+#: py/argcheck.c
+msgid "%q must be %d-%d"
+msgstr ""
+
 #: shared-bindings/usb_hid/Device.c
 msgid "%q must be 0-255"
 msgstr ""
@@ -98,7 +110,11 @@ msgstr ""
 msgid "%q must be 1-255"
 msgstr ""
 
-#: shared-bindings/memorymonitor/AllocationAlarm.c
+#: py/argcheck.c
+msgid "%q must be >= %d"
+msgstr ""
+
+#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c
 msgid "%q must be >= 0"
 msgstr "%q musí být >= 0"
 
@@ -114,6 +130,10 @@ msgstr "%q musí být > = 1"
 msgid "%q must be None or between 1 and len(report_descriptor)-1"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must be a string"
+msgstr ""
+
 #: shared-module/vectorio/Polygon.c
 msgid "%q must be a tuple of length 2"
 msgstr "%q musí být n-tice délky 2"
@@ -122,6 +142,15 @@ msgstr "%q musí být n-tice délky 2"
 msgid "%q must be between %d and %d"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must of type %q"
+msgstr ""
+
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
+msgid "%q must store bytes"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 547ec77433..2650c61171 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -91,10 +91,22 @@ msgstr "Der Index %q befindet sich außerhalb des Bereiches"
 msgid "%q indices must be integers, not %s"
 msgstr "%q Indizes müssen Integer sein, nicht %s"
 
+#: py/argcheck.c
+msgid "%q length must be %q"
+msgstr ""
+
 #: shared-bindings/vectorio/Polygon.c
 msgid "%q list must be a list"
 msgstr "%q Liste muss eine Liste sein"
 
+#: py/argcheck.c
+msgid "%q must <= %d"
+msgstr ""
+
+#: py/argcheck.c
+msgid "%q must be %d-%d"
+msgstr ""
+
 #: shared-bindings/usb_hid/Device.c
 msgid "%q must be 0-255"
 msgstr "%q muss 0-255 sein"
@@ -103,7 +115,11 @@ msgstr "%q muss 0-255 sein"
 msgid "%q must be 1-255"
 msgstr "%q muss 1-255 sein"
 
-#: shared-bindings/memorymonitor/AllocationAlarm.c
+#: py/argcheck.c
+msgid "%q must be >= %d"
+msgstr ""
+
+#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c
 msgid "%q must be >= 0"
 msgstr "%q muss >= 0 sein"
 
@@ -119,6 +135,10 @@ msgstr "%q muss >= 1 sein"
 msgid "%q must be None or between 1 and len(report_descriptor)-1"
 msgstr "%q muss None oder zwischen 1 und len(report_descriptor)-1 sein"
 
+#: py/argcheck.c
+msgid "%q must be a string"
+msgstr ""
+
 #: shared-module/vectorio/Polygon.c
 msgid "%q must be a tuple of length 2"
 msgstr "%q muss ein Tupel der Länge 2 sein"
@@ -127,6 +147,15 @@ msgstr "%q muss ein Tupel der Länge 2 sein"
 msgid "%q must be between %d and %d"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must of type %q"
+msgstr ""
+
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
+msgid "%q must store bytes"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/el.po b/locale/el.po
index 9836599004..c0b12923a0 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -83,10 +83,22 @@ msgstr ""
 msgid "%q indices must be integers, not %s"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q length must be %q"
+msgstr ""
+
 #: shared-bindings/vectorio/Polygon.c
 msgid "%q list must be a list"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must <= %d"
+msgstr ""
+
+#: py/argcheck.c
+msgid "%q must be %d-%d"
+msgstr ""
+
 #: shared-bindings/usb_hid/Device.c
 msgid "%q must be 0-255"
 msgstr ""
@@ -95,7 +107,11 @@ msgstr ""
 msgid "%q must be 1-255"
 msgstr ""
 
-#: shared-bindings/memorymonitor/AllocationAlarm.c
+#: py/argcheck.c
+msgid "%q must be >= %d"
+msgstr ""
+
+#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c
 msgid "%q must be >= 0"
 msgstr ""
 
@@ -111,6 +127,10 @@ msgstr ""
 msgid "%q must be None or between 1 and len(report_descriptor)-1"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must be a string"
+msgstr ""
+
 #: shared-module/vectorio/Polygon.c
 msgid "%q must be a tuple of length 2"
 msgstr ""
@@ -119,6 +139,15 @@ msgstr ""
 msgid "%q must be between %d and %d"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must of type %q"
+msgstr ""
+
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
+msgid "%q must store bytes"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 8308ef2454..39c6281a1f 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -92,10 +92,22 @@ msgstr "%q index out of range"
 msgid "%q indices must be integers, not %s"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q length must be %q"
+msgstr ""
+
 #: shared-bindings/vectorio/Polygon.c
 msgid "%q list must be a list"
 msgstr "%q list must be a list"
 
+#: py/argcheck.c
+msgid "%q must <= %d"
+msgstr ""
+
+#: py/argcheck.c
+msgid "%q must be %d-%d"
+msgstr ""
+
 #: shared-bindings/usb_hid/Device.c
 msgid "%q must be 0-255"
 msgstr ""
@@ -104,7 +116,11 @@ msgstr ""
 msgid "%q must be 1-255"
 msgstr ""
 
-#: shared-bindings/memorymonitor/AllocationAlarm.c
+#: py/argcheck.c
+msgid "%q must be >= %d"
+msgstr ""
+
+#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c
 msgid "%q must be >= 0"
 msgstr "%q must be >= 0"
 
@@ -120,6 +136,10 @@ msgstr "%q must be >= 1"
 msgid "%q must be None or between 1 and len(report_descriptor)-1"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must be a string"
+msgstr ""
+
 #: shared-module/vectorio/Polygon.c
 msgid "%q must be a tuple of length 2"
 msgstr "%q must be a tuple of length 2"
@@ -128,6 +148,15 @@ msgstr "%q must be a tuple of length 2"
 msgid "%q must be between %d and %d"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must of type %q"
+msgstr ""
+
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
+msgid "%q must store bytes"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/es.po b/locale/es.po
index b31d45929f..2485817e15 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -94,10 +94,22 @@ msgstr "%q indice fuera de rango"
 msgid "%q indices must be integers, not %s"
 msgstr "%q indices deben ser enteros, no %s"
 
+#: py/argcheck.c
+msgid "%q length must be %q"
+msgstr ""
+
 #: shared-bindings/vectorio/Polygon.c
 msgid "%q list must be a list"
 msgstr "%q lista debe ser una lista"
 
+#: py/argcheck.c
+msgid "%q must <= %d"
+msgstr ""
+
+#: py/argcheck.c
+msgid "%q must be %d-%d"
+msgstr ""
+
 #: shared-bindings/usb_hid/Device.c
 msgid "%q must be 0-255"
 msgstr "%q debe ser de 0-255"
@@ -106,7 +118,11 @@ msgstr "%q debe ser de 0-255"
 msgid "%q must be 1-255"
 msgstr "%q debe estar entre 1-255"
 
-#: shared-bindings/memorymonitor/AllocationAlarm.c
+#: py/argcheck.c
+msgid "%q must be >= %d"
+msgstr ""
+
+#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c
 msgid "%q must be >= 0"
 msgstr "%q debe ser >= 0"
 
@@ -122,6 +138,10 @@ msgstr "%q debe ser >= 1"
 msgid "%q must be None or between 1 and len(report_descriptor)-1"
 msgstr "%q debe ser None o entre 1 y len(report_descriptor)-1"
 
+#: py/argcheck.c
+msgid "%q must be a string"
+msgstr ""
+
 #: shared-module/vectorio/Polygon.c
 msgid "%q must be a tuple of length 2"
 msgstr "%q debe ser una tupla de longitud 2"
@@ -130,6 +150,15 @@ msgstr "%q debe ser una tupla de longitud 2"
 msgid "%q must be between %d and %d"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must of type %q"
+msgstr ""
+
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
+msgid "%q must store bytes"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/fil.po b/locale/fil.po
index eab8df305c..324686883d 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -82,10 +82,22 @@ msgstr "%q indeks wala sa sakop"
 msgid "%q indices must be integers, not %s"
 msgstr "%q indeks ay dapat integers, hindi %s"
 
+#: py/argcheck.c
+msgid "%q length must be %q"
+msgstr ""
+
 #: shared-bindings/vectorio/Polygon.c
 msgid "%q list must be a list"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must <= %d"
+msgstr ""
+
+#: py/argcheck.c
+msgid "%q must be %d-%d"
+msgstr ""
+
 #: shared-bindings/usb_hid/Device.c
 msgid "%q must be 0-255"
 msgstr ""
@@ -94,7 +106,11 @@ msgstr ""
 msgid "%q must be 1-255"
 msgstr ""
 
-#: shared-bindings/memorymonitor/AllocationAlarm.c
+#: py/argcheck.c
+msgid "%q must be >= %d"
+msgstr ""
+
+#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c
 msgid "%q must be >= 0"
 msgstr ""
 
@@ -111,6 +127,10 @@ msgstr "aarehas na haba dapat ang buffer slices"
 msgid "%q must be None or between 1 and len(report_descriptor)-1"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must be a string"
+msgstr ""
+
 #: shared-module/vectorio/Polygon.c
 msgid "%q must be a tuple of length 2"
 msgstr ""
@@ -119,6 +139,15 @@ msgstr ""
 msgid "%q must be between %d and %d"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must of type %q"
+msgstr ""
+
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
+msgid "%q must store bytes"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/fr.po b/locale/fr.po
index 34b9a629fd..2c1d3225a7 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -94,10 +94,22 @@ msgstr "index %q hors de portée"
 msgid "%q indices must be integers, not %s"
 msgstr "les indices %q doivent être des entiers, pas %s"
 
+#: py/argcheck.c
+msgid "%q length must be %q"
+msgstr ""
+
 #: shared-bindings/vectorio/Polygon.c
 msgid "%q list must be a list"
 msgstr "La liste %q doit être une liste"
 
+#: py/argcheck.c
+msgid "%q must <= %d"
+msgstr ""
+
+#: py/argcheck.c
+msgid "%q must be %d-%d"
+msgstr ""
+
 #: shared-bindings/usb_hid/Device.c
 msgid "%q must be 0-255"
 msgstr ""
@@ -106,7 +118,11 @@ msgstr ""
 msgid "%q must be 1-255"
 msgstr "%q doit être compris entre 1 et 255"
 
-#: shared-bindings/memorymonitor/AllocationAlarm.c
+#: py/argcheck.c
+msgid "%q must be >= %d"
+msgstr ""
+
+#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c
 msgid "%q must be >= 0"
 msgstr "%q doit être >= 0"
 
@@ -122,6 +138,10 @@ msgstr "%q doit être >= 1"
 msgid "%q must be None or between 1 and len(report_descriptor)-1"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must be a string"
+msgstr ""
+
 #: shared-module/vectorio/Polygon.c
 msgid "%q must be a tuple of length 2"
 msgstr "%q doit être un tuple de longueur 2"
@@ -130,6 +150,15 @@ msgstr "%q doit être un tuple de longueur 2"
 msgid "%q must be between %d and %d"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must of type %q"
+msgstr ""
+
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
+msgid "%q must store bytes"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/hi.po b/locale/hi.po
index 0dce59821e..0f29629d4f 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -83,10 +83,22 @@ msgstr ""
 msgid "%q indices must be integers, not %s"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q length must be %q"
+msgstr ""
+
 #: shared-bindings/vectorio/Polygon.c
 msgid "%q list must be a list"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must <= %d"
+msgstr ""
+
+#: py/argcheck.c
+msgid "%q must be %d-%d"
+msgstr ""
+
 #: shared-bindings/usb_hid/Device.c
 msgid "%q must be 0-255"
 msgstr ""
@@ -95,7 +107,11 @@ msgstr ""
 msgid "%q must be 1-255"
 msgstr ""
 
-#: shared-bindings/memorymonitor/AllocationAlarm.c
+#: py/argcheck.c
+msgid "%q must be >= %d"
+msgstr ""
+
+#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c
 msgid "%q must be >= 0"
 msgstr ""
 
@@ -111,6 +127,10 @@ msgstr ""
 msgid "%q must be None or between 1 and len(report_descriptor)-1"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must be a string"
+msgstr ""
+
 #: shared-module/vectorio/Polygon.c
 msgid "%q must be a tuple of length 2"
 msgstr ""
@@ -119,6 +139,15 @@ msgstr ""
 msgid "%q must be between %d and %d"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must of type %q"
+msgstr ""
+
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
+msgid "%q must store bytes"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 4dc81195b8..80d06b9dfe 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -92,10 +92,22 @@ msgstr "indice %q fuori intervallo"
 msgid "%q indices must be integers, not %s"
 msgstr "gli indici %q devono essere interi, non %s"
 
+#: py/argcheck.c
+msgid "%q length must be %q"
+msgstr ""
+
 #: shared-bindings/vectorio/Polygon.c
 msgid "%q list must be a list"
 msgstr "lista %q deve essere una lista"
 
+#: py/argcheck.c
+msgid "%q must <= %d"
+msgstr ""
+
+#: py/argcheck.c
+msgid "%q must be %d-%d"
+msgstr ""
+
 #: shared-bindings/usb_hid/Device.c
 msgid "%q must be 0-255"
 msgstr ""
@@ -104,7 +116,11 @@ msgstr ""
 msgid "%q must be 1-255"
 msgstr ""
 
-#: shared-bindings/memorymonitor/AllocationAlarm.c
+#: py/argcheck.c
+msgid "%q must be >= %d"
+msgstr ""
+
+#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c
 msgid "%q must be >= 0"
 msgstr "%q deve essere >= 0"
 
@@ -121,6 +137,10 @@ msgstr "slice del buffer devono essere della stessa lunghezza"
 msgid "%q must be None or between 1 and len(report_descriptor)-1"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must be a string"
+msgstr ""
+
 #: shared-module/vectorio/Polygon.c
 msgid "%q must be a tuple of length 2"
 msgstr "%q deve essere una tupla di lunghezza 2"
@@ -129,6 +149,15 @@ msgstr "%q deve essere una tupla di lunghezza 2"
 msgid "%q must be between %d and %d"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must of type %q"
+msgstr ""
+
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
+msgid "%q must store bytes"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/ja.po b/locale/ja.po
index 12fee78eb1..11c6f9838a 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -88,10 +88,22 @@ msgstr "%q インデックスは範囲外"
 msgid "%q indices must be integers, not %s"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q length must be %q"
+msgstr ""
+
 #: shared-bindings/vectorio/Polygon.c
 msgid "%q list must be a list"
 msgstr "%q リストはリストでなければなりません"
 
+#: py/argcheck.c
+msgid "%q must <= %d"
+msgstr ""
+
+#: py/argcheck.c
+msgid "%q must be %d-%d"
+msgstr ""
+
 #: shared-bindings/usb_hid/Device.c
 msgid "%q must be 0-255"
 msgstr ""
@@ -100,7 +112,11 @@ msgstr ""
 msgid "%q must be 1-255"
 msgstr ""
 
-#: shared-bindings/memorymonitor/AllocationAlarm.c
+#: py/argcheck.c
+msgid "%q must be >= %d"
+msgstr ""
+
+#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c
 msgid "%q must be >= 0"
 msgstr "%qは0以上でなければなりません"
 
@@ -116,6 +132,10 @@ msgstr "%qは1以上でなければなりません"
 msgid "%q must be None or between 1 and len(report_descriptor)-1"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must be a string"
+msgstr ""
+
 #: shared-module/vectorio/Polygon.c
 msgid "%q must be a tuple of length 2"
 msgstr "%qは長さ2のタプルでなければなりません"
@@ -124,6 +144,15 @@ msgstr "%qは長さ2のタプルでなければなりません"
 msgid "%q must be between %d and %d"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must of type %q"
+msgstr ""
+
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
+msgid "%q must store bytes"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/ko.po b/locale/ko.po
index 26eb8542e5..f12240602a 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -84,10 +84,22 @@ msgstr "%q 인덱스 범위를 벗어났습니다"
 msgid "%q indices must be integers, not %s"
 msgstr "%q 인덱스는 %s 가 아닌 정수 여야합니다"
 
+#: py/argcheck.c
+msgid "%q length must be %q"
+msgstr ""
+
 #: shared-bindings/vectorio/Polygon.c
 msgid "%q list must be a list"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must <= %d"
+msgstr ""
+
+#: py/argcheck.c
+msgid "%q must be %d-%d"
+msgstr ""
+
 #: shared-bindings/usb_hid/Device.c
 msgid "%q must be 0-255"
 msgstr ""
@@ -96,7 +108,11 @@ msgstr ""
 msgid "%q must be 1-255"
 msgstr ""
 
-#: shared-bindings/memorymonitor/AllocationAlarm.c
+#: py/argcheck.c
+msgid "%q must be >= %d"
+msgstr ""
+
+#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c
 msgid "%q must be >= 0"
 msgstr ""
 
@@ -112,6 +128,10 @@ msgstr "%q 는 >=1이어야합니다"
 msgid "%q must be None or between 1 and len(report_descriptor)-1"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must be a string"
+msgstr ""
+
 #: shared-module/vectorio/Polygon.c
 msgid "%q must be a tuple of length 2"
 msgstr ""
@@ -120,6 +140,15 @@ msgstr ""
 msgid "%q must be between %d and %d"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must of type %q"
+msgstr ""
+
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
+msgid "%q must store bytes"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/nl.po b/locale/nl.po
index fbc7e09e14..2d755f0917 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -86,10 +86,22 @@ msgstr "%q index buiten bereik"
 msgid "%q indices must be integers, not %s"
 msgstr "%q indexen moeten integers zijn, niet %s"
 
+#: py/argcheck.c
+msgid "%q length must be %q"
+msgstr ""
+
 #: shared-bindings/vectorio/Polygon.c
 msgid "%q list must be a list"
 msgstr "%q lijst moet een lijst zijn"
 
+#: py/argcheck.c
+msgid "%q must <= %d"
+msgstr ""
+
+#: py/argcheck.c
+msgid "%q must be %d-%d"
+msgstr ""
+
 #: shared-bindings/usb_hid/Device.c
 msgid "%q must be 0-255"
 msgstr ""
@@ -98,7 +110,11 @@ msgstr ""
 msgid "%q must be 1-255"
 msgstr ""
 
-#: shared-bindings/memorymonitor/AllocationAlarm.c
+#: py/argcheck.c
+msgid "%q must be >= %d"
+msgstr ""
+
+#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c
 msgid "%q must be >= 0"
 msgstr "%q moet >= 0 zijn"
 
@@ -114,6 +130,10 @@ msgstr "%q moet >= 1 zijn"
 msgid "%q must be None or between 1 and len(report_descriptor)-1"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must be a string"
+msgstr ""
+
 #: shared-module/vectorio/Polygon.c
 msgid "%q must be a tuple of length 2"
 msgstr "%q moet een tuple van lengte 2 zijn"
@@ -122,6 +142,15 @@ msgstr "%q moet een tuple van lengte 2 zijn"
 msgid "%q must be between %d and %d"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must of type %q"
+msgstr ""
+
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
+msgid "%q must store bytes"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/pl.po b/locale/pl.po
index a68bf6ccba..fd3fdfc889 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -88,10 +88,22 @@ msgstr "%q poza zakresem"
 msgid "%q indices must be integers, not %s"
 msgstr "%q indeks musi być liczbą całkowitą, a nie %s"
 
+#: py/argcheck.c
+msgid "%q length must be %q"
+msgstr ""
+
 #: shared-bindings/vectorio/Polygon.c
 msgid "%q list must be a list"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must <= %d"
+msgstr ""
+
+#: py/argcheck.c
+msgid "%q must be %d-%d"
+msgstr ""
+
 #: shared-bindings/usb_hid/Device.c
 msgid "%q must be 0-255"
 msgstr ""
@@ -100,7 +112,11 @@ msgstr ""
 msgid "%q must be 1-255"
 msgstr ""
 
-#: shared-bindings/memorymonitor/AllocationAlarm.c
+#: py/argcheck.c
+msgid "%q must be >= %d"
+msgstr ""
+
+#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c
 msgid "%q must be >= 0"
 msgstr "%q musi być >= 0"
 
@@ -116,6 +132,10 @@ msgstr "%q musi być >= 1"
 msgid "%q must be None or between 1 and len(report_descriptor)-1"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must be a string"
+msgstr ""
+
 #: shared-module/vectorio/Polygon.c
 msgid "%q must be a tuple of length 2"
 msgstr "%q musi być krotką o długości 2"
@@ -124,6 +144,15 @@ msgstr "%q musi być krotką o długości 2"
 msgid "%q must be between %d and %d"
 msgstr ""
 
+#: py/argcheck.c
+msgid "%q must of type %q"
+msgstr ""
+
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
+msgid "%q must store bytes"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index e62aab5b80..77f048dfaf 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -92,10 +92,22 @@ msgstr "O índice %q está fora do intervalo"
 msgid "%q indices must be integers, not %s"
 msgstr "Os índices %q devem ser inteiros, e não %s"
 
+#: py/argcheck.c
+msgid "%q length must be %q"
+msgstr ""
+
 #: shared-bindings/vectorio/Polygon.c
 msgid "%q list must be a list"
 msgstr "A lista %q deve ser uma lista"
 
+#: py/argcheck.c
+msgid "%q must <= %d"
+msgstr ""
+
+#: py/argcheck.c
+msgid "%q must be %d-%d"
+msgstr ""
+
 #: shared-bindings/usb_hid/Device.c
 msgid "%q must be 0-255"
 msgstr "%q deve ser entre 0-255"
@@ -104,7 +116,11 @@ msgstr "%q deve ser entre 0-255"
 msgid "%q must be 1-255"
 msgstr "%q deve ser 1-255"
 
-#: shared-bindings/memorymonitor/AllocationAlarm.c
+#: py/argcheck.c
+msgid "%q must be >= %d"
+msgstr ""
+
+#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c
 msgid "%q must be >= 0"
 msgstr "%q deve ser >= 0"
 
@@ -120,6 +136,10 @@ msgstr "%q deve ser >= 1"
 msgid "%q must be None or between 1 and len(report_descriptor)-1"
 msgstr "%q deve ser None ou entre 1 e len(report_descriptor)-1"
 
+#: py/argcheck.c
+msgid "%q must be a string"
+msgstr ""
+
 #: shared-module/vectorio/Polygon.c
 msgid "%q must be a tuple of length 2"
 msgstr "%q deve ser uma tupla de comprimento 2"
@@ -128,6 +148,15 @@ msgstr "%q deve ser uma tupla de comprimento 2"
 msgid "%q must be between %d and %d"
 msgstr "%q deve estar entre %d e %d"
 
+#: py/argcheck.c
+msgid "%q must of type %q"
+msgstr ""
+
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
+msgid "%q must store bytes"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/sv.po b/locale/sv.po
index 417c615604..9ef10d2d6d 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -91,10 +91,22 @@ msgstr "Index %q ligger utanför intervallet"
 msgid "%q indices must be integers, not %s"
 msgstr "Indexet %q måste vara ett heltal, inte %s"
 
+#: py/argcheck.c
+msgid "%q length must be %q"
+msgstr ""
+
 #: shared-bindings/vectorio/Polygon.c
 msgid "%q list must be a list"
 msgstr "%q-listan måste vara en lista"
 
+#: py/argcheck.c
+msgid "%q must <= %d"
+msgstr ""
+
+#: py/argcheck.c
+msgid "%q must be %d-%d"
+msgstr ""
+
 #: shared-bindings/usb_hid/Device.c
 msgid "%q must be 0-255"
 msgstr "%q måste vara 0-255"
@@ -103,7 +115,11 @@ msgstr "%q måste vara 0-255"
 msgid "%q must be 1-255"
 msgstr "%q måste vara 1-255"
 
-#: shared-bindings/memorymonitor/AllocationAlarm.c
+#: py/argcheck.c
+msgid "%q must be >= %d"
+msgstr ""
+
+#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c
 msgid "%q must be >= 0"
 msgstr "%q måste vara >= 0"
 
@@ -119,6 +135,10 @@ msgstr "%q måste vara >= 1"
 msgid "%q must be None or between 1 and len(report_descriptor)-1"
 msgstr "%q måste vara None eller mellan 1 och len(report_descriptor)-1"
 
+#: py/argcheck.c
+msgid "%q must be a string"
+msgstr ""
+
 #: shared-module/vectorio/Polygon.c
 msgid "%q must be a tuple of length 2"
 msgstr "%q måste vara en tuple av längd 2"
@@ -127,6 +147,15 @@ msgstr "%q måste vara en tuple av längd 2"
 msgid "%q must be between %d and %d"
 msgstr "%q måste vara mellan %d och %d"
 
+#: py/argcheck.c
+msgid "%q must of type %q"
+msgstr ""
+
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
+msgid "%q must store bytes"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 6053f92479..40fe4c0b3c 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -93,10 +93,22 @@ msgstr "%q suǒyǐn chāochū fànwéi"
 msgid "%q indices must be integers, not %s"
 msgstr "%q suǒyǐn bìxū shì zhěngshù, ér bùshì %s"
 
+#: py/argcheck.c
+msgid "%q length must be %q"
+msgstr ""
+
 #: shared-bindings/vectorio/Polygon.c
 msgid "%q list must be a list"
 msgstr "%q lièbiǎo bìxū shì lièbiǎo"
 
+#: py/argcheck.c
+msgid "%q must <= %d"
+msgstr ""
+
+#: py/argcheck.c
+msgid "%q must be %d-%d"
+msgstr ""
+
 #: shared-bindings/usb_hid/Device.c
 msgid "%q must be 0-255"
 msgstr "%q bì xū wéi 0-255"
@@ -105,7 +117,11 @@ msgstr "%q bì xū wéi 0-255"
 msgid "%q must be 1-255"
 msgstr "%q bì xū wéi 1-255"
 
-#: shared-bindings/memorymonitor/AllocationAlarm.c
+#: py/argcheck.c
+msgid "%q must be >= %d"
+msgstr ""
+
+#: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c
 msgid "%q must be >= 0"
 msgstr "%q Bìxū > = 0"
 
@@ -121,6 +137,10 @@ msgstr "%q bìxū dàyú huò děngyú 1"
 msgid "%q must be None or between 1 and len(report_descriptor)-1"
 msgstr "%q bì xū wéi wú huò zài 1 hé len(report_descriptor)-1 zhī jiān"
 
+#: py/argcheck.c
+msgid "%q must be a string"
+msgstr ""
+
 #: shared-module/vectorio/Polygon.c
 msgid "%q must be a tuple of length 2"
 msgstr "%q bìxū shì chángdù wèi 2 de yuán zǔ"
@@ -129,6 +149,15 @@ msgstr "%q bìxū shì chángdù wèi 2 de yuán zǔ"
 msgid "%q must be between %d and %d"
 msgstr "%q bì xū zài %d hé %d zhī jiān"
 
+#: py/argcheck.c
+msgid "%q must of type %q"
+msgstr ""
+
+#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
+#: shared-bindings/keypad/ShiftRegisterKeys.c
+msgid "%q must store bytes"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"

From e0eecd2f76b5e77271ee2dd3bb8b14d5bb3efad2 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Thu, 24 Jun 2021 21:11:12 +0530
Subject: [PATCH 302/349] update idf to v4.3

- update idf submodule to release/v4.3
- finish todo tasks held due to idf@v4.2
- update SPI & I2C to make them v4.3 compatible
---
 .gitmodules                                   |   1 +
 locale/circuitpython.pot                      |   4 +
 ports/esp32s2/Makefile                        | 132 +++---
 .../boards/espressif_kaluga_1.3/sdkconfig     |  23 -
 ports/esp32s2/common-hal/alarm/__init__.c     |   2 +-
 ports/esp32s2/common-hal/alarm/pin/PinAlarm.c |  12 +-
 ports/esp32s2/common-hal/analogio/AnalogIn.h  |   2 +-
 ports/esp32s2/common-hal/busio/I2C.c          |   8 +-
 ports/esp32s2/common-hal/busio/I2C.h          |   5 +-
 ports/esp32s2/common-hal/busio/SPI.c          | 392 ++++++------------
 ports/esp32s2/common-hal/busio/SPI.h          |  32 +-
 ports/esp32s2/common-hal/busio/UART.h         |   2 +-
 .../common-hal/digitalio/DigitalInOut.c       |   2 +-
 ports/esp32s2/common-hal/dualbank/__init__.c  |   5 +-
 .../esp32s2/common-hal/microcontroller/Pin.c  |   2 +-
 ports/esp32s2/common-hal/rtc/RTC.c            |   2 +-
 ports/esp32s2/esp-idf                         |   2 +-
 ports/esp32s2/peripherals/pins.h              |   6 +-
 ports/esp32s2/peripherals/touch.c             |   2 -
 ports/esp32s2/supervisor/port.c               |   4 +-
 ports/esp32s2/supervisor/usb.c                |   6 +-
 21 files changed, 241 insertions(+), 405 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 55fce0eebb..382d9d92ec 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -153,6 +153,7 @@
 [submodule "ports/esp32s2/esp-idf"]
 	path = ports/esp32s2/esp-idf
 	url = https://github.com/adafruit/esp-idf.git
+	branch = circuitpython-v4.3
 [submodule "ports/esp32s2/certificates/nina-fw"]
 	path = ports/esp32s2/certificates/nina-fw
 	url = https://github.com/adafruit/nina-fw.git
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 55d3d9da8f..095fb67883 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -1997,6 +1997,10 @@ msgstr ""
 msgid "SPI Re-initialization error"
 msgstr ""
 
+#: ports/esp32s2/common-hal/busio/SPI.c
+msgid "SPI configuration failed"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"
 msgstr ""
diff --git a/ports/esp32s2/Makefile b/ports/esp32s2/Makefile
index 8c827d923e..90fa1ece0c 100644
--- a/ports/esp32s2/Makefile
+++ b/ports/esp32s2/Makefile
@@ -38,8 +38,10 @@ PORT ?= /dev/tty.SLAB_USBtoUART
 BUILD ?= build-$(BOARD)
 
 include ../../py/mkenv.mk
+
 # Board-specific
 include boards/$(BOARD)/mpconfigboard.mk
+
 # Port-specific
 include mpconfigport.mk
 
@@ -64,51 +66,52 @@ CROSS_COMPILE = xtensa-esp32s2-elf-
 #######################################
 
 INC += -I.
-INC += -I../..
-INC += -I$(BUILD)
-INC += -I$(BUILD)/genhdr
 INC += -I./boards
 INC += -I./boards/$(BOARD)
 INC += -I./peripherals
+INC += -I../..
 INC += -I../../lib/mp-readline
 INC += -I../../lib/tinyusb/src
 INC += -I../../supervisor/shared/usb
+INC += -I$(BUILD)
+INC += -I$(BUILD)/genhdr
+INC += -I$(BUILD)/esp-idf/config
 
 INC += -isystem esp-idf
+INC += -isystem esp-idf/components/app_update/include
+INC += -isystem esp-idf/components/bootloader_support/include
+INC += -isystem esp-idf/components/driver/esp32s2/include
 INC += -isystem esp-idf/components/driver/include
-INC += -isystem esp-idf/components/freertos/include/freertos
-INC += -isystem esp-idf/components/freertos/xtensa/include
 INC += -isystem esp-idf/components/esp32s2/include
-INC += -isystem esp-idf/components/xtensa/esp32s2/include
 INC += -isystem esp-idf/components/esp_common/include
 INC += -isystem esp-idf/components/esp_event/include
+INC += -isystem esp-idf/components/esp_hw_support/include
 INC += -isystem esp-idf/components/esp_netif/include
+INC += -isystem esp-idf/components/esp_pm/include
 INC += -isystem esp-idf/components/esp_ringbuf/include
 INC += -isystem esp-idf/components/esp_rom/include
-INC += -isystem esp-idf/components/esp_wifi/include
-INC += -isystem esp-idf/components/xtensa/include
+INC += -isystem esp-idf/components/esp_system/include
 INC += -isystem esp-idf/components/esp_timer/include
-INC += -isystem esp-idf/components/mbedtls/mbedtls/include
-INC += -isystem esp-idf/components/mbedtls/port/include/
-INC += -isystem esp-idf/components/newlib/platform_include
+INC += -isystem esp-idf/components/esp_wifi/include
+INC += -isystem esp-idf/components/freertos/include
+INC += -isystem esp-idf/components/freertos/include/freertos
+INC += -isystem esp-idf/components/freertos/port/xtensa/include
+INC += -isystem esp-idf/components/hal/include
+INC += -isystem esp-idf/components/hal/esp32s2/include
+INC += -isystem esp-idf/components/heap/include
+INC += -isystem esp-idf/components/log/include/
 INC += -isystem esp-idf/components/lwip/lwip/src/include
 INC += -isystem esp-idf/components/lwip/port/esp32/include
 INC += -isystem esp-idf/components/lwip/include/apps/sntp
-INC += -isystem esp-idf/components/hal/include
-INC += -isystem esp-idf/components/hal/esp32s2/include
-INC += -isystem esp-idf/components/log/include/
-INC += -isystem esp-idf/components/driver/esp32s2/include
-INC += -isystem esp-idf/components/soc/include
-INC += -isystem esp-idf/components/soc/src/esp32s2/include
-INC += -isystem esp-idf/components/soc/soc/include
-INC += -isystem esp-idf/components/soc/soc/esp32s2/include
-INC += -isystem esp-idf/components/heap/include
-INC += -isystem esp-idf/components/esp_system/include
-INC += -isystem esp-idf/components/spi_flash/include
+INC += -isystem esp-idf/components/mbedtls/mbedtls/include
+INC += -isystem esp-idf/components/mbedtls/port/include/
+INC += -isystem esp-idf/components/newlib/platform_include
 INC += -isystem esp-idf/components/nvs_flash/include
-INC += -isystem esp-idf/components/app_update/include
-INC += -isystem esp-idf/components/bootloader_support/include
-INC += -I$(BUILD)/esp-idf/config
+INC += -isystem esp-idf/components/soc/include
+INC += -isystem esp-idf/components/soc/esp32s2/include
+INC += -isystem esp-idf/components/spi_flash/include
+INC += -isystem esp-idf/components/xtensa/esp32s2/include
+INC += -isystem esp-idf/components/xtensa/include
 
 CFLAGS += -DHAVE_CONFIG_H \
           -DMBEDTLS_CONFIG_FILE=\"mbedtls/esp_config.h\" \
@@ -136,28 +139,29 @@ CFLAGS += $(OPTIMIZATION_FLAGS)
 
 CFLAGS += $(INC) -Werror -Wall -mlongcalls -std=gnu11 -Wl,--gc-sections $(BASE_CFLAGS) $(C_DEFS) $(CFLAGS_MOD) $(COPT)
 
-LDFLAGS = $(CFLAGS) -Wl,-nostdlib  -Wl,-Map=$@.map -Wl,-cref -Wl,--undefined=uxTopUsedPriority
+LDFLAGS = $(CFLAGS) -Wl,-nostdlib -Wl,-Map=$@.map -Wl,-cref -Wl,--undefined=uxTopUsedPriority
+
 LDFLAGS += -L$(BUILD)/esp-idf/esp-idf/esp32s2 \
-           -Tesp32s2_out.ld \
-           -L$(BUILD)/esp-idf/esp-idf/esp32s2/ld \
-           -Tesp32s2.project.ld \
-           -Lesp-idf/components/esp32s2/ld \
-           -Tesp32s2.peripherals.ld \
-           -Lesp-idf/components/esp_rom/esp32s2/ld \
-           -Tesp32s2.rom.ld \
-           -Tesp32s2.rom.libgcc.ld \
-           -Tesp32s2.rom.newlib-data.ld \
-           -Tesp32s2.rom.newlib-funcs.ld \
-           -Tesp32s2.rom.spiflash.ld
+		   -L$(BUILD)/esp-idf/esp-idf/esp32s2/ld \
+		   -Lesp-idf/components/esp32s2/ld \
+		   -Lesp-idf/components/esp_rom/esp32s2/ld \
+		   -Tesp32s2_out.ld \
+		   -Tesp32s2.project.ld \
+		   -Tesp32s2.peripherals.ld \
+		   -Tesp32s2.rom.ld \
+		   -Tesp32s2.rom.api.ld \
+		   -Tesp32s2.rom.libgcc.ld \
+		   -Tesp32s2.rom.newlib-data.ld \
+		   -Tesp32s2.rom.newlib-funcs.ld \
+		   -Tesp32s2.rom.spiflash.ld
+
+LDFLAGS += -Wl,-Bstatic \
+		   -Wl,--no-warn-mismatch \
+		   -Wl,--build-id=none \
+		   -fno-rtti
+
 LIBS := -lgcc -lc -lstdc++
 
-#
-
-LDFLAGS +=  -Wl,-Bstatic \
-			-Wl,--no-warn-mismatch \
-			-Wl,--build-id=none \
-			-fno-rtti
-
 # Use toolchain libm if we're not using our own.
 ifndef INTERNAL_LIBM
 LIBS += -lm
@@ -272,11 +276,7 @@ menuconfig: $(BUILD)/esp-idf/config
 # qstr builds include headers so we need to make sure they are up to date
 $(HEADER_BUILD)/qstr.split: | $(BUILD)/esp-idf/config/sdkconfig.h
 
-ESP_IDF_COMPONENTS_LINK = freertos log esp_system esp_adc_cal esp32s2 bootloader_support pthread esp_timer vfs spi_flash app_update esp_common esp32s2 heap newlib driver xtensa soc esp_ringbuf esp_wifi esp_event wpa_supplicant mbedtls efuse nvs_flash esp_netif lwip esp-tls
-
-ESP_IDF_COMPONENTS_INCLUDE = driver freertos log soc
-
-INC += $(foreach component, $(ESP_IDF_COMPONENTS_INCLUDE), -isystem esp-idf/components/$(component)/include)
+ESP_IDF_COMPONENTS_LINK = app_update bootloader_support driver efuse esp32s2 esp_adc_cal esp_common esp_event esp_hw_support esp_netif esp_pm esp_ringbuf esp_rom esp_system esp_timer esp-tls esp_wifi freertos hal heap log lwip mbedtls newlib nvs_flash pthread soc spi_flash vfs wpa_supplicant xtensa
 
 ESP_IDF_COMPONENTS_EXPANDED = $(foreach component, $(ESP_IDF_COMPONENTS_LINK), $(BUILD)/esp-idf/esp-idf/$(component)/lib$(component).a)
 ESP_IDF_WIFI_COMPONENTS_EXPANDED = $(foreach component, $(ESP_IDF_WIFI_COMPONENTS_LINK), $(BUILD)/esp-idf/esp-idf/$(component)/lib$(component).a)
@@ -284,11 +284,11 @@ ESP_IDF_WIFI_COMPONENTS_EXPANDED = $(foreach component, $(ESP_IDF_WIFI_COMPONENT
 MBEDTLS_COMPONENTS_LINK = crypto tls x509
 MBEDTLS_COMPONENTS_LINK_EXPANDED = $(foreach component, $(MBEDTLS_COMPONENTS_LINK), $(BUILD)/esp-idf/esp-idf/mbedtls/mbedtls/library/libmbed$(component).a)
 
-BINARY_BLOBS = esp-idf/components/xtensa/esp32s2/libhal.a
+BINARY_BLOBS = esp-idf/components/xtensa/esp32s2/libxt_hal.a
 BINARY_WIFI_BLOBS = libcoexist.a libcore.a libespnow.a libmesh.a libnet80211.a libpp.a librtc.a libsmartconfig.a libphy.a
 BINARY_BLOBS += $(addprefix esp-idf/components/esp_wifi/lib/esp32s2/, $(BINARY_WIFI_BLOBS))
 
-ESP_IDF_COMPONENTS_EXPANDED += $(BUILD)/esp-idf/esp-idf/soc/soc/esp32s2/libsoc_esp32s2.a
+ESP_IDF_COMPONENTS_EXPANDED += esp-idf/components/xtensa/esp32s2/libxt_hal.a
 ESP_AUTOGEN_LD = $(BUILD)/esp-idf/esp-idf/esp32s2/esp32s2_out.ld $(BUILD)/esp-idf/esp-idf/esp32s2/ld/esp32s2.project.ld
 
 FLASH_FLAGS = --flash_mode $(CIRCUITPY_ESP_FLASH_MODE) --flash_freq $(CIRCUITPY_ESP_FLASH_FREQ) --flash_size $(CIRCUITPY_ESP_FLASH_SIZE)
@@ -301,24 +301,42 @@ all: $(BUILD)/firmware.bin $(BUILD)/firmware.uf2
 esp-idf-stamp: $(BUILD)/esp-idf/config/sdkconfig.h
 	$(Q)ninja -C $(BUILD)/esp-idf \
 		bootloader/bootloader.bin \
+		esp-idf/app_update/libapp_update.a \
 		esp-idf/bootloader_support/libbootloader_support.a \
-		esp-idf/esp-tls/libesp-tls.a \
+		esp-idf/driver/libdriver.a \
+		esp-idf/efuse/libefuse.a \
+		esp-idf/esp32s2/libesp32s2.a \
 		esp-idf/esp32s2/ld/esp32s2.project.ld \
+		esp-idf/esp_adc_cal/libesp_adc_cal.a \
+		esp-idf/esp_common/libesp_common.a \
 		esp-idf/esp_event/libesp_event.a \
+		esp-idf/esp_hw_support/libesp_hw_support.a \
 		esp-idf/esp_netif/libesp_netif.a \
+		esp-idf/esp_pm/libesp_pm.a \
+		esp-idf/esp_ringbuf/libesp_ringbuf.a \
+		esp-idf/esp_rom/libesp_rom.a \
 		esp-idf/esp_system/libesp_system.a \
+		esp-idf/esp_timer/libesp_timer.a \
+		esp-idf/esp-tls/libesp-tls.a \
 		esp-idf/esp_wifi/libesp_wifi.a \
-		esp-idf/lwip/liblwip.a \
-		esp-idf/nvs_flash/libnvs_flash.a \
-		esp-idf/wpa_supplicant/libwpa_supplicant.a \
-		esp-idf/mbedtls/libmbedtls.a \
 		esp-idf/freertos/libfreertos.a \
+		esp-idf/hal/libhal.a \
+		esp-idf/heap/libheap.a \
 		esp-idf/log/liblog.a \
+		esp-idf/lwip/liblwip.a \
+		esp-idf/mbedtls/libmbedtls.a \
+		esp-idf/newlib/libnewlib.a \
+		esp-idf/nvs_flash/libnvs_flash.a \
+		esp-idf/pthread/libpthread.a \
+		esp-idf/soc/libsoc.a \
+		esp-idf/spi_flash/libspi_flash.a \
+		esp-idf/vfs/libvfs.a \
+		esp-idf/wpa_supplicant/libwpa_supplicant.a \
 		esp-idf/xtensa/libxtensa.a
 
 $(BUILD)/firmware.elf: $(OBJ) | esp-idf-stamp
 	$(STEPECHO) "LINK $@"
-	$(Q)$(CC) -o $@ $(LDFLAGS) $^ -Wl,--start-group $(ESP_IDF_COMPONENTS_EXPANDED) $(BINARY_BLOBS) $(MBEDTLS_COMPONENTS_LINK_EXPANDED) build-$(BOARD)/esp-idf/esp-idf/newlib/libnewlib.a  -Wl,--end-group -u newlib_include_pthread_impl -Wl,--start-group $(LIBS) -Wl,--end-group build-$(BOARD)/esp-idf/esp-idf/pthread/libpthread.a  -u __cxx_fatal_exception
+	$(Q)$(CC) -o $@ $(LDFLAGS) $^ -Wl,--start-group $(ESP_IDF_COMPONENTS_EXPANDED) $(BINARY_BLOBS) $(MBEDTLS_COMPONENTS_LINK_EXPANDED) $(BUILD)/esp-idf/esp-idf/newlib/libnewlib.a  -Wl,--end-group -u newlib_include_pthread_impl -Wl,--start-group $(LIBS) -Wl,--end-group $(BUILD)/esp-idf/esp-idf/pthread/libpthread.a  -u __cxx_fatal_exception
 
 $(BUILD)/circuitpython-firmware.bin: $(BUILD)/firmware.elf | tools/build_memory_info.py
 	$(STEPECHO) "Create $@"
diff --git a/ports/esp32s2/boards/espressif_kaluga_1.3/sdkconfig b/ports/esp32s2/boards/espressif_kaluga_1.3/sdkconfig
index 26c6388fe5..9d8bbde967 100644
--- a/ports/esp32s2/boards/espressif_kaluga_1.3/sdkconfig
+++ b/ports/esp32s2/boards/espressif_kaluga_1.3/sdkconfig
@@ -1,12 +1,3 @@
-# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE is not set
-# CONFIG_COMPILER_OPTIMIZATION_SIZE is not set
-# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT is not set
-# TWAI configuration
-#
-# CONFIG_TWAI_ISR_IN_IRAM is not set
-# end of TWAI configuration
-
-#
 CONFIG_ESP32S2_SPIRAM_SUPPORT=y
 
 #
@@ -27,7 +18,6 @@ CONFIG_DEFAULT_PSRAM_CS_IO=26
 
 # CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
 # CONFIG_SPIRAM_RODATA is not set
-# CONFIG_SPIRAM_USE_AHB_DBUS3 is not set
 # CONFIG_SPIRAM_SPEED_80M is not set
 CONFIG_SPIRAM_SPEED_40M=y
 # CONFIG_SPIRAM_SPEED_26M is not set
@@ -41,16 +31,3 @@ CONFIG_SPIRAM_USE_MEMMAP=y
 CONFIG_SPIRAM_MEMTEST=y
 # CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
 # end of SPI RAM config
-
-# CONFIG_ESP_CONSOLE_UART_NONE is not set
-CONFIG_ESP_CONSOLE_UART_TX_GPIO=43
-CONFIG_ESP_CONSOLE_UART_RX_GPIO=44
-CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y
-CONFIG_LWIP_TCP_HIGH_SPEED_RETRANSMISSION=y
-CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG=y
-# CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE is not set
-CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y
-# CONFIG_OPTIMIZATION_ASSERTIONS_SILENT is not set
-# CONFIG_CONSOLE_UART_NONE is not set
-CONFIG_CONSOLE_UART_TX_GPIO=43
-CONFIG_CONSOLE_UART_RX_GPIO=44
diff --git a/ports/esp32s2/common-hal/alarm/__init__.c b/ports/esp32s2/common-hal/alarm/__init__.c
index f1d4bb36f5..7a977b093c 100644
--- a/ports/esp32s2/common-hal/alarm/__init__.c
+++ b/ports/esp32s2/common-hal/alarm/__init__.c
@@ -44,7 +44,7 @@
 
 #include "esp_sleep.h"
 
-#include "components/soc/soc/esp32s2/include/soc/rtc_cntl_reg.h"
+#include "components/soc/esp32s2/include/soc/rtc_cntl_reg.h"
 #include "components/driver/include/driver/uart.h"
 
 // Singleton instance of SleepMemory.
diff --git a/ports/esp32s2/common-hal/alarm/pin/PinAlarm.c b/ports/esp32s2/common-hal/alarm/pin/PinAlarm.c
index 948accf1fc..6c10b06cec 100644
--- a/ports/esp32s2/common-hal/alarm/pin/PinAlarm.c
+++ b/ports/esp32s2/common-hal/alarm/pin/PinAlarm.c
@@ -27,16 +27,16 @@
 
 #include "py/runtime.h"
 
-#include "shared-bindings/alarm/pin/PinAlarm.h"
-#include "shared-bindings/microcontroller/__init__.h"
-#include "shared-bindings/microcontroller/Pin.h"
 #include "supervisor/esp_port.h"
+#include "shared-bindings/alarm/pin/PinAlarm.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared-bindings/microcontroller/__init__.h"
 
 #include "components/driver/include/driver/rtc_io.h"
-#include "components/esp32s2/include/esp_sleep.h"
-#include "components/freertos/include/freertos/FreeRTOS.h"
-#include "components/soc/src/esp32s2/include/hal/gpio_ll.h"
+#include "components/esp_system/include/esp_sleep.h"
+#include "components/hal/esp32s2/include/hal/gpio_ll.h"
 #include "components/xtensa/include/esp_debug_helpers.h"
+#include "components/freertos/include/freertos/FreeRTOS.h"
 
 void common_hal_alarm_pin_pinalarm_construct(alarm_pin_pinalarm_obj_t *self, const mcu_pin_obj_t *pin, bool value, bool edge, bool pull) {
     if (edge) {
diff --git a/ports/esp32s2/common-hal/analogio/AnalogIn.h b/ports/esp32s2/common-hal/analogio/AnalogIn.h
index 8c1f8a2ffb..470570ceb3 100644
--- a/ports/esp32s2/common-hal/analogio/AnalogIn.h
+++ b/ports/esp32s2/common-hal/analogio/AnalogIn.h
@@ -29,7 +29,7 @@
 
 #include "common-hal/microcontroller/Pin.h"
 
-#include "components/soc/include/hal/adc_types.h"
+#include "components/hal/include/hal/adc_types.h"
 #include "FreeRTOS.h"
 #include "freertos/semphr.h"
 #include "py/obj.h"
diff --git a/ports/esp32s2/common-hal/busio/I2C.c b/ports/esp32s2/common-hal/busio/I2C.c
index d97ccd9f15..8052715ae9 100644
--- a/ports/esp32s2/common-hal/busio/I2C.c
+++ b/ports/esp32s2/common-hal/busio/I2C.c
@@ -88,8 +88,8 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
     }
     #endif
 
-
-    if (xSemaphoreCreateMutexStatic(&self->semaphore) != &self->semaphore) {
+    self->xSemaphore = xSemaphoreCreateMutexStatic(&self->xSemaphoreBuffer);
+    if (self->xSemaphore == NULL) {
         mp_raise_RuntimeError(translate("Unable to create lock"));
     }
     self->sda_pin = sda;
@@ -168,7 +168,7 @@ bool common_hal_busio_i2c_try_lock(busio_i2c_obj_t *self) {
     if (self->has_lock) {
         return false;
     }
-    self->has_lock = xSemaphoreTake(&self->semaphore, 0) == pdTRUE;
+    self->has_lock = xSemaphoreTake(self->xSemaphore, 0) == pdTRUE;
     return self->has_lock;
 }
 
@@ -177,7 +177,7 @@ bool common_hal_busio_i2c_has_lock(busio_i2c_obj_t *self) {
 }
 
 void common_hal_busio_i2c_unlock(busio_i2c_obj_t *self) {
-    xSemaphoreGive(&self->semaphore);
+    xSemaphoreGive(self->xSemaphore);
     self->has_lock = false;
 }
 
diff --git a/ports/esp32s2/common-hal/busio/I2C.h b/ports/esp32s2/common-hal/busio/I2C.h
index 9629e7b18e..d699b84ef1 100644
--- a/ports/esp32s2/common-hal/busio/I2C.h
+++ b/ports/esp32s2/common-hal/busio/I2C.h
@@ -29,7 +29,7 @@
 
 #include "common-hal/microcontroller/Pin.h"
 
-#include "components/soc/include/hal/i2c_types.h"
+#include "components/hal/include/hal/i2c_types.h"
 #include "FreeRTOS.h"
 #include "freertos/semphr.h"
 #include "py/obj.h"
@@ -39,7 +39,8 @@ typedef struct {
     const mcu_pin_obj_t *scl_pin;
     const mcu_pin_obj_t *sda_pin;
     i2c_port_t i2c_num;
-    StaticSemaphore_t semaphore;
+    SemaphoreHandle_t xSemaphore;
+    StaticSemaphore_t xSemaphoreBuffer;
     bool has_lock;
 } busio_i2c_obj_t;
 
diff --git a/ports/esp32s2/common-hal/busio/SPI.c b/ports/esp32s2/common-hal/busio/SPI.c
index 0e69d9f520..ce05b74b4e 100644
--- a/ports/esp32s2/common-hal/busio/SPI.c
+++ b/ports/esp32s2/common-hal/busio/SPI.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2016 Scott Shawcroft
+ * Copyright (c) 2021 microDev
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,282 +24,143 @@
  * THE SOFTWARE.
  */
 
-#include "shared-bindings/busio/SPI.h"
-#include "py/mperrno.h"
-#include "py/runtime.h"
+#include <string.h>
 
-#include "shared-bindings/microcontroller/Pin.h"
+#include "py/runtime.h"
+#include "shared-bindings/busio/SPI.h"
+
+#include "driver/spi_common_internal.h"
+
+#define SPI_MAX_DMA_BITS (SPI_MAX_DMA_LEN * 8)
 
 static bool spi_never_reset[SOC_SPI_PERIPH_NUM];
+static spi_device_handle_t spi_handle[SOC_SPI_PERIPH_NUM];
 
-// Store one lock handle per device so that we can free it.
-static spi_bus_lock_dev_handle_t lock_dev_handle[SOC_SPI_PERIPH_NUM];
-static intr_handle_t intr_handle[SOC_SPI_PERIPH_NUM];
+static bool spi_bus_is_free(spi_host_device_t host_id) {
+    return spi_bus_get_attr(host_id) == NULL;
+}
 
 void spi_reset(void) {
     for (spi_host_device_t host_id = SPI2_HOST; host_id < SOC_SPI_PERIPH_NUM; host_id++) {
         if (spi_never_reset[host_id]) {
             continue;
         }
-        bool in_use = false;
-        if (lock_dev_handle[host_id] != NULL) {
-            spi_bus_lock_unregister_dev(lock_dev_handle[host_id]);
-            lock_dev_handle[host_id] = NULL;
-            in_use = true;
-        }
-        if (intr_handle[host_id] != NULL) {
-            esp_intr_free(intr_handle[host_id]);
-            intr_handle[host_id] = NULL;
-            in_use = true;
-        }
-        if (in_use) {
+        if (!spi_bus_is_free(host_id)) {
+            spi_bus_remove_device(spi_handle[host_id]);
             spi_bus_free(host_id);
         }
     }
 }
 
-// This is copied in from the ESP-IDF because it is static.
-// Copyright 2015-2019 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-static bool bus_uses_iomux_pins(spi_host_device_t host, const spi_bus_config_t *bus_config) {
-    if (bus_config->sclk_io_num >= 0 &&
-        bus_config->sclk_io_num != spi_periph_signal[host].spiclk_iomux_pin) {
-        return false;
+static void set_spi_config(busio_spi_obj_t *self,
+    uint32_t baudrate, uint8_t polarity, uint8_t phase, uint8_t bits) {
+    const spi_device_interface_config_t device_config = {
+        .clock_speed_hz = baudrate,
+        .mode = phase | (polarity << 1),
+        .spics_io_num = -1, // No CS pin
+        .queue_size = 1,
+        .pre_cb = NULL
+    };
+    esp_err_t result = spi_bus_add_device(self->host_id, &device_config, &spi_handle[self->host_id]);
+    if (result != ESP_OK) {
+        mp_raise_RuntimeError(translate("SPI configuration failed"));
     }
-    if (bus_config->quadwp_io_num >= 0 &&
-        bus_config->quadwp_io_num != spi_periph_signal[host].spiwp_iomux_pin) {
-        return false;
-    }
-    if (bus_config->quadhd_io_num >= 0 &&
-        bus_config->quadhd_io_num != spi_periph_signal[host].spihd_iomux_pin) {
-        return false;
-    }
-    if (bus_config->mosi_io_num >= 0 &&
-        bus_config->mosi_io_num != spi_periph_signal[host].spid_iomux_pin) {
-        return false;
-    }
-    if (bus_config->miso_io_num >= 0 &&
-        bus_config->miso_io_num != spi_periph_signal[host].spiq_iomux_pin) {
-        return false;
-    }
-
-    return true;
-}
-
-// End copied code.
-
-static bool spi_bus_is_free(spi_host_device_t host_id) {
-    return spi_bus_get_attr(host_id) == NULL;
-}
-
-static void spi_interrupt_handler(void *arg) {
-    // busio_spi_obj_t *self = arg;
-}
-
-// The interrupt may get invoked by the bus lock.
-static void spi_bus_intr_enable(void *self) {
-    esp_intr_enable(((busio_spi_obj_t *)self)->interrupt);
-}
-
-// The interrupt is always disabled by the ISR itself, not exposed
-static void spi_bus_intr_disable(void *self) {
-    esp_intr_disable(((busio_spi_obj_t *)self)->interrupt);
+    self->baudrate = baudrate;
+    self->polarity = polarity;
+    self->phase = phase;
+    self->bits = bits;
 }
 
 void common_hal_busio_spi_construct(busio_spi_obj_t *self,
     const mcu_pin_obj_t *clock, const mcu_pin_obj_t *mosi,
     const mcu_pin_obj_t *miso) {
 
-    spi_bus_config_t bus_config;
-    bus_config.mosi_io_num = mosi != NULL ? mosi->number : -1;
-    bus_config.miso_io_num = miso != NULL ? miso->number : -1;
-    bus_config.sclk_io_num = clock != NULL ? clock->number : -1;
-    bus_config.quadwp_io_num = -1;
-    bus_config.quadhd_io_num = -1;
-    bus_config.max_transfer_sz = 0; // Uses the default
-    bus_config.flags = SPICOMMON_BUSFLAG_MASTER | SPICOMMON_BUSFLAG_SCLK |
-        (mosi != NULL ? SPICOMMON_BUSFLAG_MOSI : 0) |
-        (miso != NULL ? SPICOMMON_BUSFLAG_MISO : 0);
-    bus_config.intr_flags = 0;
+    const spi_bus_config_t bus_config = {
+        .mosi_io_num = mosi != NULL ? mosi->number : -1,
+        .miso_io_num = miso != NULL ? miso->number : -1,
+        .sclk_io_num = clock != NULL ? clock->number : -1,
+        .quadwp_io_num = -1,
+        .quadhd_io_num = -1,
+    };
 
-    // RAM and Flash is often on SPI1 and is unsupported by the IDF so use it as
-    // a flag value.
-    spi_host_device_t host_id = SPI1_HOST;
-    self->connected_through_gpio = true;
-    // Try and save SPI2 for pins that are on the IOMUX
-    if (bus_uses_iomux_pins(SPI2_HOST, &bus_config) && spi_bus_is_free(SPI2_HOST)) {
-        host_id = SPI2_HOST;
-        self->connected_through_gpio = false;
-    } else if (spi_bus_is_free(SPI3_HOST)) {
-        host_id = SPI3_HOST;
-    } else if (spi_bus_is_free(SPI2_HOST)) {
-        host_id = SPI2_HOST;
+    for (spi_host_device_t host_id = SPI2_HOST; host_id < SOC_SPI_PERIPH_NUM; host_id++) {
+        if (spi_bus_is_free(host_id)) {
+            self->host_id = host_id;
+        }
     }
-    if (host_id == SPI1_HOST) {
+
+    if (self->host_id == 0) {
         mp_raise_ValueError(translate("All SPI peripherals are in use"));
     }
 
-    esp_err_t result = spi_bus_initialize(host_id, &bus_config, host_id /* dma channel */);
+    esp_err_t result = spi_bus_initialize(self->host_id, &bus_config, self->host_id /* dma channel */);
     if (result == ESP_ERR_NO_MEM) {
         mp_raise_msg(&mp_type_MemoryError, translate("ESP-IDF memory allocation failed"));
     } else if (result == ESP_ERR_INVALID_ARG) {
         mp_raise_ValueError(translate("Invalid pins"));
     }
 
-    // After this point, we need to deinit to free IDF memory so fill out self's pins.
-    self->clock_pin = clock;
-    self->MOSI_pin = mosi;
-    self->MISO_pin = miso;
-    self->host_id = host_id;
+    set_spi_config(self, 250000, 0, 0, 8);
 
-    spi_bus_lock_dev_config_t config = { .flags = 0 };
-    // The returned lock is stored in the bus lock but must be freed separately with
-    // spi_bus_lock_unregister_dev.
-    result = spi_bus_lock_register_dev(spi_bus_get_attr(host_id)->lock,
-        &config,
-        &self->lock);
-    if (result == ESP_ERR_NO_MEM) {
-        common_hal_busio_spi_deinit(self);
-        mp_raise_msg(&mp_type_MemoryError, translate("ESP-IDF memory allocation failed"));
+    self->MOSI = mosi;
+    self->MISO = miso;
+    self->clock = clock;
+
+    if (mosi != NULL) {
+        claim_pin(mosi);
     }
-    lock_dev_handle[host_id] = self->lock;
-
-    result = esp_intr_alloc(spicommon_irqsource_for_host(host_id),
-        bus_config.intr_flags | ESP_INTR_FLAG_INTRDISABLED,
-        spi_interrupt_handler, self, &self->interrupt);
-    if (result == ESP_ERR_NO_MEM) {
-        common_hal_busio_spi_deinit(self);
-        mp_raise_msg(&mp_type_MemoryError, translate("ESP-IDF memory allocation failed"));
+    if (miso != NULL) {
+        claim_pin(miso);
     }
-    intr_handle[host_id] = self->interrupt;
-    spi_bus_lock_set_bg_control(spi_bus_get_attr(host_id)->lock, spi_bus_intr_enable, spi_bus_intr_disable, self);
-
-    spi_hal_context_t *hal = &self->hal_context;
-
-    // spi_hal_init clears the given hal context so set everything after.
-    spi_hal_init(hal, host_id);
-
-    // We don't use native CS.
-    // hal->cs_setup = 0;
-    // hal->cs_hold = 0;
-    // hal->cs_pin_id = 0;
-
-    hal->sio = 0;
-    hal->half_duplex = 0;
-    // hal->tx_lsbfirst = 0;
-    // hal->rx_lsbfirst = 0;
-    hal->no_compensate = 1;
-    // Ignore CS bits
-
-    // We don't use cmd, addr or dummy bits.
-    // hal->cmd = 0;
-    // hal->cmd_bits = 0;
-    // hal->addr_bits = 0;
-    // hal->dummy_bits = 0;
-    // hal->addr = 0;
-
-    claim_pin(self->clock_pin);
-    if (self->MOSI_pin != NULL) {
-        claim_pin(self->MOSI_pin);
-    }
-    if (self->MISO_pin != NULL) {
-        claim_pin(self->MISO_pin);
-    }
-
-    hal->io_mode = SPI_LL_IO_MODE_NORMAL;
-
-    common_hal_busio_spi_configure(self, 250000, 0, 0, 8);
+    claim_pin(clock);
 }
 
 void common_hal_busio_spi_never_reset(busio_spi_obj_t *self) {
     spi_never_reset[self->host_id] = true;
-
-    common_hal_never_reset_pin(self->clock_pin);
-    if (self->MOSI_pin != NULL) {
-        common_hal_never_reset_pin(self->MOSI_pin);
-    }
-    if (self->MISO_pin != NULL) {
-        common_hal_never_reset_pin(self->MISO_pin);
-    }
+    common_hal_never_reset_pin(self->clock);
+    common_hal_never_reset_pin(self->MOSI);
+    common_hal_never_reset_pin(self->MISO);
 }
 
 bool common_hal_busio_spi_deinited(busio_spi_obj_t *self) {
-    return self->clock_pin == NULL;
+    return self->clock == NULL;
 }
 
 void common_hal_busio_spi_deinit(busio_spi_obj_t *self) {
     if (common_hal_busio_spi_deinited(self)) {
         return;
     }
+
     spi_never_reset[self->host_id] = false;
-    if (self->lock != NULL) {
-        spi_bus_lock_unregister_dev(self->lock);
-        lock_dev_handle[self->host_id] = NULL;
-    }
-    if (self->interrupt != NULL) {
-        esp_intr_free(self->interrupt);
-        intr_handle[self->host_id] = NULL;
-    }
+    spi_bus_remove_device(spi_handle[self->host_id]);
     spi_bus_free(self->host_id);
 
-    common_hal_reset_pin(self->clock_pin);
-    common_hal_reset_pin(self->MOSI_pin);
-    common_hal_reset_pin(self->MISO_pin);
-    self->clock_pin = NULL;
-    self->MISO_pin = NULL;
-    self->MOSI_pin = NULL;
+    common_hal_reset_pin(self->MOSI);
+    common_hal_reset_pin(self->MISO);
+    common_hal_reset_pin(self->clock);
+    self->clock = NULL;
 }
 
 bool common_hal_busio_spi_configure(busio_spi_obj_t *self,
     uint32_t baudrate, uint8_t polarity, uint8_t phase, uint8_t bits) {
-    if (baudrate == self->target_frequency &&
+    if (baudrate == self->baudrate &&
         polarity == self->polarity &&
         phase == self->phase &&
         bits == self->bits) {
         return true;
     }
-    self->hal_context.mode = polarity << 1 | phase;
-    self->polarity = polarity;
-    self->phase = phase;
-    self->bits = bits;
-    self->target_frequency = baudrate;
-    self->hal_context.timing_conf = &self->timing_conf;
-    esp_err_t result = spi_hal_get_clock_conf(&self->hal_context,
-        self->target_frequency,
-        128 /* duty_cycle */,
-        self->connected_through_gpio,
-        0 /* input_delay_ns */,
-        &self->real_frequency,
-        &self->timing_conf);
-    if (result != ESP_OK) {
-        return false;
-    }
-
-    spi_hal_setup_device(&self->hal_context);
+    spi_bus_remove_device(spi_handle[self->host_id]);
+    set_spi_config(self, baudrate, polarity, phase, bits);
     return true;
 }
 
 bool common_hal_busio_spi_try_lock(busio_spi_obj_t *self) {
-    // If our lock has already been taken then return false because someone else
-    // may already grabbed it in our call stack.
-    if (self->has_lock) {
-        return false;
+    bool grabbed_lock = false;
+    if (!self->has_lock) {
+        grabbed_lock = true;
+        self->has_lock = true;
     }
-    // Wait to grab the lock from another task.
-    esp_err_t result = spi_bus_lock_acquire_start(self->lock, portMAX_DELAY);
-    self->has_lock = result == ESP_OK;
-    return self->has_lock;
+    return grabbed_lock;
 }
 
 bool common_hal_busio_spi_has_lock(busio_spi_obj_t *self) {
@@ -307,13 +168,12 @@ bool common_hal_busio_spi_has_lock(busio_spi_obj_t *self) {
 }
 
 void common_hal_busio_spi_unlock(busio_spi_obj_t *self) {
-    spi_bus_lock_acquire_end(self->lock);
     self->has_lock = false;
 }
 
 bool common_hal_busio_spi_write(busio_spi_obj_t *self,
     const uint8_t *data, size_t len) {
-    if (self->MOSI_pin == NULL) {
+    if (self->MOSI == NULL) {
         mp_raise_ValueError(translate("No MOSI Pin"));
     }
     return common_hal_busio_spi_transfer(self, data, NULL, len);
@@ -321,11 +181,10 @@ bool common_hal_busio_spi_write(busio_spi_obj_t *self,
 
 bool common_hal_busio_spi_read(busio_spi_obj_t *self,
     uint8_t *data, size_t len, uint8_t write_value) {
-
-    if (self->MISO_pin == NULL) {
+    if (self->MISO == NULL) {
         mp_raise_ValueError(translate("No MISO Pin"));
     }
-    if (self->MOSI_pin == NULL) {
+    if (self->MOSI == NULL) {
         return common_hal_busio_spi_transfer(self, NULL, data, len);
     } else {
         memset(data, write_value, len);
@@ -333,86 +192,73 @@ bool common_hal_busio_spi_read(busio_spi_obj_t *self,
     }
 }
 
-bool common_hal_busio_spi_transfer(busio_spi_obj_t *self, const uint8_t *data_out, uint8_t *data_in, size_t len) {
+bool common_hal_busio_spi_transfer(busio_spi_obj_t *self,
+    const uint8_t *data_out, uint8_t *data_in, size_t len) {
     if (len == 0) {
         return true;
     }
     // Other than the read special case, stop transfers that don't have a pin/array match
-    if (!self->MOSI_pin && (data_out != data_in)) {
+    if (!self->MOSI && (data_out != data_in)) {
         mp_raise_ValueError(translate("No MOSI Pin"));
     }
-    if (!self->MISO_pin && data_in) {
+    if (!self->MISO && data_in) {
         mp_raise_ValueError(translate("No MISO Pin"));
     }
 
-    spi_hal_context_t *hal = &self->hal_context;
-    hal->send_buffer = NULL;
-    hal->rcv_buffer = NULL;
-    // Reset timing_conf in case we've moved since the last time we used it.
-    hal->timing_conf = &self->timing_conf;
-    lldesc_t tx_dma __attribute__((aligned(16)));
-    lldesc_t rx_dma __attribute__((aligned(16)));
-    hal->dmadesc_tx = &tx_dma;
-    hal->dmadesc_rx = &rx_dma;
-    hal->dmadesc_n = 1;
+    spi_transaction_t transaction = { 0 };
 
-    size_t burst_length;
-    // If both of the incoming pointers are DMA capable then use DMA. Otherwise, do
-    // bursts the size of the SPI data buffer without DMA.
-    if ((data_out == NULL || esp_ptr_dma_capable(data_out)) &&
-        (data_in == NULL || esp_ptr_dma_capable(data_out))) {
-        hal->dma_enabled = 1;
-        burst_length = LLDESC_MAX_NUM_PER_DESC;
-    } else {
-        hal->dma_enabled = 0;
-        burst_length = sizeof(hal->hw->data_buf);
-        // When switching to non-DMA, we need to make sure DMA is off. Otherwise,
-        // the S2 will transmit zeroes instead of our data.
-        hal->hw->dma_out_link.dma_tx_ena = 0;
-        hal->hw->dma_out_link.stop = 1;
-    }
+    // Round to nearest whole set of bits
+    int bits_to_send = len * 8 / self->bits * self->bits;
 
-    // This rounds up.
-    size_t burst_count = (len + burst_length - 1) / burst_length;
-    for (size_t i = 0; i < burst_count; i++) {
-        size_t offset = burst_length * i;
-        size_t this_length = len - offset;
-        if (this_length > burst_length) {
-            this_length = burst_length;
-        }
-        hal->tx_bitlen = this_length * self->bits;
-        hal->rx_bitlen = this_length * self->bits;
+    if (len <= 4) {
         if (data_out != NULL) {
-            hal->send_buffer = (uint8_t *)data_out + offset;
-        }
-        if (data_in != NULL) {
-            hal->rcv_buffer = data_in + offset;
+            memcpy(&transaction.tx_data, data_out, len);
         }
 
-        spi_hal_setup_trans(hal);
-        spi_hal_prepare_data(hal);
-        spi_hal_user_start(hal);
-        // TODO: Switch to waiting on a lock that is given by an interrupt.
-        while (!spi_hal_usr_is_done(hal)) {
+        transaction.flags = SPI_TRANS_USE_TXDATA | SPI_TRANS_USE_RXDATA;
+        transaction.length = bits_to_send;
+        spi_device_transmit(spi_handle[self->host_id], &transaction);
+
+        if (data_in != NULL) {
+            memcpy(data_in, &transaction.rx_data, len);
+        }
+    } else {
+        int offset = 0;
+        int bits_remaining = bits_to_send;
+
+        while (bits_remaining && !mp_hal_is_interrupted()) {
+            memset(&transaction, 0, sizeof(transaction));
+
+            transaction.length =
+                bits_remaining > SPI_MAX_DMA_BITS ? SPI_MAX_DMA_BITS : bits_remaining;
+
+            if (data_out != NULL) {
+                transaction.tx_buffer = data_out + offset;
+            }
+            if (data_in != NULL) {
+                transaction.rx_buffer = data_in + offset;
+            }
+
+            spi_device_transmit(spi_handle[self->host_id], &transaction);
+            bits_remaining -= transaction.length;
+
+            // doesn't need ceil(); loop ends when bits_remaining is 0
+            offset += transaction.length / 8;
+
             RUN_BACKGROUND_TASKS;
         }
-        spi_hal_fetch_result(hal);
     }
-    hal->dmadesc_tx = NULL;
-    hal->dmadesc_rx = NULL;
-    hal->dmadesc_n = 0;
-
     return true;
 }
 
 uint32_t common_hal_busio_spi_get_frequency(busio_spi_obj_t *self) {
-    return self->real_frequency;
-}
-
-uint8_t common_hal_busio_spi_get_phase(busio_spi_obj_t *self) {
-    return self->phase;
+    return self->baudrate;
 }
 
 uint8_t common_hal_busio_spi_get_polarity(busio_spi_obj_t *self) {
     return self->polarity;
 }
+
+uint8_t common_hal_busio_spi_get_phase(busio_spi_obj_t *self) {
+    return self->phase;
+}
diff --git a/ports/esp32s2/common-hal/busio/SPI.h b/ports/esp32s2/common-hal/busio/SPI.h
index 488c0954ed..34ec8665c6 100644
--- a/ports/esp32s2/common-hal/busio/SPI.h
+++ b/ports/esp32s2/common-hal/busio/SPI.h
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2016 Scott Shawcroft
+ * Copyright (c) 2021 microDev
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -27,30 +27,24 @@
 #ifndef MICROPY_INCLUDED_ESP32S2_COMMON_HAL_BUSIO_SPI_H
 #define MICROPY_INCLUDED_ESP32S2_COMMON_HAL_BUSIO_SPI_H
 
-#include "common-hal/microcontroller/Pin.h"
-
-#include "components/driver/include/driver/spi_common_internal.h"
-#include "components/soc/include/hal/spi_hal.h"
-#include "components/soc/include/hal/spi_types.h"
-#include "py/obj.h"
+#include "driver/spi_master.h"
+#include "shared-bindings/microcontroller/Pin.h"
 
 typedef struct {
     mp_obj_base_t base;
-    const mcu_pin_obj_t *clock_pin;
-    const mcu_pin_obj_t *MOSI_pin;
-    const mcu_pin_obj_t *MISO_pin;
+
+    const mcu_pin_obj_t* MOSI;
+    const mcu_pin_obj_t* MISO;
+    const mcu_pin_obj_t* clock;
+
     spi_host_device_t host_id;
-    spi_bus_lock_dev_handle_t lock;
-    spi_hal_context_t hal_context;
-    spi_hal_timing_conf_t timing_conf;
-    intr_handle_t interrupt;
-    uint32_t target_frequency;
-    int32_t real_frequency;
-    uint8_t polarity;
-    uint8_t phase;
+
     uint8_t bits;
+    uint8_t phase;
+    uint8_t polarity;
+    uint32_t baudrate;
+
     bool has_lock;
-    bool connected_through_gpio;
 } busio_spi_obj_t;
 
 void spi_reset(void);
diff --git a/ports/esp32s2/common-hal/busio/UART.h b/ports/esp32s2/common-hal/busio/UART.h
index 0d19221c8f..4c80132050 100644
--- a/ports/esp32s2/common-hal/busio/UART.h
+++ b/ports/esp32s2/common-hal/busio/UART.h
@@ -29,7 +29,7 @@
 
 #include "common-hal/microcontroller/Pin.h"
 
-#include "components/soc/include/hal/uart_types.h"
+#include "components/hal/include/hal/uart_types.h"
 #include "py/obj.h"
 
 typedef struct {
diff --git a/ports/esp32s2/common-hal/digitalio/DigitalInOut.c b/ports/esp32s2/common-hal/digitalio/DigitalInOut.c
index f2c40ce9ba..24c5d5110d 100644
--- a/ports/esp32s2/common-hal/digitalio/DigitalInOut.c
+++ b/ports/esp32s2/common-hal/digitalio/DigitalInOut.c
@@ -30,7 +30,7 @@
 
 #include "components/driver/include/driver/gpio.h"
 
-#include "components/soc/include/hal/gpio_hal.h"
+#include "components/hal/include/hal/gpio_hal.h"
 
 void common_hal_digitalio_digitalinout_never_reset(
     digitalio_digitalinout_obj_t *self) {
diff --git a/ports/esp32s2/common-hal/dualbank/__init__.c b/ports/esp32s2/common-hal/dualbank/__init__.c
index 04f5d6203d..91c7981dd9 100644
--- a/ports/esp32s2/common-hal/dualbank/__init__.c
+++ b/ports/esp32s2/common-hal/dualbank/__init__.c
@@ -38,10 +38,7 @@ static esp_ota_handle_t update_handle = 0;
 static const char *TAG = "dualbank";
 
 void dualbank_reset(void) {
-    // should use `abort` instead of `end`
-    // but not in idf v4.2
-    // esp_ota_abort(update_handle);
-    if (esp_ota_end(update_handle) == ESP_OK) {
+    if (esp_ota_abort(update_handle) == ESP_OK) {
         update_handle = 0;
         update_partition = NULL;
     }
diff --git a/ports/esp32s2/common-hal/microcontroller/Pin.c b/ports/esp32s2/common-hal/microcontroller/Pin.c
index 7b69c1d6ee..00c94cef6c 100644
--- a/ports/esp32s2/common-hal/microcontroller/Pin.c
+++ b/ports/esp32s2/common-hal/microcontroller/Pin.c
@@ -31,7 +31,7 @@
 #include "py/mphal.h"
 
 #include "components/driver/include/driver/gpio.h"
-#include "components/soc/include/hal/gpio_hal.h"
+#include "components/hal/include/hal/gpio_hal.h"
 
 STATIC uint32_t never_reset_pins[2];
 STATIC uint32_t in_use[2];
diff --git a/ports/esp32s2/common-hal/rtc/RTC.c b/ports/esp32s2/common-hal/rtc/RTC.c
index 4d8713639f..a78c2fb613 100644
--- a/ports/esp32s2/common-hal/rtc/RTC.c
+++ b/ports/esp32s2/common-hal/rtc/RTC.c
@@ -28,7 +28,7 @@
 
 #include "py/obj.h"
 #include "py/runtime.h"
-#include "components/soc/soc/include/soc/rtc_periph.h"
+#include "components/soc/include/soc/rtc_periph.h"
 #include "shared-bindings/rtc/RTC.h"
 
 void common_hal_rtc_get_time(timeutils_struct_time_t *tm) {
diff --git a/ports/esp32s2/esp-idf b/ports/esp32s2/esp-idf
index f30a865fd1..d97b6863ba 160000
--- a/ports/esp32s2/esp-idf
+++ b/ports/esp32s2/esp-idf
@@ -1 +1 @@
-Subproject commit f30a865fd1a44d880b909b84112f74741412c2ce
+Subproject commit d97b6863badec4643bf8d1d1058a65d723572882
diff --git a/ports/esp32s2/peripherals/pins.h b/ports/esp32s2/peripherals/pins.h
index 0ffa482166..5a5867ea0c 100644
--- a/ports/esp32s2/peripherals/pins.h
+++ b/ports/esp32s2/peripherals/pins.h
@@ -35,9 +35,9 @@
 #include "esp32s2_peripherals_config.h"
 #include "esp-idf/config/sdkconfig.h"
 
-#include "components/soc/include/hal/gpio_types.h"
-#include "components/soc/include/hal/adc_types.h"
-#include "components/soc/include/hal/touch_sensor_types.h"
+#include "components/hal/include/hal/gpio_types.h"
+#include "components/hal/include/hal/adc_types.h"
+#include "components/hal/include/hal/touch_sensor_types.h"
 
 typedef struct {
     PIN_PREFIX_FIELDS
diff --git a/ports/esp32s2/peripherals/touch.c b/ports/esp32s2/peripherals/touch.c
index cd895b10be..eeba49c683 100644
--- a/ports/esp32s2/peripherals/touch.c
+++ b/ports/esp32s2/peripherals/touch.c
@@ -24,8 +24,6 @@
  * THE SOFTWARE.
  */
 
-#include "components/soc/include/hal/gpio_types.h"
-// above include fixes build error in idf@v4.2
 #include "peripherals/touch.h"
 
 static bool touch_inited = false;
diff --git a/ports/esp32s2/supervisor/port.c b/ports/esp32s2/supervisor/port.c
index 1cbe61f16b..1fca60a1c3 100644
--- a/ports/esp32s2/supervisor/port.c
+++ b/ports/esp32s2/supervisor/port.c
@@ -59,8 +59,8 @@
 #include "components/esp_rom/include/esp32s2/rom/ets_sys.h"
 #include "components/heap/include/esp_heap_caps.h"
 #include "components/xtensa/include/esp_debug_helpers.h"
-#include "components/soc/soc/esp32s2/include/soc/cache_memory.h"
-#include "components/soc/soc/esp32s2/include/soc/rtc_cntl_reg.h"
+#include "components/soc/esp32s2/include/soc/cache_memory.h"
+#include "components/soc/esp32s2/include/soc/rtc_cntl_reg.h"
 
 #if CIRCUITPY_AUDIOBUSIO
 #include "common-hal/audiobusio/__init__.h"
diff --git a/ports/esp32s2/supervisor/usb.c b/ports/esp32s2/supervisor/usb.c
index 2289b01cc0..b88307a4b0 100644
--- a/ports/esp32s2/supervisor/usb.c
+++ b/ports/esp32s2/supervisor/usb.c
@@ -31,11 +31,11 @@
 #include "lib/utils/interrupt_char.h"
 #include "lib/mp-readline/readline.h"
 
-#include "components/soc/soc/esp32s2/include/soc/usb_periph.h"
-#include "components/driver/include/driver/periph_ctrl.h"
 #include "components/driver/include/driver/gpio.h"
+#include "components/driver/include/driver/periph_ctrl.h"
 #include "components/esp_rom/include/esp32s2/rom/gpio.h"
-#include "components/soc/src/esp32s2/include/hal/gpio_ll.h"
+#include "components/hal/esp32s2/include/hal/gpio_ll.h"
+#include "components/soc/esp32s2/include/soc/usb_periph.h"
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"

From dc76306cfa71a4a696f4bab6c26f9d4c5bd21bee Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Wed, 19 May 2021 16:22:07 -0700
Subject: [PATCH 303/349] Enable a BLE workflow

nRF CircuitPython boards will now provide the file transfer
service defined here: https://github.com/adafruit/Adafruit_CircuitPython_BLE_File_Transfer

USB capable boards will only advertise if previously bonded to a
device or if the reset button is pressed during the fast blue
flashes on start up. When pressed, the board will restart again but
the blue period will not flash.

Boards without USB will always advertise.

When previously bonded, the advertisement is private so that no
other peers can connect. If advertising publicly, the tx power is
lowered to reduce the likelihood of bonding from a distance.

This PR also fixes issues with loading identities of bonded peers
so that our address can now be resolved and we can resolve others'
addresses when scanning.
---
 .github/workflows/build.yml                   |   2 +-
 devices/ble_hci/common-hal/_bleio/Adapter.c   |  14 +-
 .../ble_hci/common-hal/_bleio/PacketBuffer.c  |   3 +-
 locale/circuitpython.pot                      |  13 +-
 main.c                                        |   5 +
 ports/nrf/bluetooth/ble_drv.c                 |  30 +-
 ports/nrf/common-hal/_bleio/Adapter.c         | 164 +++-
 ports/nrf/common-hal/_bleio/Adapter.h         |  11 +-
 ports/nrf/common-hal/_bleio/Characteristic.c  |  35 +-
 ports/nrf/common-hal/_bleio/Characteristic.h  |   5 +-
 ports/nrf/common-hal/_bleio/Connection.c      |  11 +
 ports/nrf/common-hal/_bleio/PacketBuffer.c    | 104 ++-
 ports/nrf/common-hal/_bleio/PacketBuffer.h    |   2 +-
 ports/nrf/common-hal/_bleio/Service.c         |  45 +-
 ports/nrf/common-hal/_bleio/UUID.c            |   1 -
 ports/nrf/common-hal/_bleio/__init__.c        |   7 +-
 ports/nrf/common-hal/_bleio/__init__.h        |   3 -
 ports/nrf/common-hal/_bleio/bonding.c         |  68 +-
 ports/nrf/common-hal/_bleio/bonding.h         |   3 +
 ports/nrf/mpconfigport.mk                     |   5 +
 ports/nrf/supervisor/bluetooth.c              |  81 --
 ports/nrf/supervisor/bluetooth.h              |  36 -
 shared-bindings/_bleio/Adapter.c              |  22 +-
 shared-bindings/_bleio/Adapter.h              |  13 +-
 shared-bindings/_bleio/Characteristic.h       |   1 +
 shared-bindings/_bleio/Connection.c           |   2 +-
 shared-bindings/_bleio/PacketBuffer.h         |  11 +-
 supervisor/shared/bluetooth.c                 | 856 ++++++++++++++----
 supervisor/shared/bluetooth.h                 |   7 +
 supervisor/shared/safe_mode.c                 |   9 +-
 supervisor/shared/tick.c                      |   5 -
 supervisor/shared/usb/usb_msc_flash.c         |  41 +-
 supervisor/supervisor.mk                      |   8 +-
 supervisor/usb.h                              |   5 +
 34 files changed, 1210 insertions(+), 418 deletions(-)
 delete mode 100644 ports/nrf/supervisor/bluetooth.c
 delete mode 100644 ports/nrf/supervisor/bluetooth.h

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 60a9743493..faf243f112 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -139,7 +139,7 @@ jobs:
       run: |
         echo "Uploading dev release to PyPi"
         python setup.py sdist
-        twine upload dist/*
+        [ -z "$TWINE_USERNAME" ] || twine upload dist/*
 
   mpy-cross-mac:
     runs-on: macos-10.15
diff --git a/devices/ble_hci/common-hal/_bleio/Adapter.c b/devices/ble_hci/common-hal/_bleio/Adapter.c
index 97468339b0..d9971b05a1 100644
--- a/devices/ble_hci/common-hal/_bleio/Adapter.c
+++ b/devices/ble_hci/common-hal/_bleio/Adapter.c
@@ -645,7 +645,11 @@ STATIC void check_data_fit(size_t data_len, bool connectable) {
 //     return true;
 // }
 
-uint32_t _common_hal_bleio_adapter_start_advertising(bleio_adapter_obj_t *self, bool connectable, bool anonymous, uint32_t timeout, float interval, uint8_t *advertising_data, uint16_t advertising_data_len, uint8_t *scan_response_data, uint16_t scan_response_data_len, mp_int_t tx_power) {
+uint32_t _common_hal_bleio_adapter_start_advertising(bleio_adapter_obj_t *self,
+    bool connectable, bool anonymous, uint32_t timeout, float interval,
+    const uint8_t *advertising_data, uint16_t advertising_data_len,
+    const uint8_t *scan_response_data, uint16_t scan_response_data_len,
+    mp_int_t tx_power, const bleio_address_obj_t *directed_to) {
     check_enabled(self);
 
     if (self->now_advertising) {
@@ -769,7 +773,11 @@ uint32_t _common_hal_bleio_adapter_start_advertising(bleio_adapter_obj_t *self,
     return 0;
 }
 
-void common_hal_bleio_adapter_start_advertising(bleio_adapter_obj_t *self, bool connectable, bool anonymous, uint32_t timeout, mp_float_t interval, mp_buffer_info_t *advertising_data_bufinfo, mp_buffer_info_t *scan_response_data_bufinfo, mp_int_t tx_power) {
+void common_hal_bleio_adapter_start_advertising(bleio_adapter_obj_t *self,
+    bool connectable, bool anonymous, uint32_t timeout, mp_float_t interval,
+    mp_buffer_info_t *advertising_data_bufinfo,
+    mp_buffer_info_t *scan_response_data_bufinfo,
+    mp_int_t tx_power, const bleio_address_obj_t *directed_to) {
     check_enabled(self);
 
     // interval value has already been validated.
@@ -803,7 +811,7 @@ void common_hal_bleio_adapter_start_advertising(bleio_adapter_obj_t *self, bool
         advertising_data_bufinfo->len,
         scan_response_data_bufinfo->buf,
         scan_response_data_bufinfo->len,
-        tx_power);
+        tx_power, directed_to);
 
     if (result) {
         mp_raise_bleio_BluetoothError(translate("Already advertising"));
diff --git a/devices/ble_hci/common-hal/_bleio/PacketBuffer.c b/devices/ble_hci/common-hal/_bleio/PacketBuffer.c
index a282cdce46..2c1989b4e0 100644
--- a/devices/ble_hci/common-hal/_bleio/PacketBuffer.c
+++ b/devices/ble_hci/common-hal/_bleio/PacketBuffer.c
@@ -148,7 +148,8 @@ mp_int_t common_hal_bleio_packet_buffer_readinto(bleio_packet_buffer_obj_t *self
     return ret;
 }
 
-mp_int_t common_hal_bleio_packet_buffer_write(bleio_packet_buffer_obj_t *self, uint8_t *data, size_t len, uint8_t *header, size_t header_len) {
+mp_int_t common_hal_bleio_packet_buffer_write(bleio_packet_buffer_obj_t *self,
+    const uint8_t *data, size_t len, uint8_t *header, size_t header_len) {
     if (self->outgoing[0] == NULL) {
         mp_raise_bleio_BluetoothError(translate("Writes not supported on Characteristic"));
     }
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index b8634ffac2..0cc3e3b384 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -595,10 +595,6 @@ msgstr ""
 msgid "Buffer must be at least length 1"
 msgstr ""
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
-msgid "Buffer too large and unable to allocate"
-msgstr ""
-
 #: shared-bindings/_bleio/PacketBuffer.c
 #, c-format
 msgid "Buffer too short by %d bytes"
@@ -873,6 +869,10 @@ msgstr ""
 msgid "Data chunk must follow fmt chunk"
 msgstr ""
 
+#: ports/nrf/common-hal/_bleio/Adapter.c
+msgid "Data not supported with directed advertising"
+msgstr ""
+
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data too large for advertisement packet"
 msgstr ""
@@ -1667,7 +1667,6 @@ msgstr ""
 msgid "Not a valid IP string"
 msgstr ""
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
 #: ports/nrf/common-hal/_bleio/__init__.c
 #: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "Not connected"
@@ -1710,6 +1709,10 @@ msgid ""
 "Only Windows format, uncompressed BMP supported: given header size is %d"
 msgstr ""
 
+#: shared-bindings/_bleio/Adapter.c
+msgid "Only connectable advertisements can be directed"
+msgstr ""
+
 #: ports/stm/common-hal/alarm/pin/PinAlarm.c
 msgid "Only edge detection is available on this hardware"
 msgstr ""
diff --git a/main.c b/main.c
index a11157a5fb..0d86df7f06 100755
--- a/main.c
+++ b/main.c
@@ -696,6 +696,11 @@ int __attribute__((used)) main(void) {
 
     stack_init();
 
+    #if CIRCUITPY_BLEIO
+    // Early init so that a reset press can cause BLE public advertising.
+    supervisor_bluetooth_init();
+    #endif
+
     // Create a new filesystem only if we're not in a safe mode.
     // A power brownout here could make it appear as if there's
     // no SPI flash filesystem, and we might erase the existing one.
diff --git a/ports/nrf/bluetooth/ble_drv.c b/ports/nrf/bluetooth/ble_drv.c
index cb923227b2..044acbebfc 100644
--- a/ports/nrf/bluetooth/ble_drv.c
+++ b/ports/nrf/bluetooth/ble_drv.c
@@ -39,7 +39,6 @@
 #include "py/mpstate.h"
 
 #include "supervisor/shared/bluetooth.h"
-#include "supervisor/bluetooth.h"
 
 nrf_nvic_state_t nrf_nvic_state = { 0 };
 
@@ -56,6 +55,14 @@ void ble_drv_reset() {
 }
 
 void ble_drv_add_event_handler_entry(ble_drv_evt_handler_entry_t *entry, ble_drv_evt_handler_t func, void *param) {
+    ble_drv_evt_handler_entry_t *it = MP_STATE_VM(ble_drv_evt_handler_entries);
+    while (it != NULL) {
+        // If event handler and its corresponding param are already on the list, don't add again.
+        if ((it->func == func) && (it->param == param)) {
+            return;
+        }
+        it = it->next;
+    }
     entry->next = MP_STATE_VM(ble_drv_evt_handler_entries);
     entry->param = param;
     entry->func = func;
@@ -85,6 +92,8 @@ void ble_drv_remove_event_handler(ble_drv_evt_handler_t func, void *param) {
         if ((it->func == func) && (it->param == param)) {
             // Splice out the matching handler.
             *prev = it->next;
+            // Clear next of the removed node so it's clearly not in a list.
+            it->next = NULL;
             return;
         }
         prev = &(it->next);
@@ -138,21 +147,26 @@ void SD_EVT_IRQHandler(void) {
 
         ble_evt_t *event = (ble_evt_t *)m_ble_evt_buf;
         #if CIRCUITPY_VERBOSE_BLE
-        mp_printf(&mp_plat_print, "BLE event: 0x%04x\n", event->header.evt_id);
-        #endif
-
-        if (supervisor_bluetooth_hook(event)) {
-            continue;
+        size_t eid = event->header.evt_id;
+        if (eid != 0x1d) {
+            if (BLE_GAP_EVT_BASE <= eid && eid <= BLE_GAP_EVT_LAST) {
+                mp_printf(&mp_plat_print, "BLE GAP event: %d\n", eid - BLE_GAP_EVT_BASE);
+            } else {
+                mp_printf(&mp_plat_print, "BLE event: 0x%04x\n", event->header.evt_id);
+            }
         }
+        #endif
 
         ble_drv_evt_handler_entry_t *it = MP_STATE_VM(ble_drv_evt_handler_entries);
         bool done = false;
         while (it != NULL) {
             #if CIRCUITPY_VERBOSE_BLE
-            // mp_printf(&mp_plat_print, "  calling handler: 0x%08lx, param: 0x%08lx\n", it->func-1, it->param);
+            // mp_printf(&mp_plat_print, "  calling handler: 0x%08lx, param: 0x%08lx\n", it->func - 1, it->param);
             #endif
+            // Capture next before calling the function in case it removes itself from the list.
+            ble_drv_evt_handler_entry_t *next = it->next;
             done = it->func(event, it->param) || done;
-            it = it->next;
+            it = next;
         }
         #if CIRCUITPY_VERBOSE_BLE
         if (event->header.evt_id == BLE_GATTS_EVT_WRITE) {
diff --git a/ports/nrf/common-hal/_bleio/Adapter.c b/ports/nrf/common-hal/_bleio/Adapter.c
index bfcaf461a0..3f8fbc3a97 100644
--- a/ports/nrf/common-hal/_bleio/Adapter.c
+++ b/ports/nrf/common-hal/_bleio/Adapter.c
@@ -40,6 +40,7 @@
 #include "py/gc.h"
 #include "py/objstr.h"
 #include "py/runtime.h"
+#include "supervisor/shared/bluetooth.h"
 #include "supervisor/shared/safe_mode.h"
 #include "supervisor/shared/tick.h"
 #include "supervisor/usb.h"
@@ -174,6 +175,16 @@ STATIC uint32_t ble_stack_enable(void) {
         return err_code;
     }
 
+
+    // Make sure service changed characteristic is on. This lets us prompt a peer to re-discover
+    // portions of our attribute table.
+    memset(&ble_conf, 0, sizeof(ble_conf));
+    ble_conf.gatts_cfg.service_changed.service_changed = 1;
+    err_code = sd_ble_cfg_set(BLE_GATTS_CFG_SERVICE_CHANGED, &ble_conf, sd_ram_end);
+    if (err_code != NRF_SUCCESS) {
+        return err_code;
+    }
+
     // Increase the GATT Server attribute size to accomodate both the CircuitPython built-in service
     // and anything the user does.
     memset(&ble_conf, 0, sizeof(ble_conf));
@@ -231,6 +242,9 @@ STATIC bool adapter_on_ble_evt(ble_evt_t *ble_evt, void *self_in) {
     // For debugging.
     // mp_printf(&mp_plat_print, "Adapter event: 0x%04x\n", ble_evt->header.evt_id);
 
+    // Always queue a background run after a BLE event.
+    background_callback_add_core(&self->background_callback);
+
     switch (ble_evt->header.evt_id) {
         case BLE_GAP_EVT_CONNECTED: {
             // Find an empty connection. One must always be available because the SD has the same
@@ -299,10 +313,6 @@ STATIC bool adapter_on_ble_evt(ble_evt_t *ble_evt, void *self_in) {
             break;
         }
 
-        case BLE_GAP_EVT_ADV_SET_TERMINATED:
-            self->current_advertising_data = NULL;
-            break;
-
         default:
             // For debugging.
             // mp_printf(&mp_plat_print, "Unhandled adapter event: 0x%04x\n", ble_evt->header.evt_id);
@@ -333,6 +343,11 @@ STATIC void bleio_adapter_reset_name(bleio_adapter_obj_t *self) {
     common_hal_bleio_adapter_set_name(self, (char *)default_ble_name);
 }
 
+static void bluetooth_adapter_background(void *data) {
+    supervisor_bluetooth_background();
+    bleio_background();
+}
+
 void common_hal_bleio_adapter_set_enabled(bleio_adapter_obj_t *self, bool enabled) {
     const bool is_enabled = common_hal_bleio_adapter_get_enabled(self);
 
@@ -341,7 +356,7 @@ void common_hal_bleio_adapter_set_enabled(bleio_adapter_obj_t *self, bool enable
         return;
     }
 
-    uint32_t err_code;
+    uint32_t err_code = NRF_SUCCESS;
     if (enabled) {
         // The SD takes over the POWER module and will fail if the module is already in use.
         // Occurs when USB is initialized previously
@@ -365,11 +380,19 @@ void common_hal_bleio_adapter_set_enabled(bleio_adapter_obj_t *self, bool enable
             bleio_connection_internal_t *connection = &bleio_connections[i];
             // Reset connection.
             bleio_connection_clear(connection);
+            ble_drv_remove_event_handler(connection_on_ble_evt, connection);
             connection->conn_handle = BLE_CONN_HANDLE_INVALID;
         }
+        self->background_callback.fun = bluetooth_adapter_background;
+        self->background_callback.data = self;
         bleio_adapter_reset_name(self);
-        ble_drv_add_event_handler_entry(&self->handler_entry, adapter_on_ble_evt, self);
+        ble_drv_add_event_handler_entry(&self->connection_handler_entry, adapter_on_ble_evt, self);
+        bluetooth_adapter_background(self);
     } else {
+        ble_drv_remove_event_handler(adapter_on_ble_evt, self);
+        if (self->current_advertising_data != NULL) {
+            common_hal_bleio_adapter_stop_advertising(self);
+        }
         ble_drv_reset();
         self->scan_results = NULL;
         self->current_advertising_data = NULL;
@@ -428,6 +451,22 @@ void common_hal_bleio_adapter_set_name(bleio_adapter_obj_t *self, const char *na
     sd_ble_gap_device_name_set(&sec, (const uint8_t *)name, strlen(name));
 }
 
+STATIC uint32_t _update_identities(bool is_central) {
+    const ble_gap_id_key_t *keys[BLE_GAP_DEVICE_IDENTITIES_MAX_COUNT];
+    // TODO: Make sure we don't store more than BLE_GAP_DEVICE_IDENTITIES_MAX_COUNT identities of
+    // each type. Right now, we'll silently ignore those keys.
+    size_t len = bonding_load_identities(is_central, keys, BLE_GAP_DEVICE_IDENTITIES_MAX_COUNT);
+    uint32_t status = NRF_SUCCESS;
+    if (len > 0) {
+        status = sd_ble_gap_device_identities_set(
+            keys,
+            NULL, // Don't set local IRK because we use our device IRK for private addresses.
+            len
+            );
+    }
+    return status;
+};
+
 STATIC bool scan_on_ble_evt(ble_evt_t *ble_evt, void *scan_results_in) {
     bleio_scanresults_obj_t *scan_results = (bleio_scanresults_obj_t *)scan_results_in;
 
@@ -476,6 +515,11 @@ mp_obj_t common_hal_bleio_adapter_start_scan(bleio_adapter_obj_t *self, uint8_t
     sd_data->len = max_packet_size;
     sd_data->p_data = raw_data + sizeof(ble_data_t);
 
+
+    // Update the identities of peripheral peers so they can use a private
+    // resolvable address in their advertisements.
+    check_nrf_error(_update_identities(true));
+
     ble_drv_add_event_handler(scan_on_ble_evt, self->scan_results);
 
     uint32_t nrf_timeout = SEC_TO_UNITS(timeout, UNIT_10_MS) + 0.5f;
@@ -500,9 +544,8 @@ mp_obj_t common_hal_bleio_adapter_start_scan(bleio_adapter_obj_t *self, uint8_t
         .scan_phys = BLE_GAP_PHY_1MBPS,
         .active = active
     };
-    uint32_t err_code;
-    vm_used_ble = true;
-    err_code = sd_ble_gap_scan_start(&scan_params, sd_data);
+
+    uint32_t err_code = sd_ble_gap_scan_start(&scan_params, sd_data);
 
     if (err_code != NRF_SUCCESS) {
         ble_drv_remove_event_handler(scan_on_ble_evt, self->scan_results);
@@ -514,6 +557,9 @@ mp_obj_t common_hal_bleio_adapter_start_scan(bleio_adapter_obj_t *self, uint8_t
 }
 
 void common_hal_bleio_adapter_stop_scan(bleio_adapter_obj_t *self) {
+    if (self->scan_results == NULL) {
+        return;
+    }
     sd_ble_gap_scan_stop();
     shared_module_bleio_scanresults_set_done(self->scan_results, true);
     ble_drv_remove_event_handler(scan_on_ble_evt, self->scan_results);
@@ -548,14 +594,16 @@ STATIC bool connect_on_ble_evt(ble_evt_t *ble_evt, void *info_in) {
     return true;
 }
 
-mp_obj_t common_hal_bleio_adapter_connect(bleio_adapter_obj_t *self, bleio_address_obj_t *address, mp_float_t timeout) {
-
-    ble_gap_addr_t addr;
-
-    addr.addr_type = address->type;
+STATIC void _convert_address(const bleio_address_obj_t *address, ble_gap_addr_t *sd_address) {
+    sd_address->addr_type = address->type;
     mp_buffer_info_t address_buf_info;
     mp_get_buffer_raise(address->bytes, &address_buf_info, MP_BUFFER_READ);
-    memcpy(addr.addr, (uint8_t *)address_buf_info.buf, NUM_BLEIO_ADDRESS_BYTES);
+    memcpy(sd_address->addr, (uint8_t *)address_buf_info.buf, NUM_BLEIO_ADDRESS_BYTES);
+}
+
+mp_obj_t common_hal_bleio_adapter_connect(bleio_adapter_obj_t *self, bleio_address_obj_t *address, mp_float_t timeout) {
+    ble_gap_addr_t addr;
+    _convert_address(address, &addr);
 
     ble_gap_scan_params_t scan_params = {
         .interval = MSEC_TO_UNITS(100, UNIT_0_625_MS),
@@ -576,7 +624,6 @@ mp_obj_t common_hal_bleio_adapter_connect(bleio_adapter_obj_t *self, bleio_addre
     ble_drv_add_event_handler(connect_on_ble_evt, &event_info);
     event_info.done = false;
 
-    vm_used_ble = true;
     uint32_t err_code = sd_ble_gap_connect(&addr, &scan_params, &conn_params, BLE_CONN_CFG_TAG_CUSTOM);
 
     if (err_code != NRF_SUCCESS) {
@@ -594,6 +641,17 @@ mp_obj_t common_hal_bleio_adapter_connect(bleio_adapter_obj_t *self, bleio_addre
     if (conn_handle == BLE_CONN_HANDLE_INVALID) {
         mp_raise_bleio_BluetoothError(translate("Failed to connect: timeout"));
     }
+    // If we have keys, then try and encrypt the connection.
+    const ble_gap_enc_key_t *encryption_key = bonding_load_peer_encryption_key(true, &addr);
+    pair_status_t pair_status = PAIR_NOT_PAIRED;
+    if (encryption_key != NULL) {
+        err_code = sd_ble_gap_encrypt(conn_handle, &encryption_key->master_id, &encryption_key->enc_info);
+        pair_status = PAIR_WAITING;
+
+        if (err_code != NRF_SUCCESS) {
+            pair_status = PAIR_NOT_PAIRED;
+        }
+    }
 
     // Negotiate for better PHY, larger MTU and data lengths since we are the central. These are
     // nice-to-haves so ignore any errors.
@@ -610,6 +668,7 @@ mp_obj_t common_hal_bleio_adapter_connect(bleio_adapter_obj_t *self, bleio_addre
         bleio_connection_internal_t *connection = &bleio_connections[i];
         if (connection->conn_handle == conn_handle) {
             connection->is_central = true;
+            connection->pair_status = pair_status;
             return bleio_connection_new_from_internal(connection);
         }
     }
@@ -634,9 +693,14 @@ STATIC bool advertising_on_ble_evt(ble_evt_t *ble_evt, void *self_in) {
     bleio_adapter_obj_t *self = (bleio_adapter_obj_t *)self_in;
 
     switch (ble_evt->header.evt_id) {
+        case BLE_GAP_EVT_CONNECTED: // Connecting also stops an advertisement.
+            // Set the tx_power for the connection higher than the advertisement.
+            sd_ble_gap_tx_power_set(BLE_GAP_TX_POWER_ROLE_CONN, ble_evt->evt.gap_evt.conn_handle, 0);
+            common_hal_bleio_adapter_stop_advertising(self);
+            return false;
+            break;
         case BLE_GAP_EVT_ADV_SET_TERMINATED:
             common_hal_bleio_adapter_stop_advertising(self);
-            ble_drv_remove_event_handler(advertising_on_ble_evt, self_in);
             break;
 
         default:
@@ -648,10 +712,11 @@ STATIC bool advertising_on_ble_evt(ble_evt_t *ble_evt, void *self_in) {
     return true;
 }
 
-uint32_t _common_hal_bleio_adapter_start_advertising(bleio_adapter_obj_t *self, bool connectable,
-    bool anonymous, uint32_t timeout, float interval, uint8_t *advertising_data,
-    uint16_t advertising_data_len, uint8_t *scan_response_data, uint16_t scan_response_data_len,
-    mp_int_t tx_power) {
+uint32_t _common_hal_bleio_adapter_start_advertising(bleio_adapter_obj_t *self,
+    bool connectable, bool anonymous, uint32_t timeout, float interval,
+    const uint8_t *advertising_data, uint16_t advertising_data_len,
+    const uint8_t *scan_response_data, uint16_t scan_response_data_len,
+    mp_int_t tx_power, const bleio_address_obj_t *directed_to) {
     if (self->current_advertising_data != NULL && self->current_advertising_data == self->advertising_data) {
         return NRF_ERROR_BUSY;
     }
@@ -667,6 +732,8 @@ uint32_t _common_hal_bleio_adapter_start_advertising(bleio_adapter_obj_t *self,
         scan_response_data_len > BLE_GAP_ADV_SET_DATA_SIZE_MAX;
 
     uint8_t adv_type;
+    ble_gap_addr_t *peer = NULL;
+    ble_gap_addr_t peer_address;
     if (extended) {
         if (connectable) {
             adv_type = BLE_GAP_ADV_TYPE_EXTENDED_CONNECTABLE_NONSCANNABLE_UNDIRECTED;
@@ -676,7 +743,17 @@ uint32_t _common_hal_bleio_adapter_start_advertising(bleio_adapter_obj_t *self,
             adv_type = BLE_GAP_ADV_TYPE_EXTENDED_NONCONNECTABLE_NONSCANNABLE_UNDIRECTED;
         }
     } else if (connectable) {
-        adv_type = BLE_GAP_ADV_TYPE_CONNECTABLE_SCANNABLE_UNDIRECTED;
+        if (directed_to == NULL) {
+            adv_type = BLE_GAP_ADV_TYPE_CONNECTABLE_SCANNABLE_UNDIRECTED;
+        } else if (interval <= 3.5 && timeout <= 1.3) {
+            adv_type = BLE_GAP_ADV_TYPE_CONNECTABLE_NONSCANNABLE_DIRECTED_HIGH_DUTY_CYCLE;
+            _convert_address(directed_to, &peer_address);
+            peer = &peer_address;
+        } else {
+            adv_type = BLE_GAP_ADV_TYPE_CONNECTABLE_NONSCANNABLE_DIRECTED;
+            _convert_address(directed_to, &peer_address);
+            peer = &peer_address;
+        }
     } else if (scan_response_data_len > 0) {
         adv_type = BLE_GAP_ADV_TYPE_NONCONNECTABLE_SCANNABLE_UNDIRECTED;
     } else {
@@ -714,26 +791,34 @@ uint32_t _common_hal_bleio_adapter_start_advertising(bleio_adapter_obj_t *self,
         .duration = SEC_TO_UNITS(timeout, UNIT_10_MS),
         .filter_policy = BLE_GAP_ADV_FP_ANY,
         .primary_phy = BLE_GAP_PHY_1MBPS,
+        .p_peer_addr = peer,
     };
 
     const ble_gap_adv_data_t ble_gap_adv_data = {
-        .adv_data.p_data = advertising_data,
+        .adv_data.p_data = (uint8_t *)advertising_data,
         .adv_data.len = advertising_data_len,
-        .scan_rsp_data.p_data = scan_response_data_len > 0 ? scan_response_data : NULL,
+        .scan_rsp_data.p_data = scan_response_data_len > 0 ? (uint8_t *)scan_response_data : NULL,
         .scan_rsp_data.len = scan_response_data_len,
     };
 
+    // Update the identities of central peers so they can use a private address
+    // in the scan and connection initiation.
+    err_code = _update_identities(false);
+    if (err_code != NRF_SUCCESS) {
+        return err_code;
+    }
+
     err_code = sd_ble_gap_adv_set_configure(&adv_handle, &ble_gap_adv_data, &adv_params);
     if (err_code != NRF_SUCCESS) {
         return err_code;
     }
 
-    ble_drv_add_event_handler(advertising_on_ble_evt, self);
+    ble_drv_add_event_handler_entry(&self->advertising_handler_entry, advertising_on_ble_evt, self);
+
     err_code = sd_ble_gap_tx_power_set(BLE_GAP_TX_POWER_ROLE_ADV, adv_handle, tx_power);
     if (err_code != NRF_SUCCESS) {
         return err_code;
     }
-    vm_used_ble = true;
     err_code = sd_ble_gap_adv_start(adv_handle, BLE_CONN_CFG_TAG_CUSTOM);
     if (err_code != NRF_SUCCESS) {
         return err_code;
@@ -743,9 +828,16 @@ uint32_t _common_hal_bleio_adapter_start_advertising(bleio_adapter_obj_t *self,
 }
 
 
-void common_hal_bleio_adapter_start_advertising(bleio_adapter_obj_t *self, bool connectable, bool anonymous, uint32_t timeout, mp_float_t interval, mp_buffer_info_t *advertising_data_bufinfo, mp_buffer_info_t *scan_response_data_bufinfo, mp_int_t tx_power) {
-    if (self->current_advertising_data != NULL && self->current_advertising_data == self->advertising_data) {
+void common_hal_bleio_adapter_start_advertising(bleio_adapter_obj_t *self, bool connectable,
+    bool anonymous, uint32_t timeout, mp_float_t interval,
+    mp_buffer_info_t *advertising_data_bufinfo, mp_buffer_info_t *scan_response_data_bufinfo,
+    mp_int_t tx_power, const bleio_address_obj_t *directed_to) {
+    if (self->user_advertising) {
         mp_raise_bleio_BluetoothError(translate("Already advertising."));
+    } else if (self->current_advertising_data != NULL) {
+        // If the user isn't advertising, then the background is. So, stop the
+        // background advertising so the user can.
+        common_hal_bleio_adapter_stop_advertising(self);
     }
     // interval value has already been validated.
 
@@ -756,6 +848,11 @@ void common_hal_bleio_adapter_start_advertising(bleio_adapter_obj_t *self, bool
         mp_raise_bleio_BluetoothError(translate("Extended advertisements with scan response not supported."));
     }
 
+
+    if (advertising_data_bufinfo->len > 0 && directed_to != NULL) {
+        mp_raise_bleio_BluetoothError(translate("Data not supported with directed advertising"));
+    }
+
     // Anonymous mode requires a timeout so that we don't continue to broadcast
     // the same data while cycling the MAC address -- otherwise, what's the
     // point of randomizing the MAC address?
@@ -792,7 +889,9 @@ void common_hal_bleio_adapter_start_advertising(bleio_adapter_obj_t *self, bool
         advertising_data_bufinfo->len,
         self->scan_response_data,
         scan_response_data_bufinfo->len,
-        tx_power));
+        tx_power,
+        directed_to));
+    self->user_advertising = true;
 }
 
 void common_hal_bleio_adapter_stop_advertising(bleio_adapter_obj_t *self) {
@@ -800,9 +899,10 @@ void common_hal_bleio_adapter_stop_advertising(bleio_adapter_obj_t *self) {
         return;
     }
 
-    // TODO: Don't actually stop. Switch to advertising CircuitPython if we don't already have a connection.
     const uint32_t err_code = sd_ble_gap_adv_stop(adv_handle);
+    ble_drv_remove_event_handler(advertising_on_ble_evt, self);
     self->current_advertising_data = NULL;
+    self->user_advertising = false;
 
     if ((err_code != NRF_SUCCESS) && (err_code != NRF_ERROR_INVALID_STATE)) {
         check_nrf_error(err_code);
@@ -847,6 +947,10 @@ void common_hal_bleio_adapter_erase_bonding(bleio_adapter_obj_t *self) {
     bonding_erase_storage();
 }
 
+bool common_hal_bleio_adapter_is_bonded_to_central(bleio_adapter_obj_t *self) {
+    return bonding_peripheral_bond_count() > 0;
+}
+
 void bleio_adapter_gc_collect(bleio_adapter_obj_t *adapter) {
     gc_collect_root((void **)adapter, sizeof(bleio_adapter_obj_t) / sizeof(size_t));
     gc_collect_root((void **)bleio_connections, sizeof(bleio_connections) / sizeof(size_t));
diff --git a/ports/nrf/common-hal/_bleio/Adapter.h b/ports/nrf/common-hal/_bleio/Adapter.h
index 68a8b48644..4d3fac20c7 100644
--- a/ports/nrf/common-hal/_bleio/Adapter.h
+++ b/ports/nrf/common-hal/_bleio/Adapter.h
@@ -35,6 +35,8 @@
 #include "shared-bindings/_bleio/Connection.h"
 #include "shared-bindings/_bleio/ScanResults.h"
 
+#include "supervisor/background_callback.h"
+
 #ifndef BLEIO_TOTAL_CONNECTION_COUNT
 #define BLEIO_TOTAL_CONNECTION_COUNT 5
 #endif
@@ -43,13 +45,18 @@ extern bleio_connection_internal_t bleio_connections[BLEIO_TOTAL_CONNECTION_COUN
 
 typedef struct {
     mp_obj_base_t base;
+    // Pointer to buffers we maintain so that the data is long lived.
     uint8_t *advertising_data;
     uint8_t *scan_response_data;
-    uint8_t *current_advertising_data;
+    // Pointer to current data.
+    const uint8_t *current_advertising_data;
     bleio_scanresults_obj_t *scan_results;
     mp_obj_t name;
     mp_obj_tuple_t *connection_objs;
-    ble_drv_evt_handler_entry_t handler_entry;
+    ble_drv_evt_handler_entry_t connection_handler_entry;
+    ble_drv_evt_handler_entry_t advertising_handler_entry;
+    background_callback_t background_callback;
+    bool user_advertising;
 } bleio_adapter_obj_t;
 
 void bleio_adapter_gc_collect(bleio_adapter_obj_t *adapter);
diff --git a/ports/nrf/common-hal/_bleio/Characteristic.c b/ports/nrf/common-hal/_bleio/Characteristic.c
index f651b93b6b..621d400794 100644
--- a/ports/nrf/common-hal/_bleio/Characteristic.c
+++ b/ports/nrf/common-hal/_bleio/Characteristic.c
@@ -83,15 +83,36 @@ STATIC void characteristic_gatts_notify_indicate(uint16_t handle, uint16_t conn_
     }
 }
 
-void common_hal_bleio_characteristic_construct(bleio_characteristic_obj_t *self, bleio_service_obj_t *service, uint16_t handle, bleio_uuid_obj_t *uuid, bleio_characteristic_properties_t props, bleio_attribute_security_mode_t read_perm, bleio_attribute_security_mode_t write_perm, mp_int_t max_length, bool fixed_length, mp_buffer_info_t *initial_value_bufinfo) {
+void common_hal_bleio_characteristic_construct(bleio_characteristic_obj_t *self, bleio_service_obj_t *service,
+    uint16_t handle, bleio_uuid_obj_t *uuid, bleio_characteristic_properties_t props,
+    bleio_attribute_security_mode_t read_perm, bleio_attribute_security_mode_t write_perm,
+    mp_int_t max_length, bool fixed_length, mp_buffer_info_t *initial_value_bufinfo) {
     self->service = service;
     self->uuid = uuid;
     self->handle = BLE_GATT_HANDLE_INVALID;
     self->props = props;
     self->read_perm = read_perm;
     self->write_perm = write_perm;
-    self->initial_value = mp_obj_new_bytes(initial_value_bufinfo->buf, initial_value_bufinfo->len);
-    self->descriptor_list = mp_obj_new_list(0, NULL);
+    self->initial_value_len = 0;
+    self->initial_value = NULL;
+    if (initial_value_bufinfo != NULL) {
+        // Copy the initial value if it's on the heap. Otherwise it's internal and we may not be able
+        // to allocate.
+        self->initial_value_len = initial_value_bufinfo->len;
+        if (gc_alloc_possible()) {
+            if (gc_nbytes(initial_value_bufinfo->buf) > 0) {
+                uint8_t *initial_value = m_malloc(self->initial_value_len, false);
+                memcpy(initial_value, initial_value_bufinfo->buf, self->initial_value_len);
+                self->initial_value = initial_value;
+            } else {
+                self->initial_value = initial_value_bufinfo->buf;
+            }
+            self->descriptor_list = mp_obj_new_list(0, NULL);
+        } else {
+            self->initial_value = initial_value_bufinfo->buf;
+            self->descriptor_list = NULL;
+        }
+    }
 
     const mp_int_t max_length_max = fixed_length ? BLE_GATTS_FIX_ATTR_LEN_MAX : BLE_GATTS_VAR_ATTR_LEN_MAX;
     if (max_length < 0 || max_length > max_length_max) {
@@ -109,6 +130,9 @@ void common_hal_bleio_characteristic_construct(bleio_characteristic_obj_t *self,
 }
 
 mp_obj_tuple_t *common_hal_bleio_characteristic_get_descriptors(bleio_characteristic_obj_t *self) {
+    if (self->descriptor_list == NULL) {
+        return mp_const_empty_tuple;
+    }
     return mp_obj_new_tuple(self->descriptor_list->len, self->descriptor_list->items);
 }
 
@@ -193,6 +217,11 @@ bleio_characteristic_properties_t common_hal_bleio_characteristic_get_properties
 }
 
 void common_hal_bleio_characteristic_add_descriptor(bleio_characteristic_obj_t *self, bleio_descriptor_obj_t *descriptor) {
+    if (self->descriptor_list == NULL) {
+        // This should only happen from internal use so we just fail silently instead of raising an
+        // exception.
+        return;
+    }
     ble_uuid_t desc_uuid;
     bleio_uuid_convert_to_nrf_ble_uuid(descriptor->uuid, &desc_uuid);
 
diff --git a/ports/nrf/common-hal/_bleio/Characteristic.h b/ports/nrf/common-hal/_bleio/Characteristic.h
index 382fd4a81e..f7a3ec3e1a 100644
--- a/ports/nrf/common-hal/_bleio/Characteristic.h
+++ b/ports/nrf/common-hal/_bleio/Characteristic.h
@@ -39,9 +39,9 @@ typedef struct _bleio_characteristic_obj {
     // Will be MP_OBJ_NULL before being assigned to a Service.
     bleio_service_obj_t *service;
     bleio_uuid_obj_t *uuid;
-    mp_obj_t initial_value;
+    const uint8_t *initial_value;
+    uint16_t initial_value_len;
     uint16_t max_length;
-    bool fixed_length;
     uint16_t handle;
     bleio_characteristic_properties_t props;
     bleio_attribute_security_mode_t read_perm;
@@ -50,6 +50,7 @@ typedef struct _bleio_characteristic_obj {
     uint16_t user_desc_handle;
     uint16_t cccd_handle;
     uint16_t sccd_handle;
+    bool fixed_length;
 } bleio_characteristic_obj_t;
 
 #endif // MICROPY_INCLUDED_NRF_COMMON_HAL_BLEIO_CHARACTERISTIC_H
diff --git a/ports/nrf/common-hal/_bleio/Connection.c b/ports/nrf/common-hal/_bleio/Connection.c
index cdc6fd3d68..335f56c30c 100644
--- a/ports/nrf/common-hal/_bleio/Connection.c
+++ b/ports/nrf/common-hal/_bleio/Connection.c
@@ -309,6 +309,9 @@ bool connection_on_ble_evt(ble_evt_t *ble_evt, void *self_in) {
             } else {
                 if (bonding_load_cccd_info(self->is_central, self->conn_handle, self->ediv)) {
                     // Did an sd_ble_gatts_sys_attr_set() with the stored sys_attr values.
+                    // Indicate ATTR table change because we may have reloaded since the peer last
+                    // connected.
+                    sd_ble_gatts_service_changed(self->conn_handle, 0xC, 0xFFFF);
                 } else {
                     // No matching bonding found, so use fresh system attributes.
                     sd_ble_gatts_sys_attr_set(self->conn_handle, NULL, 0, 0);
@@ -351,6 +354,14 @@ void common_hal_bleio_connection_disconnect(bleio_connection_internal_t *self) {
 }
 
 void common_hal_bleio_connection_pair(bleio_connection_internal_t *self, bool bond) {
+    // We may already be trying to pair if we just reconnected to a peer we're
+    // bonded with.
+    while (self->pair_status == PAIR_WAITING && !mp_hal_is_interrupted()) {
+        RUN_BACKGROUND_TASKS;
+    }
+    if (self->pair_status == PAIR_PAIRED) {
+        return;
+    }
     self->pair_status = PAIR_WAITING;
 
     check_nrf_error(sd_ble_gap_authenticate(self->conn_handle, &pairing_sec_params));
diff --git a/ports/nrf/common-hal/_bleio/PacketBuffer.c b/ports/nrf/common-hal/_bleio/PacketBuffer.c
index c3e8e43b3f..e721cfb53b 100644
--- a/ports/nrf/common-hal/_bleio/PacketBuffer.c
+++ b/ports/nrf/common-hal/_bleio/PacketBuffer.c
@@ -76,7 +76,7 @@ STATIC uint32_t queue_next_write(bleio_packet_buffer_obj_t *self) {
             ble_gattc_write_params_t write_params = {
                 .write_op = self->write_type,
                 .handle = self->characteristic->handle,
-                .p_value = self->outgoing[self->pending_index],
+                .p_value = (const uint8_t *)self->outgoing[self->pending_index],
                 .len = self->pending_size,
             };
 
@@ -89,7 +89,7 @@ STATIC uint32_t queue_next_write(bleio_packet_buffer_obj_t *self) {
                 .type = self->write_type,
                 .offset = 0,
                 .p_len = &hvx_len,
-                .p_data = self->outgoing[self->pending_index],
+                .p_data = (const uint8_t *)self->outgoing[self->pending_index],
             };
             err_code = sd_ble_gatts_hvx(conn_handle, &hvx_params);
         }
@@ -173,6 +173,8 @@ STATIC bool packet_buffer_on_ble_server_evt(ble_evt_t *ble_evt, void *param) {
             }
             break;
         }
+        case BLE_GAP_EVT_CONNECTED:
+            break;
         case BLE_GAP_EVT_DISCONNECTED:
             if (self->conn_handle == ble_evt->evt.gap_evt.conn_handle) {
                 self->conn_handle = BLE_CONN_HANDLE_INVALID;
@@ -188,12 +190,16 @@ STATIC bool packet_buffer_on_ble_server_evt(ble_evt_t *ble_evt, void *param) {
     return true;
 }
 
-void common_hal_bleio_packet_buffer_construct(
+
+void _common_hal_bleio_packet_buffer_construct(
     bleio_packet_buffer_obj_t *self, bleio_characteristic_obj_t *characteristic,
-    size_t buffer_size, size_t max_packet_size) {
+    uint32_t *incoming_buffer, size_t incoming_buffer_size,
+    uint32_t *outgoing_buffer1, uint32_t *outgoing_buffer2, size_t max_packet_size,
+    void *static_handler_entry) {
 
     self->characteristic = characteristic;
     self->client = self->characteristic->service->is_remote;
+    self->max_packet_size = max_packet_size;
     bleio_characteristic_properties_t incoming = self->characteristic->props & (CHAR_PROP_WRITE_NO_RESPONSE | CHAR_PROP_WRITE);
     bleio_characteristic_properties_t outgoing = self->characteristic->props & (CHAR_PROP_NOTIFY | CHAR_PROP_INDICATE);
 
@@ -207,28 +213,25 @@ void common_hal_bleio_packet_buffer_construct(
         self->conn_handle = BLE_CONN_HANDLE_INVALID;
     }
 
-    // Cap the packet size to our implementation limits.
-    self->max_packet_size = MIN(max_packet_size, BLE_GATTS_VAR_ATTR_LEN_MAX - 3);
-
     if (incoming) {
-        if (!ringbuf_alloc(&self->ringbuf, buffer_size * (sizeof(uint16_t) + self->max_packet_size), false)) {
-            mp_raise_ValueError(translate("Buffer too large and unable to allocate"));
-        }
+        self->ringbuf.buf = (uint8_t *)incoming_buffer;
+        self->ringbuf.size = incoming_buffer_size;
+        self->ringbuf.iget = 0;
+        self->ringbuf.iput = 0;
     }
 
-    if (outgoing) {
-        self->packet_queued = false;
-        self->pending_index = 0;
-        self->pending_size = 0;
-        self->outgoing[0] = m_malloc(self->max_packet_size, false);
-        self->outgoing[1] = m_malloc(self->max_packet_size, false);
-    } else {
-        self->outgoing[0] = NULL;
-        self->outgoing[1] = NULL;
-    }
+    self->packet_queued = false;
+    self->pending_index = 0;
+    self->pending_size = 0;
+    self->outgoing[0] = outgoing_buffer1;
+    self->outgoing[1] = outgoing_buffer2;
 
     if (self->client) {
-        ble_drv_add_event_handler(packet_buffer_on_ble_client_evt, self);
+        if (static_handler_entry != NULL) {
+            ble_drv_add_event_handler_entry((ble_drv_evt_handler_entry_t *)static_handler_entry, packet_buffer_on_ble_client_evt, self);
+        } else {
+            ble_drv_add_event_handler(packet_buffer_on_ble_client_evt, self);
+        }
         if (incoming) {
             // Prefer notify if both are available.
             if (incoming & CHAR_PROP_NOTIFY) {
@@ -245,7 +248,11 @@ void common_hal_bleio_packet_buffer_construct(
             }
         }
     } else {
-        ble_drv_add_event_handler(packet_buffer_on_ble_server_evt, self);
+        if (static_handler_entry != NULL) {
+            ble_drv_add_event_handler_entry((ble_drv_evt_handler_entry_t *)static_handler_entry, packet_buffer_on_ble_server_evt, self);
+        } else {
+            ble_drv_add_event_handler(packet_buffer_on_ble_server_evt, self);
+        }
         if (outgoing) {
             self->write_type = BLE_GATT_HVX_INDICATION;
             if (outgoing & CHAR_PROP_NOTIFY) {
@@ -253,12 +260,44 @@ void common_hal_bleio_packet_buffer_construct(
             }
         }
     }
+
+}
+
+void common_hal_bleio_packet_buffer_construct(
+    bleio_packet_buffer_obj_t *self, bleio_characteristic_obj_t *characteristic,
+    size_t buffer_size, size_t max_packet_size) {
+
+    // Cap the packet size to our implementation limits.
+    max_packet_size = MIN(max_packet_size, BLE_GATTS_VAR_ATTR_LEN_MAX - 3);
+
+    bleio_characteristic_properties_t incoming = characteristic->props & (CHAR_PROP_WRITE_NO_RESPONSE | CHAR_PROP_WRITE);
+    bleio_characteristic_properties_t outgoing = characteristic->props & (CHAR_PROP_NOTIFY | CHAR_PROP_INDICATE);
+    if (characteristic->service->is_remote) {
+        // Swap if we're the client.
+        bleio_characteristic_properties_t temp = incoming;
+        incoming = outgoing;
+        outgoing = temp;
+    }
+    size_t incoming_buffer_size = 0;
+    uint32_t *incoming_buffer = NULL;
+    if (incoming) {
+        incoming_buffer_size = buffer_size * (sizeof(uint16_t) + max_packet_size);
+        incoming_buffer = m_malloc(incoming_buffer_size, false);
+    }
+
+    uint32_t *outgoing1 = NULL;
+    uint32_t *outgoing2 = NULL;
+    if (outgoing) {
+        outgoing1 = m_malloc(max_packet_size, false);
+        outgoing2 = m_malloc(max_packet_size, false);
+    }
+    _common_hal_bleio_packet_buffer_construct(self, characteristic,
+        incoming_buffer, incoming_buffer_size,
+        outgoing1, outgoing2, max_packet_size,
+        NULL);
 }
 
 mp_int_t common_hal_bleio_packet_buffer_readinto(bleio_packet_buffer_obj_t *self, uint8_t *data, size_t len) {
-    if (self->conn_handle == BLE_CONN_HANDLE_INVALID) {
-        mp_raise_ConnectionError(translate("Not connected"));
-    }
     if (ringbuf_num_filled(&self->ringbuf) < 2) {
         return 0;
     }
@@ -291,7 +330,7 @@ mp_int_t common_hal_bleio_packet_buffer_readinto(bleio_packet_buffer_obj_t *self
     return ret;
 }
 
-mp_int_t common_hal_bleio_packet_buffer_write(bleio_packet_buffer_obj_t *self, uint8_t *data, size_t len, uint8_t *header, size_t header_len) {
+mp_int_t common_hal_bleio_packet_buffer_write(bleio_packet_buffer_obj_t *self, const uint8_t *data, size_t len, uint8_t *header, size_t header_len) {
     if (self->outgoing[0] == NULL) {
         mp_raise_bleio_BluetoothError(translate("Writes not supported on Characteristic"));
     }
@@ -330,14 +369,14 @@ mp_int_t common_hal_bleio_packet_buffer_write(bleio_packet_buffer_obj_t *self, u
     uint8_t is_nested_critical_region;
     sd_nvic_critical_region_enter(&is_nested_critical_region);
 
-    uint8_t *pending = self->outgoing[self->pending_index];
+    uint32_t *pending = self->outgoing[self->pending_index];
 
     if (self->pending_size == 0) {
         memcpy(pending, header, header_len);
         self->pending_size += header_len;
         num_bytes_written += header_len;
     }
-    memcpy(pending + self->pending_size, data, len);
+    memcpy(((uint8_t *)pending) + self->pending_size, data, len);
     self->pending_size += len;
     num_bytes_written += len;
 
@@ -425,6 +464,15 @@ mp_int_t common_hal_bleio_packet_buffer_get_outgoing_packet_length(bleio_packet_
     return MIN(self->characteristic->max_length, self->max_packet_size);
 }
 
+void common_hal_bleio_packet_buffer_flush(bleio_packet_buffer_obj_t *self) {
+    while (self->pending_size != 0 &&
+           self->packet_queued &&
+           self->conn_handle != BLE_CONN_HANDLE_INVALID &&
+           !mp_hal_is_interrupted()) {
+        RUN_BACKGROUND_TASKS;
+    }
+}
+
 bool common_hal_bleio_packet_buffer_deinited(bleio_packet_buffer_obj_t *self) {
     return self->characteristic == NULL;
 }
diff --git a/ports/nrf/common-hal/_bleio/PacketBuffer.h b/ports/nrf/common-hal/_bleio/PacketBuffer.h
index 6f2626565b..9e679fc5ca 100644
--- a/ports/nrf/common-hal/_bleio/PacketBuffer.h
+++ b/ports/nrf/common-hal/_bleio/PacketBuffer.h
@@ -39,7 +39,7 @@ typedef struct {
     ringbuf_t ringbuf;
     // Two outgoing buffers to alternate between. One will be queued for transmission by the SD and
     // the other is waiting to be queued and can be extended.
-    uint8_t *outgoing[2];
+    uint32_t *outgoing[2];
     volatile uint16_t pending_size;
     // We remember the conn_handle so we can do a NOTIFY/INDICATE to a client.
     // We can find out the conn_handle on a Characteristic write or a CCCD write (but not a read).
diff --git a/ports/nrf/common-hal/_bleio/Service.c b/ports/nrf/common-hal/_bleio/Service.c
index 74e74fac9f..5302f25946 100644
--- a/ports/nrf/common-hal/_bleio/Service.c
+++ b/ports/nrf/common-hal/_bleio/Service.c
@@ -34,6 +34,19 @@
 #include "shared-bindings/_bleio/Service.h"
 #include "shared-bindings/_bleio/Adapter.h"
 
+
+STATIC void _indicate_service_change(uint16_t start, uint16_t end) {
+    for (size_t i = 0; i < BLEIO_TOTAL_CONNECTION_COUNT; i++) {
+        bleio_connection_internal_t *connection = &bleio_connections[i];
+        uint16_t conn_handle = connection->conn_handle;
+        if (connection->conn_handle == BLE_CONN_HANDLE_INVALID) {
+            continue;
+        }
+
+        sd_ble_gatts_service_changed(conn_handle, start, end);
+    }
+}
+
 uint32_t _common_hal_bleio_service_construct(bleio_service_obj_t *self, bleio_uuid_obj_t *uuid, bool is_secondary, mp_obj_list_t *characteristic_list) {
     self->handle = 0xFFFF;
     self->uuid = uuid;
@@ -50,9 +63,13 @@ uint32_t _common_hal_bleio_service_construct(bleio_service_obj_t *self, bleio_uu
         service_type = BLE_GATTS_SRVC_TYPE_SECONDARY;
     }
 
-    vm_used_ble = true;
+    uint32_t result = sd_ble_gatts_service_add(service_type, &nordic_uuid, &self->handle);
+    // Do a service changed indication to all connected peers.
+    if (result == NRF_SUCCESS) {
+        _indicate_service_change(self->handle, self->handle);
+    }
 
-    return sd_ble_gatts_service_add(service_type, &nordic_uuid, &self->handle);
+    return result;
 }
 
 void common_hal_bleio_service_construct(bleio_service_obj_t *self, bleio_uuid_obj_t *uuid, bool is_secondary) {
@@ -85,6 +102,14 @@ bool common_hal_bleio_service_get_is_secondary(bleio_service_obj_t *self) {
     return self->is_secondary;
 }
 
+STATIC void _expand_range(uint16_t new_value, uint16_t *start, uint16_t *end) {
+    if (new_value == 0) {
+        return;
+    }
+    *start = MIN(*start, new_value);
+    *end = MAX(*end, new_value);
+}
+
 void common_hal_bleio_service_add_characteristic(bleio_service_obj_t *self,
     bleio_characteristic_obj_t *characteristic,
     mp_buffer_info_t *initial_value_bufinfo) {
@@ -124,14 +149,11 @@ void common_hal_bleio_service_add_characteristic(bleio_service_obj_t *self,
     char_attr_md.rd_auth = true;
     #endif
 
-    mp_buffer_info_t char_value_bufinfo;
-    mp_get_buffer_raise(characteristic->initial_value, &char_value_bufinfo, MP_BUFFER_READ);
-
     ble_gatts_attr_t char_attr = {
         .p_uuid = &char_uuid,
         .p_attr_md = &char_attr_md,
-        .init_len = char_value_bufinfo.len,
-        .p_value = char_value_bufinfo.buf,
+        .init_len = characteristic->initial_value_len,
+        .p_value = (uint8_t *)characteristic->initial_value,
         .init_offs = 0,
         .max_len = characteristic->max_length,
     };
@@ -144,6 +166,15 @@ void common_hal_bleio_service_add_characteristic(bleio_service_obj_t *self,
     characteristic->cccd_handle = char_handles.cccd_handle;
     characteristic->sccd_handle = char_handles.sccd_handle;
     characteristic->handle = char_handles.value_handle;
+
+    // Indicate that the attribute table has changed.
+    uint16_t start = char_handles.value_handle;
+    uint16_t end = char_handles.value_handle;
+    _expand_range(char_handles.cccd_handle, &start, &end);
+    _expand_range(char_handles.sccd_handle, &start, &end);
+    _expand_range(char_handles.user_desc_handle, &start, &end);
+    _indicate_service_change(start, end);
+
     #if CIRCUITPY_VERBOSE_BLE
     mp_printf(&mp_plat_print, "Char handle %x user %x cccd %x sccd %x\n", characteristic->handle, characteristic->user_desc_handle, characteristic->cccd_handle, characteristic->sccd_handle);
     #endif
diff --git a/ports/nrf/common-hal/_bleio/UUID.c b/ports/nrf/common-hal/_bleio/UUID.c
index 399bf23ed2..a55d874f22 100644
--- a/ports/nrf/common-hal/_bleio/UUID.c
+++ b/ports/nrf/common-hal/_bleio/UUID.c
@@ -50,7 +50,6 @@ void common_hal_bleio_uuid_construct(bleio_uuid_obj_t *self, mp_int_t uuid16, co
 
         // Register this vendor-specific UUID. Bytes 12 and 13 will be zero.
         check_nrf_error(sd_ble_uuid_vs_add(&vs_uuid, &self->nrf_ble_uuid.type));
-        vm_used_ble = true;
     }
 }
 
diff --git a/ports/nrf/common-hal/_bleio/__init__.c b/ports/nrf/common-hal/_bleio/__init__.c
index 8c28b970c4..3c919c9ffe 100644
--- a/ports/nrf/common-hal/_bleio/__init__.c
+++ b/ports/nrf/common-hal/_bleio/__init__.c
@@ -94,18 +94,13 @@ void check_sec_status(uint8_t sec_status) {
     }
 }
 
-bool vm_used_ble;
-
 // Turn off BLE on a reset or reload.
 void bleio_reset() {
     if (!common_hal_bleio_adapter_get_enabled(&common_hal_bleio_adapter_obj)) {
         return;
     }
+
     bleio_adapter_reset(&common_hal_bleio_adapter_obj);
-    if (!vm_used_ble) {
-        // No user-code BLE operations were done, so we can maintain the supervisor state.
-        return;
-    }
     common_hal_bleio_adapter_set_enabled(&common_hal_bleio_adapter_obj, false);
     bonding_reset();
     supervisor_start_bluetooth();
diff --git a/ports/nrf/common-hal/_bleio/__init__.h b/ports/nrf/common-hal/_bleio/__init__.h
index 97f82ece34..d94267dd3c 100644
--- a/ports/nrf/common-hal/_bleio/__init__.h
+++ b/ports/nrf/common-hal/_bleio/__init__.h
@@ -45,7 +45,4 @@ void check_nrf_error(uint32_t err_code);
 void check_gatt_status(uint16_t gatt_status);
 void check_sec_status(uint8_t sec_status);
 
-// Track if the user code modified the BLE state to know if we need to undo it on reload.
-extern bool vm_used_ble;
-
 #endif // MICROPY_INCLUDED_NRF_COMMON_HAL_BLEIO_INIT_H
diff --git a/ports/nrf/common-hal/_bleio/bonding.c b/ports/nrf/common-hal/_bleio/bonding.c
index 0c39bfe423..42df817c71 100644
--- a/ports/nrf/common-hal/_bleio/bonding.c
+++ b/ports/nrf/common-hal/_bleio/bonding.c
@@ -139,6 +139,20 @@ STATIC bonding_block_t *find_existing_block(bool is_central, bonding_block_type_
     }
 }
 
+size_t bonding_peripheral_bond_count(void) {
+    bonding_block_t *block = NULL;
+    size_t count = 0;
+    while (1) {
+        block = next_block(block);
+        if (block == NULL) {
+            return count;
+        }
+        if (block->type != BLOCK_UNUSED && block->type != BLOCK_INVALID && !block->is_central) {
+            count++;
+        }
+    }
+}
+
 // Get an empty block large enough to store data_length data.
 STATIC bonding_block_t *find_unused_block(uint16_t data_length) {
     bonding_block_t *unused_block = find_existing_block(true, BLOCK_UNUSED, EDIV_INVALID);
@@ -225,7 +239,7 @@ STATIC void write_keys_block(bleio_connection_internal_t *connection) {
         ? connection->bonding_keys.peer_enc.master_id.ediv
         : connection->bonding_keys.own_enc.master_id.ediv;
 
-    // Is there an existing keys block that matches?
+    // Is there an existing keys block that matches the ediv?
     bonding_block_t *existing_block = find_existing_block(connection->is_central, BLOCK_KEYS, ediv);
     if (existing_block) {
         if (existing_block->data_length == sizeof(bonding_keys_t) &&
@@ -236,6 +250,21 @@ STATIC void write_keys_block(bleio_connection_internal_t *connection) {
         // Data doesn't match. Invalidate block and store a new one.
         invalidate_block(existing_block);
     }
+    // Invalidate any existing blocks that match the peer address.
+    existing_block = next_block(NULL);
+    while (existing_block != NULL) {
+        if (existing_block->type == BLOCK_KEYS && connection->is_central == existing_block->is_central &&
+            existing_block->data_length == sizeof(bonding_keys_t)) {
+            const ble_gap_addr_t *existing_peer = &((const bonding_keys_t *)existing_block->data)->peer_id.id_addr_info;
+            const ble_gap_addr_t *connecting_peer = &connection->bonding_keys.peer_id.id_addr_info;
+            if (memcmp(existing_peer->addr, connecting_peer->addr, 6) == 0 &&
+                memcmp(existing_block->data, &connection->bonding_keys, sizeof(bonding_keys_t)) != 0) {
+                // Mismatched block found. Invalidate it.
+                invalidate_block(existing_block);
+            }
+        }
+        existing_block = next_block(existing_block);
+    }
 
     bonding_block_t block_header = {
         .is_central = connection->is_central,
@@ -308,3 +337,40 @@ bool bonding_load_keys(bool is_central, uint16_t ediv, bonding_keys_t *bonding_k
     memcpy(bonding_keys, block->data, block->data_length);
     return true;
 }
+
+size_t bonding_load_identities(bool is_central, const ble_gap_id_key_t **keys, size_t max_length) {
+    bonding_block_t *block = NULL;
+    size_t len = 0;
+    while (len < max_length) {
+        block = next_block(block);
+        if (block == NULL) {
+            return len;
+        }
+        if (block->type != BLOCK_UNUSED &&
+            block->type != BLOCK_INVALID &&
+            block->is_central == is_central) {
+            if (sizeof(bonding_keys_t) != block->data_length) {
+                // bonding_keys_t is a fixed length, so lengths should match.
+                return len;
+            }
+            const bonding_keys_t *key_set = (const bonding_keys_t *)block->data;
+            keys[len] = &key_set->peer_id;
+            len++;
+        }
+    }
+    return len;
+}
+
+const ble_gap_enc_key_t *bonding_load_peer_encryption_key(bool is_central, const ble_gap_addr_t *peer) {
+    bonding_block_t *block = next_block(NULL);
+    while (block != NULL) {
+        if (block->type == BLOCK_KEYS && block->is_central == is_central) {
+            const bonding_keys_t *key_set = (const bonding_keys_t *)block->data;
+            if (memcmp(key_set->peer_id.id_addr_info.addr, peer->addr, 6) == 0) {
+                return &key_set->peer_enc;
+            }
+        }
+        block = next_block(block);
+    }
+    return NULL;
+}
diff --git a/ports/nrf/common-hal/_bleio/bonding.h b/ports/nrf/common-hal/_bleio/bonding.h
index c0dbe2aec0..228082ec30 100644
--- a/ports/nrf/common-hal/_bleio/bonding.h
+++ b/ports/nrf/common-hal/_bleio/bonding.h
@@ -81,5 +81,8 @@ void bonding_reset(void);
 void bonding_clear_keys(bonding_keys_t *bonding_keys);
 bool bonding_load_cccd_info(bool is_central, uint16_t conn_handle, uint16_t ediv);
 bool bonding_load_keys(bool is_central, uint16_t ediv, bonding_keys_t *bonding_keys);
+const ble_gap_enc_key_t *bonding_load_peer_encryption_key(bool is_central, const ble_gap_addr_t *peer);
+size_t bonding_load_identities(bool is_central, const ble_gap_id_key_t **keys, size_t max_length);
+size_t bonding_peripheral_bond_count(void);
 
 #endif // MICROPY_INCLUDED_NRF_COMMON_HAL_BLEIO_BONDING_H
diff --git a/ports/nrf/mpconfigport.mk b/ports/nrf/mpconfigport.mk
index b355b8f652..6bd63bcd72 100644
--- a/ports/nrf/mpconfigport.mk
+++ b/ports/nrf/mpconfigport.mk
@@ -47,6 +47,11 @@ CIRCUITPY_WATCHDOG ?= 1
 # Sleep and Wakeup
 CIRCUITPY_ALARM ?= 1
 
+# Turn on the BLE file service
+CIRCUITPY_BLE_FILE_SERVICE ?= 1
+
+CIRCUITPY_COMPUTED_GOTO_SAVE_SPACE ?= 1
+
 # nRF52840-specific
 
 ifeq ($(MCU_CHIP),nrf52840)
diff --git a/ports/nrf/supervisor/bluetooth.c b/ports/nrf/supervisor/bluetooth.c
deleted file mode 100644
index 5ce737f6ad..0000000000
--- a/ports/nrf/supervisor/bluetooth.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2019 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 "supervisor/shared/bluetooth.h"
-#include "supervisor/bluetooth.h"
-
-// This happens in an interrupt so we need to be quick.
-bool supervisor_bluetooth_hook(ble_evt_t *ble_evt) {
-    #if CIRCUITPY_BLE_FILE_SERVICE
-    // Catch writes to filename or contents. Length is read-only.
-
-    bool done = false;
-    switch (ble_evt->header.evt_id) {
-        case BLE_GAP_EVT_CONNECTED:
-            // We run our background task even if it wasn't us connected to because we may want to
-            // advertise if the user code stopped advertising.
-            run_ble_background = true;
-            break;
-        case BLE_GAP_EVT_DISCONNECTED:
-            run_ble_background = true;
-            break;
-        case BLE_GATTS_EVT_WRITE: {
-            // A client wrote to a characteristic.
-
-            ble_gatts_evt_write_t *evt_write = &ble_evt->evt.gatts_evt.params.write;
-            // Event handle must match the handle for my characteristic.
-            if (evt_write->handle == supervisor_ble_contents_characteristic.handle) {
-                // Handle events
-                // write_to_ringbuf(self, evt_write->data, evt_write->len);
-                // First packet includes a uint16_t le for length at the start.
-                uint16_t current_length = ((uint16_t *)current_command)[0];
-                memcpy(((uint8_t *)current_command) + current_offset, evt_write->data, evt_write->len);
-                current_offset += evt_write->len;
-                current_length = ((uint16_t *)current_command)[0];
-                if (current_offset == current_length) {
-                    run_ble_background = true;
-                    done = true;
-                }
-            } else if (evt_write->handle == supervisor_ble_filename_characteristic.handle) {
-                new_filename = true;
-                run_ble_background = true;
-                done = true;
-            } else {
-                return done;
-            }
-            break;
-        }
-
-        default:
-            // For debugging.
-            // mp_printf(&mp_plat_print, "Unhandled peripheral event: 0x%04x\n", ble_evt->header.evt_id);
-            break;
-    }
-    return done;
-    #else
-    return false;
-    #endif
-}
diff --git a/ports/nrf/supervisor/bluetooth.h b/ports/nrf/supervisor/bluetooth.h
deleted file mode 100644
index 425de07e4d..0000000000
--- a/ports/nrf/supervisor/bluetooth.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2019 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_NRF_SUPERVISOR_BLUETOOTH_H
-#define MICROPY_INCLUDED_NRF_SUPERVISOR_BLUETOOTH_H
-
-#include <stdbool.h>
-
-#include "ble.h"
-
-bool supervisor_bluetooth_hook(ble_evt_t *ble_evt);
-
-#endif // MICROPY_INCLUDED_NRF_SUPERVISOR_BLUETOOTH_H
diff --git a/shared-bindings/_bleio/Adapter.c b/shared-bindings/_bleio/Adapter.c
index 1c16cc7d87..8262830aee 100644
--- a/shared-bindings/_bleio/Adapter.c
+++ b/shared-bindings/_bleio/Adapter.c
@@ -190,7 +190,10 @@ const mp_obj_property_t bleio_adapter_name_obj = {
                MP_ROM_NONE },
 };
 
-//|     def start_advertising(self, data: ReadableBuffer, *, scan_response: Optional[ReadableBuffer] = None, connectable: bool = True, anonymous: bool = False, timeout: int = 0, interval: float = 0.1, tx_power: int = 0) -> None:
+//|     def start_advertising(self, data: ReadableBuffer, *,
+//|                           scan_response: Optional[ReadableBuffer] = None, connectable: bool = True,
+//|                           anonymous: bool = False, timeout: int = 0, interval: float = 0.1,
+//|                           tx_power: int = 0, directed_to: Optional[Address] = None) -> None:
 //|         """Starts advertising until `stop_advertising` is called or if connectable, another device
 //|         connects to us.
 //|
@@ -206,13 +209,14 @@ const mp_obj_property_t bleio_adapter_name_obj = {
 //|         :param bool anonymous:  If `True` then this device's MAC address is randomized before advertising.
 //|         :param int timeout:  If set, we will only advertise for this many seconds. Zero means no timeout.
 //|         :param float interval:  advertising interval, in seconds
-//|         :param tx_power int: transmitter power while advertising in dBm"""
+//|         :param tx_power int: transmitter power while advertising in dBm
+//|         :param directed_to Address: peer to advertise directly to"""
 //|         ...
 //|
 STATIC mp_obj_t bleio_adapter_start_advertising(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     bleio_adapter_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
 
-    enum { ARG_data, ARG_scan_response, ARG_connectable, ARG_anonymous, ARG_timeout, ARG_interval, ARG_tx_power };
+    enum { ARG_data, ARG_scan_response, ARG_connectable, ARG_anonymous, ARG_timeout, ARG_interval, ARG_tx_power, ARG_directed_to };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_data, MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_scan_response, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
@@ -221,6 +225,7 @@ STATIC mp_obj_t bleio_adapter_start_advertising(mp_uint_t n_args, const mp_obj_t
         { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
         { MP_QSTR_interval, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_tx_power, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_directed_to, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
     };
 
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -252,8 +257,17 @@ STATIC mp_obj_t bleio_adapter_start_advertising(mp_uint_t n_args, const mp_obj_t
         mp_raise_bleio_BluetoothError(translate("Cannot have scan responses for extended, connectable advertisements."));
     }
 
+    bleio_address_obj_t *address = MP_OBJ_TO_PTR(args[ARG_directed_to].u_obj);
+    if (address != NULL && !connectable) {
+        mp_raise_bleio_BluetoothError(translate("Only connectable advertisements can be directed"));
+    }
+
+    if (address != NULL && !mp_obj_is_type(address, &bleio_address_type)) {
+        mp_raise_TypeError(translate("Expected an Address"));
+    }
+
     common_hal_bleio_adapter_start_advertising(self, connectable, anonymous, timeout, interval,
-        &data_bufinfo, &scan_response_bufinfo, args[ARG_tx_power].u_int);
+        &data_bufinfo, &scan_response_bufinfo, args[ARG_tx_power].u_int, address);
 
     return mp_const_none;
 }
diff --git a/shared-bindings/_bleio/Adapter.h b/shared-bindings/_bleio/Adapter.h
index 06dc47311b..1dce615a40 100644
--- a/shared-bindings/_bleio/Adapter.h
+++ b/shared-bindings/_bleio/Adapter.h
@@ -53,9 +53,17 @@ extern bool common_hal_bleio_adapter_set_address(bleio_adapter_obj_t *self, blei
 extern mp_obj_str_t *common_hal_bleio_adapter_get_name(bleio_adapter_obj_t *self);
 extern void common_hal_bleio_adapter_set_name(bleio_adapter_obj_t *self, const char *name);
 
-extern uint32_t _common_hal_bleio_adapter_start_advertising(bleio_adapter_obj_t *self, bool connectable, bool anonymous, uint32_t timeout, float interval, uint8_t *advertising_data, uint16_t advertising_data_len, uint8_t *scan_response_data, uint16_t scan_response_data_len, mp_int_t tx_power);
+extern uint32_t _common_hal_bleio_adapter_start_advertising(bleio_adapter_obj_t *self,
+    bool connectable, bool anonymous, uint32_t timeout, float interval,
+    const uint8_t *advertising_data, uint16_t advertising_data_len,
+    const uint8_t *scan_response_data, uint16_t scan_response_data_len,
+    mp_int_t tx_power, const bleio_address_obj_t *directed_to);
 
-extern void common_hal_bleio_adapter_start_advertising(bleio_adapter_obj_t *self, bool connectable, bool anonymous, uint32_t timeout, mp_float_t interval, mp_buffer_info_t *advertising_data_bufinfo, mp_buffer_info_t *scan_response_data_bufinfo, mp_int_t tx_power);
+extern void common_hal_bleio_adapter_start_advertising(bleio_adapter_obj_t *self,
+    bool connectable, bool anonymous, uint32_t timeout, mp_float_t interval,
+    mp_buffer_info_t *advertising_data_bufinfo,
+    mp_buffer_info_t *scan_response_data_bufinfo,
+    mp_int_t tx_power, const bleio_address_obj_t *directed_to);
 extern void common_hal_bleio_adapter_stop_advertising(bleio_adapter_obj_t *self);
 
 extern mp_obj_t common_hal_bleio_adapter_start_scan(bleio_adapter_obj_t *self, uint8_t *prefixes, size_t prefix_length, bool extended, mp_int_t buffer_size, mp_float_t timeout, mp_float_t interval, mp_float_t window, mp_int_t minimum_rssi, bool active);
@@ -66,5 +74,6 @@ extern mp_obj_t common_hal_bleio_adapter_get_connections(bleio_adapter_obj_t *se
 extern mp_obj_t common_hal_bleio_adapter_connect(bleio_adapter_obj_t *self, bleio_address_obj_t *address, mp_float_t timeout);
 
 extern void common_hal_bleio_adapter_erase_bonding(bleio_adapter_obj_t *self);
+extern bool common_hal_bleio_adapter_is_bonded_to_central(bleio_adapter_obj_t *self);
 
 #endif // MICROPY_INCLUDED_SHARED_BINDINGS_BLEIO_ADAPTER_H
diff --git a/shared-bindings/_bleio/Characteristic.h b/shared-bindings/_bleio/Characteristic.h
index 878d998a2d..5807abf418 100644
--- a/shared-bindings/_bleio/Characteristic.h
+++ b/shared-bindings/_bleio/Characteristic.h
@@ -28,6 +28,7 @@
 #ifndef MICROPY_INCLUDED_SHARED_BINDINGS_BLEIO_CHARACTERISTIC_H
 #define MICROPY_INCLUDED_SHARED_BINDINGS_BLEIO_CHARACTERISTIC_H
 
+#include "py/objtuple.h"
 #include "shared-bindings/_bleio/Attribute.h"
 #include "shared-bindings/_bleio/Descriptor.h"
 #include "shared-module/_bleio/Characteristic.h"
diff --git a/shared-bindings/_bleio/Connection.c b/shared-bindings/_bleio/Connection.c
index b416fac579..26b5c60fe1 100644
--- a/shared-bindings/_bleio/Connection.c
+++ b/shared-bindings/_bleio/Connection.c
@@ -205,7 +205,7 @@ STATIC mp_obj_t bleio_connection_get_connection_interval(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_connection_get_connection_interval_obj, bleio_connection_get_connection_interval);
 
-//|     attribute: int
+//|     max_packet_length: int
 //|     """The maximum number of data bytes that can be sent in a single transmission,
 //|     not including overhead bytes.
 //|
diff --git a/shared-bindings/_bleio/PacketBuffer.h b/shared-bindings/_bleio/PacketBuffer.h
index b300cb0215..adead29b46 100644
--- a/shared-bindings/_bleio/PacketBuffer.h
+++ b/shared-bindings/_bleio/PacketBuffer.h
@@ -31,13 +31,20 @@
 
 extern const mp_obj_type_t bleio_packet_buffer_type;
 
-extern void common_hal_bleio_packet_buffer_construct(
+void common_hal_bleio_packet_buffer_construct(
     bleio_packet_buffer_obj_t *self, bleio_characteristic_obj_t *characteristic,
     size_t buffer_size, size_t max_packet_size);
-mp_int_t common_hal_bleio_packet_buffer_write(bleio_packet_buffer_obj_t *self, uint8_t *data, size_t len, uint8_t *header, size_t header_len);
+// Allocation free
+void _common_hal_bleio_packet_buffer_construct(
+    bleio_packet_buffer_obj_t *self, bleio_characteristic_obj_t *characteristic,
+    uint32_t *incoming_buffer, size_t incoming_buffer_size,
+    uint32_t *outgoing_buffer1, uint32_t *outgoing_buffer2, size_t outgoing_buffer_size,
+    void *static_handler_entry);
+mp_int_t common_hal_bleio_packet_buffer_write(bleio_packet_buffer_obj_t *self, const uint8_t *data, size_t len, uint8_t *header, size_t header_len);
 mp_int_t common_hal_bleio_packet_buffer_readinto(bleio_packet_buffer_obj_t *self, uint8_t *data, size_t len);
 mp_int_t common_hal_bleio_packet_buffer_get_incoming_packet_length(bleio_packet_buffer_obj_t *self);
 mp_int_t common_hal_bleio_packet_buffer_get_outgoing_packet_length(bleio_packet_buffer_obj_t *self);
+void common_hal_bleio_packet_buffer_flush(bleio_packet_buffer_obj_t *self);
 bool common_hal_bleio_packet_buffer_deinited(bleio_packet_buffer_obj_t *self);
 void common_hal_bleio_packet_buffer_deinit(bleio_packet_buffer_obj_t *self);
 
diff --git a/supervisor/shared/bluetooth.c b/supervisor/shared/bluetooth.c
index 00095c4f6b..f89d8e3334 100644
--- a/supervisor/shared/bluetooth.c
+++ b/supervisor/shared/bluetooth.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2019 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2019-2021 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
@@ -25,6 +25,10 @@
  */
 
 #if !CIRCUITPY_BLE_FILE_SERVICE
+
+void supervisor_bluetooth_init(void) {
+}
+
 void supervisor_start_bluetooth(void) {
 }
 
@@ -35,66 +39,194 @@ void supervisor_bluetooth_background(void) {
 
 #include <string.h>
 
+#include "supervisor/shared/bluetooth.h"
+
 #include "extmod/vfs.h"
 #include "extmod/vfs_fat.h"
 
 #include "shared-bindings/_bleio/__init__.h"
 #include "shared-bindings/_bleio/Adapter.h"
 #include "shared-bindings/_bleio/Characteristic.h"
+#include "shared-bindings/_bleio/PacketBuffer.h"
 #include "shared-bindings/_bleio/Service.h"
 #include "shared-bindings/_bleio/UUID.h"
+#if defined(CIRCUITPY_BOOT_BUTTON)
+#include "shared-bindings/digitalio/DigitalInOut.h"
+#endif
+#include "shared-bindings/microcontroller/Processor.h"
+#include "shared-bindings/microcontroller/ResetReason.h"
+#include "shared-module/storage/__init__.h"
+
+#include "bluetooth/ble_drv.h"
 
 #include "common-hal/_bleio/__init__.h"
 
 #include "supervisor/shared/autoreload.h"
+#include "supervisor/shared/status_leds.h"
+#include "supervisor/shared/tick.h"
+#include "supervisor/usb.h"
 
 #include "py/mpstate.h"
 
-
-
 bleio_service_obj_t supervisor_ble_service;
 bleio_uuid_obj_t supervisor_ble_service_uuid;
 bleio_characteristic_obj_t supervisor_ble_version_characteristic;
 bleio_uuid_obj_t supervisor_ble_version_uuid;
-bleio_characteristic_obj_t supervisor_ble_filename_characteristic;
-bleio_uuid_obj_t supervisor_ble_filename_uuid;
-bleio_characteristic_obj_t supervisor_ble_length_characteristic;
-bleio_uuid_obj_t supervisor_ble_length_uuid;
-bleio_characteristic_obj_t supervisor_ble_contents_characteristic;
-bleio_uuid_obj_t supervisor_ble_contents_uuid;
+bleio_characteristic_obj_t supervisor_ble_transfer_characteristic;
+bleio_uuid_obj_t supervisor_ble_transfer_uuid;
 
-// This is the base UUID for CircuitPython services and characteristics.
-const uint8_t circuitpython_base_uuid[16] = {0x6e, 0x68, 0x74, 0x79, 0x50, 0x74, 0x69, 0x75, 0x63, 0x72, 0x69, 0x43, 0x00, 0x00, 0xaf, 0xad };
+// This is the base UUID for the file transfer service.
+const uint8_t file_transfer_base_uuid[16] = {0x72, 0x65, 0x66, 0x73, 0x6e, 0x61, 0x72, 0x54, 0x65, 0x6c, 0x69, 0x46, 0x00, 0x00, 0xaf, 0xad };
 // This standard advertisement advertises the CircuitPython editing service and a CIRCUITPY short name.
-uint8_t circuitpython_advertising_data[] = { 0x02, 0x01, 0x06, 0x02, 0x0a, 0x00, 0x11, 0x07, 0x6e, 0x68, 0x74, 0x79, 0x50, 0x74, 0x69, 0x75, 0x63, 0x72, 0x69, 0x43, 0x00, 0x01, 0xaf, 0xad, 0x06, 0x08, 0x43, 0x49, 0x52, 0x43, 0x55 };
+const uint8_t public_advertising_data[] = { 0x02, 0x01, 0x06, // 0-2 Flags
+                                            0x02, 0x0a, 0xd8,  // 3-5 TX power level -40
+                                            0x03, 0x02, 0xbb, 0xfe,  // 6 - 9 Incomplete service list (File Transfer service)
+                                            0x0e, 0xff, 0x22, 0x08,  // 10 - 13 Adafruit Manufacturer Data
+                                            0x0a, 0x04, 0x00,        // 14 - 16 Creator ID / Creation ID
+                                            CIRCUITPY_CREATOR_ID & 0xff,              // 17 - 20 Creator ID
+                                            (CIRCUITPY_CREATOR_ID >> 8) & 0xff,
+                                            (CIRCUITPY_CREATOR_ID >> 16) & 0xff,
+                                            (CIRCUITPY_CREATOR_ID >> 24) & 0xff,
+                                            CIRCUITPY_CREATION_ID & 0xff,              // 21 - 24 Creation ID
+                                            (CIRCUITPY_CREATION_ID >> 8) & 0xff,
+                                            (CIRCUITPY_CREATION_ID >> 16) & 0xff,
+                                            (CIRCUITPY_CREATION_ID >> 24) & 0xff,
+                                            0x05, 0x08, 0x43, 0x49, 0x52, 0x43  // 25 - 31 - Short name
+};
+const uint8_t private_advertising_data[] = { 0x02, 0x01, 0x06, // 0-2 Flags
+                                             0x02, 0x0a, 0x00 // 3-5 TX power level 0
+};
 // This scan response advertises the full CIRCUITPYXXXX device name.
 uint8_t circuitpython_scan_response_data[15] = {0x0e, 0x09, 0x43, 0x49, 0x52, 0x43, 0x55, 0x49, 0x54, 0x50, 0x59, 0x00, 0x00, 0x00, 0x00};
 mp_obj_list_t service_list;
 mp_obj_t service_list_items[1];
 mp_obj_list_t characteristic_list;
-mp_obj_t characteristic_list_items[4];
+mp_obj_t characteristic_list_items[2];
+// 2 * 10 ringbuf packets, 512 for a disk sector and 12 for the file transfer write header.
+#define PACKET_BUFFER_SIZE (2 * 10 + 512 + 12)
+// uint32_t so its aligned
+uint32_t _buffer[PACKET_BUFFER_SIZE / 4 + 1];
+uint32_t _outgoing1[BLE_GATTS_VAR_ATTR_LEN_MAX / 4];
+uint32_t _outgoing2[BLE_GATTS_VAR_ATTR_LEN_MAX / 4];
+ble_drv_evt_handler_entry_t static_handler_entry;
+bleio_packet_buffer_obj_t _transfer_packet_buffer;
+bool boot_in_discovery_mode = false;
+bool advertising = false;
 
 STATIC void supervisor_bluetooth_start_advertising(void) {
     bool is_connected = common_hal_bleio_adapter_get_connected(&common_hal_bleio_adapter_obj);
     if (is_connected) {
         return;
     }
-    // TODO: switch to Adafruit short UUID for the advertisement and add manufacturing data to distinguish ourselves from arduino.
-    _common_hal_bleio_adapter_start_advertising(&common_hal_bleio_adapter_obj,
+    bool bonded = common_hal_bleio_adapter_is_bonded_to_central(&common_hal_bleio_adapter_obj);
+    #if CIRCUITPY_USB
+    // Don't advertise when we have USB instead of BLE.
+    if (!bonded && !boot_in_discovery_mode) {
+        // mp_printf(&mp_plat_print, "skipping advertising\n");
+        return;
+    }
+    #endif
+    uint32_t timeout = 0;
+    float interval = 0.1f;
+    int tx_power = 0;
+    const uint8_t *adv = private_advertising_data;
+    size_t adv_len = sizeof(private_advertising_data);
+    const uint8_t *scan_response = NULL;
+    size_t scan_response_len = 0;
+    // Advertise with less power when doing so publicly to reduce who can hear us. This will make it
+    // harder for someone with bad intentions to pair from a distance.
+    if (!bonded) {
+        tx_power = -40;
+        adv = public_advertising_data;
+        adv_len = sizeof(public_advertising_data);
+        scan_response = circuitpython_scan_response_data;
+        scan_response_len = sizeof(circuitpython_scan_response_data);
+    }
+    uint32_t status = _common_hal_bleio_adapter_start_advertising(&common_hal_bleio_adapter_obj,
         true,
-        false, 0,
-        1.0,
-        circuitpython_advertising_data,
-        sizeof(circuitpython_advertising_data),
-        circuitpython_scan_response_data,
-        sizeof(circuitpython_scan_response_data));
+        bonded, // Advertise anonymously if we are bonded
+        timeout,
+        interval,
+        adv,
+        adv_len,
+        scan_response,
+        scan_response_len,
+        tx_power,
+        NULL);
+    // This may fail if we are already advertising.
+    advertising = status == NRF_SUCCESS;
+}
+
+#define BLE_DISCOVERY_DATA_GUARD 0xbb0000bb
+#define BLE_DISCOVERY_DATA_GUARD_MASK 0xff0000ff
+
+void supervisor_bluetooth_init(void) {
+    uint32_t reset_state = port_get_saved_word();
+    uint32_t ble_mode = 0;
+    if ((reset_state & BLE_DISCOVERY_DATA_GUARD_MASK) == BLE_DISCOVERY_DATA_GUARD) {
+        ble_mode = (reset_state & ~BLE_DISCOVERY_DATA_GUARD_MASK) >> 8;
+    }
+    const mcu_reset_reason_t reset_reason = common_hal_mcu_processor_get_reset_reason();
+    boot_in_discovery_mode = false;
+    if (reset_reason != RESET_REASON_POWER_ON &&
+        reset_reason != RESET_REASON_RESET_PIN &&
+        reset_reason != RESET_REASON_UNKNOWN &&
+        reset_reason != RESET_REASON_SOFTWARE) {
+        return;
+    }
+
+    // ble_mode = 1;
+
+    if (ble_mode == 0) {
+        port_set_saved_word(BLE_DISCOVERY_DATA_GUARD | (0x01 << 8));
+    }
+    // Wait for a while to allow for reset.
+
+    #ifdef CIRCUITPY_BOOT_BUTTON
+    digitalio_digitalinout_obj_t boot_button;
+    common_hal_digitalio_digitalinout_construct(&boot_button, CIRCUITPY_BOOT_BUTTON);
+    common_hal_digitalio_digitalinout_switch_to_input(&boot_button, PULL_UP);
+    #endif
+    uint64_t start_ticks = supervisor_ticks_ms64();
+    uint64_t diff = 0;
+    if (ble_mode != 0) {
+        #ifdef CIRCUITPY_STATUS_LED
+        new_status_color(0x0000ff);
+        #endif
+        common_hal_bleio_adapter_erase_bonding(&common_hal_bleio_adapter_obj);
+        boot_in_discovery_mode = true;
+        reset_state = 0x0;
+    }
+    while (diff < 1000) {
+        #ifdef CIRCUITPY_STATUS_LED
+        // Blink on for 100, off for 100, on for 100, off for 100 and on for 200
+        bool led_on = ble_mode != 0 || (diff % 150) <= 75;
+        if (led_on) {
+            new_status_color(0x0000ff);
+        } else {
+            new_status_color(BLACK);
+        }
+        #endif
+        #ifdef CIRCUITPY_BOOT_BUTTON
+        if (!common_hal_digitalio_digitalinout_get_value(&boot_button)) {
+            boot_in_discovery_mode = true;
+            break;
+        }
+        #endif
+        diff = supervisor_ticks_ms64() - start_ticks;
+    }
+    #if CIRCUITPY_STATUS_LED
+    new_status_color(BLACK);
+    status_led_deinit();
+    #endif
+    port_set_saved_word(reset_state);
 }
 
 void supervisor_start_bluetooth(void) {
     common_hal_bleio_adapter_set_enabled(&common_hal_bleio_adapter_obj, true);
 
     supervisor_ble_service_uuid.base.type = &bleio_uuid_type;
-    common_hal_bleio_uuid_construct(&supervisor_ble_service_uuid, 0x0100, circuitpython_base_uuid);
+    common_hal_bleio_uuid_construct(&supervisor_ble_service_uuid, 0xfebb, NULL);
 
     // We know we'll only be 1 characteristic so we can statically allocate it.
     characteristic_list.base.type = &mp_type_list;
@@ -105,9 +237,9 @@ void supervisor_start_bluetooth(void) {
 
     _common_hal_bleio_service_construct(&supervisor_ble_service, &supervisor_ble_service_uuid, false /* is secondary */, &characteristic_list);
 
-    // File length
+    // Version number
     supervisor_ble_version_uuid.base.type = &bleio_uuid_type;
-    common_hal_bleio_uuid_construct(&supervisor_ble_version_uuid, 0x0203, circuitpython_base_uuid);
+    common_hal_bleio_uuid_construct(&supervisor_ble_version_uuid, 0x0100, file_transfer_base_uuid);
     common_hal_bleio_characteristic_construct(&supervisor_ble_version_characteristic,
         &supervisor_ble_service,
         0,                                       // handle (for remote only)
@@ -126,183 +258,555 @@ void supervisor_start_bluetooth(void) {
     common_hal_bleio_characteristic_set_value(&supervisor_ble_version_characteristic, &bufinfo);
 
     // Active filename.
-    supervisor_ble_filename_uuid.base.type = &bleio_uuid_type;
-    common_hal_bleio_uuid_construct(&supervisor_ble_filename_uuid, 0x0200, circuitpython_base_uuid);
-    common_hal_bleio_characteristic_construct(&supervisor_ble_filename_characteristic,
+    supervisor_ble_transfer_uuid.base.type = &bleio_uuid_type;
+    common_hal_bleio_uuid_construct(&supervisor_ble_transfer_uuid, 0x0200, file_transfer_base_uuid);
+    common_hal_bleio_characteristic_construct(&supervisor_ble_transfer_characteristic,
         &supervisor_ble_service,
         0,                                       // handle (for remote only)
-        &supervisor_ble_filename_uuid,
-        CHAR_PROP_READ | CHAR_PROP_WRITE,
-        SECURITY_MODE_OPEN,
-        SECURITY_MODE_OPEN,
-        500,                                       // max length
+        &supervisor_ble_transfer_uuid,
+        CHAR_PROP_READ | CHAR_PROP_WRITE_NO_RESPONSE | CHAR_PROP_NOTIFY,
+        SECURITY_MODE_ENC_NO_MITM,
+        SECURITY_MODE_ENC_NO_MITM,
+        BLE_GATTS_VAR_ATTR_LEN_MAX,                  // max length
         false,                                       // fixed length
         NULL);                                       // no initial value
 
-    char code_py[] = "/code.py";
-    bufinfo.buf = code_py;
-    bufinfo.len = sizeof(code_py);
-    common_hal_bleio_characteristic_set_value(&supervisor_ble_filename_characteristic, &bufinfo);
+    _common_hal_bleio_packet_buffer_construct(
+        &_transfer_packet_buffer, &supervisor_ble_transfer_characteristic,
+        _buffer, PACKET_BUFFER_SIZE,
+        _outgoing1, _outgoing2, BLE_GATTS_VAR_ATTR_LEN_MAX,
+        &static_handler_entry);
 
-    // File length
-    supervisor_ble_length_uuid.base.type = &bleio_uuid_type;
-    common_hal_bleio_uuid_construct(&supervisor_ble_length_uuid, 0x0202, circuitpython_base_uuid);
-    common_hal_bleio_characteristic_construct(&supervisor_ble_length_characteristic,
-        &supervisor_ble_service,
-        0,                                       // handle (for remote only)
-        &supervisor_ble_length_uuid,
-        CHAR_PROP_NOTIFY | CHAR_PROP_READ,
-        SECURITY_MODE_OPEN,
-        SECURITY_MODE_NO_ACCESS,
-        4,                                       // max length
-        true,                                       // fixed length
-        NULL);                                       // no initial value
-
-    // File actions
-    supervisor_ble_contents_uuid.base.type = &bleio_uuid_type;
-    common_hal_bleio_uuid_construct(&supervisor_ble_contents_uuid, 0x0201, circuitpython_base_uuid);
-    common_hal_bleio_characteristic_construct(&supervisor_ble_contents_characteristic,
-        &supervisor_ble_service,
-        0,                                       // handle (for remote only)
-        &supervisor_ble_contents_uuid,
-        CHAR_PROP_NOTIFY | CHAR_PROP_WRITE_NO_RESPONSE | CHAR_PROP_WRITE,
-        SECURITY_MODE_OPEN,
-        SECURITY_MODE_OPEN,
-        500,                                       // max length
-        false,                                       // fixed length
-        NULL);                                       // no initial value
-
-    supervisor_bluetooth_start_advertising();
-    vm_used_ble = false;
+    // Kick off advertisments
+    supervisor_bluetooth_background();
 }
 
+#define COMMAND_SIZE 1024
+
+#define ANY_COMMAND 0x00
+#define THIS_COMMAND 0x01
+#define READ 0x10
+#define READ_DATA 0x11
+#define READ_PACING 0x12
+#define WRITE 0x20
+#define WRITE_PACING 0x21
+#define WRITE_DATA 0x22
+#define DELETE 0x30
+#define DELETE_STATUS 0x31
+#define MKDIR 0x40
+#define MKDIR_STATUS 0x41
+#define LISTDIR 0x50
+#define LISTDIR_ENTRY 0x51
+
+#define STATUS_OK 0x01
+#define STATUS_ERROR 0x02
+#define STATUS_ERROR_NO_FILE 0x03
+#define STATUS_ERROR_PROTOCOL 0x04
+
+// Used by read and write.
 FIL active_file;
-volatile bool new_filename;
-volatile bool run_ble_background;
-bool was_connected;
 
-STATIC void update_file_length(void) {
-    int32_t file_length = -1;
-    mp_buffer_info_t bufinfo;
-    bufinfo.buf = &file_length;
-    bufinfo.len = sizeof(file_length);
-    if (active_file.obj.fs != 0) {
-        file_length = (int32_t)f_size(&active_file);
-    }
-    common_hal_bleio_characteristic_set_value(&supervisor_ble_length_characteristic, &bufinfo);
-}
+struct read_command {
+    uint8_t command;
+    uint8_t reserved;
+    uint16_t path_length;
+    uint32_t chunk_offset;
+    uint32_t chunk_size;
+    uint8_t path[];
+};
 
-STATIC void open_current_file(void) {
-    if (active_file.obj.fs != 0) {
-        return;
+struct read_data {
+    uint8_t command;
+    uint8_t status;
+    uint16_t reserved;
+    uint32_t chunk_offset;
+    uint32_t total_length;
+    uint32_t data_size;
+    uint8_t data[];
+};
+
+struct read_pacing {
+    uint8_t command;
+    uint8_t status;
+    uint16_t reserved;
+    uint32_t chunk_offset;
+    uint32_t chunk_size;
+};
+
+uint8_t _process_read(const uint8_t *raw_buf, size_t command_len) {
+    struct read_command *command = (struct read_command *)raw_buf;
+    size_t header_size = 12;
+    size_t response_size = 16;
+    uint8_t data_buffer[response_size];
+    struct read_data response;
+    response.command = READ_DATA;
+    response.status = STATUS_OK;
+    if (command->path_length > (COMMAND_SIZE - response_size - 1)) { // -1 for the null we'll write
+        // TODO: throw away any more packets of path.
+        response.status = STATUS_ERROR;
+        common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, response_size, NULL, 0);
+        return ANY_COMMAND;
     }
-    uint16_t max_len = supervisor_ble_filename_characteristic.max_length;
-    uint8_t path[max_len];
-    size_t length = common_hal_bleio_characteristic_get_value(&supervisor_ble_filename_characteristic, path, max_len - 1);
-    path[length] = '\0';
+    // We need to receive another packet to have the full path.
+    if (command_len < header_size + command->path_length) {
+        return THIS_COMMAND;
+    }
+
+    char *path = (char *)((uint8_t *)command) + header_size;
+    path[command->path_length] = '\0';
 
     FATFS *fs = &((fs_user_mount_t *)MP_STATE_VM(vfs_mount_table)->obj)->fatfs;
-    f_open(fs, &active_file, (char *)path, FA_READ | FA_WRITE);
-
-    update_file_length();
-}
-
-STATIC void close_current_file(void) {
-    f_close(&active_file);
-}
-
-uint32_t current_command[1024 / sizeof(uint32_t)];
-volatile size_t current_offset;
-
-void supervisor_bluetooth_background(void) {
-    if (!run_ble_background) {
-        return;
+    FRESULT result = f_open(fs, &active_file, path, FA_READ);
+    if (result != FR_OK) {
+        response.status = STATUS_ERROR;
+        common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, response_size, NULL, 0);
+        return ANY_COMMAND;
     }
+    uint32_t total_length = f_size(&active_file);
+    // Write out the response header.
+    uint32_t offset = command->chunk_offset;
+    uint32_t chunk_size = command->chunk_size;
+    chunk_size = MIN(chunk_size, total_length - offset);
+    response.chunk_offset = offset;
+    response.total_length = total_length;
+    response.data_size = chunk_size;
+    common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, response_size, NULL, 0);
+    f_lseek(&active_file, offset);
+    // Write out the chunk contents. We can do this in small pieces because PacketBuffer
+    // will assemble them into larger packets of its own.
+    size_t chunk_end = offset + chunk_size;
+    while (offset < chunk_end) {
+        size_t quantity_read;
+        size_t read_amount = MIN(response_size, chunk_end - offset);
+        f_read(&active_file, data_buffer, read_amount, &quantity_read);
+        offset += quantity_read;
+        // TODO: Do something if the read fails
+        common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, data_buffer, quantity_read, NULL, 0);
+    }
+    if (offset >= total_length) {
+        f_close(&active_file);
+        return ANY_COMMAND;
+    }
+    return READ_PACING;
+}
+
+uint8_t _process_read_pacing(const uint8_t *command, size_t command_len) {
+    size_t response_size = 4 * sizeof(uint32_t);
+    uint32_t response[response_size / sizeof(uint32_t)];
+    uint8_t *response_bytes = (uint8_t *)response;
+    response_bytes[0] = READ_DATA;
+    response_bytes[1] = STATUS_OK;
+    uint32_t offset = ((uint32_t *)command)[1];
+    uint32_t chunk_size = ((uint32_t *)command)[2];
+    uint32_t total_length = f_size(&active_file);
+    // Write out the response header.
+    chunk_size = MIN(chunk_size, total_length - offset);
+    response[1] = offset;
+    response[2] = total_length;
+    response[3] = chunk_size;
+    common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, response_size, NULL, 0);
+    f_lseek(&active_file, offset);
+    // Write out the chunk contents. We can do this in small pieces because PacketBuffer
+    // will assemble them into larger packets of its own.
+    size_t chunk_offset = 0;
+    while (chunk_offset < chunk_size) {
+        size_t quantity_read;
+        size_t read_size = MIN(chunk_size - chunk_offset, response_size);
+        FRESULT result = f_read(&active_file, response, read_size, &quantity_read);
+        if (quantity_read == 0 || result != FR_OK) {
+            // TODO: If we can't read everything, then the file must have been shortened. Maybe we
+            // should return 0s to pad it out.
+            break;
+        }
+        common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, quantity_read, NULL, 0);
+        chunk_offset += quantity_read;
+    }
+    if ((offset + chunk_size) >= total_length) {
+        f_close(&active_file);
+        return ANY_COMMAND;
+    }
+    return READ_PACING;
+}
+
+// Used by write and write data to know when the write is complete.
+size_t total_write_length;
+
+struct write_command {
+    uint8_t command;
+    uint8_t reserved;
+    uint16_t path_length;
+    uint32_t offset;
+    uint32_t total_length;
+    uint8_t path[];
+};
+
+struct write_data {
+    uint8_t command;
+    uint8_t status;
+    uint16_t reserved;
+    uint32_t offset;
+    uint32_t data_size;
+    uint8_t data[];
+};
+
+struct write_pacing {
+    uint8_t command;
+    uint8_t status;
+    uint16_t reserved;
+    uint32_t offset;
+    uint32_t free_space;
+};
+
+uint8_t _process_write(const uint8_t *raw_buf, size_t command_len) {
+    struct write_command *command = (struct write_command *)raw_buf;
+    size_t header_size = 12;
+    struct write_pacing response;
+    response.command = WRITE_PACING;
+    response.status = STATUS_OK;
+    if (command->path_length > (COMMAND_SIZE - header_size - 1)) { // -1 for the null we'll write
+        // TODO: throw away any more packets of path.
+        response.status = STATUS_ERROR;
+        common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct write_pacing), NULL, 0);
+        return ANY_COMMAND;
+    }
+    // We need to receive another packet to have the full path.
+    if (command_len < header_size + command->path_length) {
+        return THIS_COMMAND;
+    }
+    total_write_length = command->total_length;
+
+    char *path = (char *)command->path;
+    path[command->path_length] = '\0';
+
+    // Check to see if USB has already been mounted. If not, then we "eject" from USB until we're done.
+    #if CIRCUITPY_USB_MSC
+    if (storage_usb_enabled() && !usb_msc_lock()) {
+        response.status = STATUS_ERROR;
+        common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct write_pacing), NULL, 0);
+        return ANY_COMMAND;
+    }
+    #endif
+
+    FATFS *fs = &((fs_user_mount_t *)MP_STATE_VM(vfs_mount_table)->obj)->fatfs;
+    FRESULT result = f_open(fs, &active_file, path, FA_WRITE | FA_OPEN_ALWAYS);
+    if (result != FR_OK) {
+        response.status = STATUS_ERROR;
+        common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct write_pacing), NULL, 0);
+        #if CIRCUITPY_USB_MSC
+        usb_msc_unlock();
+        #endif
+        return ANY_COMMAND;
+    }
+    // Write out the pacing response.
+
+    // Align the next chunk to a sector boundary.
+    uint32_t offset = command->offset;
+    size_t chunk_size = MIN(total_write_length - offset, 512 - (offset % 512));
+    response.offset = offset;
+    response.free_space = chunk_size;
+    common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct write_pacing), NULL, 0);
+    return WRITE_DATA;
+}
+
+uint8_t _process_write_data(const uint8_t *raw_buf, size_t command_len) {
+    struct write_data *command = (struct write_data *)raw_buf;
+    size_t header_size = 12;
+    struct write_pacing response;
+    response.command = WRITE_PACING;
+    response.status = STATUS_OK;
+    if (command->data_size > (COMMAND_SIZE - header_size - 1)) { // -1 for the null we'll write
+        // TODO: throw away any more packets of path.
+        response.status = STATUS_ERROR;
+        common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct write_pacing), NULL, 0);
+        #if CIRCUITPY_USB_MSC
+        usb_msc_unlock();
+        #endif
+        return ANY_COMMAND;
+    }
+    // We need to receive another packet to have the full path.
+    if (command_len < header_size + command->data_size) {
+        return THIS_COMMAND;
+    }
+    uint32_t offset = command->offset;
+    f_lseek(&active_file, offset);
+    UINT actual;
+    f_write(&active_file, command->data, command->data_size, &actual);
+    if (actual < command->data_size) { // -1 for the null we'll write
+        // TODO: throw away any more packets of path.
+        response.status = STATUS_ERROR;
+        common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct write_pacing), NULL, 0);
+        #if CIRCUITPY_USB_MSC
+        usb_msc_unlock();
+        #endif
+        return ANY_COMMAND;
+    }
+    offset += command->data_size;
+    // Align the next chunk to a sector boundary.
+    size_t chunk_size = MIN(total_write_length - offset, 512);
+    response.offset = offset;
+    response.free_space = chunk_size;
+    common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct write_pacing), NULL, 0);
+    if (total_write_length == offset) {
+        f_truncate(&active_file);
+        f_close(&active_file);
+        #if CIRCUITPY_USB_MSC
+        usb_msc_unlock();
+        #endif
+        // Don't reload until everything is written out of the packet buffer.
+        common_hal_bleio_packet_buffer_flush(&_transfer_packet_buffer);
+        // Trigger an autoreload
+        autoreload_now();
+        return ANY_COMMAND;
+    }
+    return WRITE_DATA;
+}
+
+struct delete_command {
+    uint8_t command;
+    uint8_t reserved;
+    uint16_t path_length;
+    uint8_t path[];
+};
+
+struct delete_response {
+    uint8_t command;
+    uint8_t status;
+};
+
+uint8_t _process_delete(const uint8_t *raw_buf, size_t command_len) {
+    const struct delete_command *command = (struct delete_command *)raw_buf;
+    size_t header_size = 4;
+    struct delete_response response;
+    response.command = DELETE_STATUS;
+    response.status = STATUS_OK;
+    if (command->path_length > (COMMAND_SIZE - header_size - 1)) { // -1 for the null we'll write
+        // TODO: throw away any more packets of path.
+        response.status = STATUS_ERROR;
+        common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct delete_response), NULL, 0);
+        return ANY_COMMAND;
+    }
+    // We need to receive another packet to have the full path.
+    if (command_len < header_size + command->path_length) {
+        return THIS_COMMAND;
+    }
+    FATFS *fs = &((fs_user_mount_t *)MP_STATE_VM(vfs_mount_table)->obj)->fatfs;
+    char *path = (char *)((uint8_t *)command) + header_size;
+    path[command->path_length] = '\0';
+    FRESULT result = f_unlink(fs, path);
+    if (result != FR_OK) {
+        response.status = STATUS_ERROR;
+    }
+    common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct delete_response), NULL, 0);
+    return ANY_COMMAND;
+}
+
+struct mkdir_command {
+    uint8_t command;
+    uint8_t reserved;
+    uint16_t path_length;
+    uint8_t path[];
+};
+
+struct mkdir_response {
+    uint8_t command;
+    uint8_t status;
+};
+
+uint8_t _process_mkdir(const uint8_t *raw_buf, size_t command_len) {
+    const struct mkdir_command *command = (struct mkdir_command *)raw_buf;
+    size_t header_size = 4;
+    struct mkdir_response response;
+    response.command = MKDIR_STATUS;
+    response.status = STATUS_OK;
+    if (command->path_length > (COMMAND_SIZE - header_size - 1)) { // -1 for the null we'll write
+        // TODO: throw away any more packets of path.
+        response.status = STATUS_ERROR;
+        common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct mkdir_response), NULL, 0);
+        return ANY_COMMAND;
+    }
+    // We need to receive another packet to have the full path.
+    if (command_len < header_size + command->path_length) {
+        return THIS_COMMAND;
+    }
+    FATFS *fs = &((fs_user_mount_t *)MP_STATE_VM(vfs_mount_table)->obj)->fatfs;
+    char *path = (char *)((uint8_t *)command) + header_size;
+    // TODO: Check that the final character is a `/`
+    path[command->path_length - 1] = '\0';
+    FRESULT result = f_mkdir(fs, path);
+    if (result != FR_OK) {
+        response.status = STATUS_ERROR;
+    }
+    common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct mkdir_response), NULL, 0);
+    return ANY_COMMAND;
+}
+
+struct listdir_command {
+    uint8_t command;
+    uint8_t reserved;
+    uint16_t path_length;
+    uint8_t path[];
+};
+
+struct listdir_entry {
+    uint8_t command;
+    uint8_t status;
+    uint16_t path_length;
+    uint32_t entry_number;
+    uint32_t entry_count;
+    uint32_t flags;
+    uint32_t file_size;
+    uint8_t path[];
+};
+
+uint8_t _process_listdir(uint8_t *raw_buf, size_t command_len) {
+    const struct listdir_command *command = (struct listdir_command *)raw_buf;
+    struct listdir_entry *entry = (struct listdir_entry *)raw_buf;
+    size_t header_size = 4;
+    size_t response_size = 5 * sizeof(uint32_t);
+    // We reuse the command buffer so that we can produce long packets without
+    // making the stack large.
+    if (command->path_length > (COMMAND_SIZE - header_size - 1)) { // -1 for the null we'll write
+        // TODO: throw away any more packets of path.
+        entry->command = LISTDIR_ENTRY;
+        entry->status = STATUS_ERROR;
+        common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)entry, response_size, NULL, 0);
+        return ANY_COMMAND;
+    }
+    // We need to receive another packet to have the full path.
+    if (command_len < header_size + command->path_length) {
+        return THIS_COMMAND;
+    }
+
+    FATFS *fs = &((fs_user_mount_t *)MP_STATE_VM(vfs_mount_table)->obj)->fatfs;
+    char *path = (char *)command->path;
+    // -1 because fatfs doesn't want a trailing /
+    path[command->path_length - 1] = '\0';
+    // mp_printf(&mp_plat_print, "list %s\n", path);
+    FF_DIR dir;
+    FRESULT res = f_opendir(fs, &dir, path);
+
+    entry->command = LISTDIR_ENTRY;
+    entry->status = STATUS_OK;
+    entry->path_length = 0;
+    entry->entry_number = 0;
+    entry->entry_count = 0;
+    entry->flags = 0;
+
+    if (res != FR_OK) {
+        entry->status = STATUS_ERROR_NO_FILE;
+        common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)entry, response_size, NULL, 0);
+        return ANY_COMMAND;
+    }
+    FILINFO file_info;
+    res = f_readdir(&dir, &file_info);
+    char *fn = file_info.fname;
+    size_t total_entries = 0;
+    while (res == FR_OK && fn[0] != 0) {
+        res = f_readdir(&dir, &file_info);
+        total_entries += 1;
+    }
+    // Rewind the directory.
+    f_readdir(&dir, NULL);
+    entry->entry_count = total_entries;
+    for (size_t i = 0; i < total_entries; i++) {
+        res = f_readdir(&dir, &file_info);
+        entry->entry_number = i;
+        if ((file_info.fattrib & AM_DIR) != 0) {
+            entry->flags = 1; // Directory
+            entry->file_size = 0;
+        } else {
+            entry->flags = 0;
+            entry->file_size = file_info.fsize;
+        }
+
+        size_t name_length = strlen(file_info.fname);
+        entry->path_length = name_length;
+        common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)entry, response_size, NULL, 0);
+        size_t fn_offset = 0;
+        while (fn_offset < name_length) {
+            size_t fn_size = MIN(name_length - fn_offset, 4);
+            common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, ((uint8_t *)file_info.fname) + fn_offset, fn_size, NULL, 0);
+            fn_offset += fn_size;
+        }
+    }
+    f_closedir(&dir);
+    entry->path_length = 0;
+    entry->entry_number = entry->entry_count;
+    entry->flags = 0;
+    entry->file_size = 0;
+    common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)entry, response_size, NULL, 0);
+    return ANY_COMMAND;
+}
+
+// Background state that must live across background calls. After the _process
+// helpers to force them to not use them.
+uint8_t current_command[COMMAND_SIZE] __attribute__ ((aligned(4)));
+volatile size_t current_offset;
+uint8_t next_command;
+bool was_connected;
+void supervisor_bluetooth_background(void) {
     bool is_connected = common_hal_bleio_adapter_get_connected(&common_hal_bleio_adapter_obj);
-    if (!was_connected && is_connected) {
-        open_current_file();
-    } else if (was_connected && !is_connected) {
-        close_current_file();
-        new_filename = false;
+    if (was_connected && !is_connected) {
+        f_close(&active_file);
     }
     was_connected = is_connected;
-    run_ble_background = false;
     if (!is_connected) {
+        next_command = 0;
         supervisor_bluetooth_start_advertising();
         return;
     }
-    if (new_filename) {
-        close_current_file();
-        open_current_file();
 
-        new_filename = false;
-        // get length and set the characteristic for it
-    }
-    uint16_t current_length = ((uint16_t *)current_command)[0];
-    if (current_length > 0 && current_length == current_offset) {
-        uint16_t command = ((uint16_t *)current_command)[1];
+    mp_int_t size = 1;
+    while (size > 0) {
+        size = common_hal_bleio_packet_buffer_readinto(&_transfer_packet_buffer, current_command + current_offset, COMMAND_SIZE - current_offset);
 
-        if (command == 1) {
-            uint16_t max_len = 20; // supervisor_ble_contents_characteristic.max_length;
-            uint8_t buf[max_len];
-            mp_buffer_info_t bufinfo;
-            bufinfo.buf = buf;
-            f_lseek(&active_file, 0);
-            while (f_read(&active_file, buf, max_len, &bufinfo.len) == FR_OK) {
-                if (bufinfo.len == 0) {
-                    break;
-                }
-                common_hal_bleio_characteristic_set_value(&supervisor_ble_contents_characteristic, &bufinfo);
-            }
-        } else if (command == 2) { // patch
-            uint32_t offset = current_command[1];
-            uint32_t remove_length = current_command[2];
-            uint32_t insert_length = current_command[3];
-            uint32_t file_length = (int32_t)f_size(&active_file);
-            // uint32_t data_shift_length = fileLength - offset - remove_length;
-            int32_t data_shift = insert_length - remove_length;
-            uint32_t new_length = file_length + data_shift;
-
-            // TODO: Make these loops smarter to read and write on sector boundaries.
-            if (data_shift < 0) {
-                for (uint32_t shift_offset = offset + insert_length; shift_offset < new_length; shift_offset++) {
-                    uint8_t data;
-                    UINT actual;
-                    f_lseek(&active_file, shift_offset - data_shift);
-                    f_read(&active_file, &data, 1, &actual);
-                    f_lseek(&active_file, shift_offset);
-                    f_write(&active_file, &data, 1, &actual);
-                }
-                f_truncate(&active_file);
-            } else if (data_shift > 0) {
-                f_lseek(&active_file, file_length);
-                // Fill end with 0xff so we don't need to erase.
-                uint8_t data = 0xff;
-                for (size_t i = 0; i < (size_t)data_shift; i++) {
-                    UINT actual;
-                    f_write(&active_file, &data, 1, &actual);
-                }
-                for (uint32_t shift_offset = new_length - 1; shift_offset >= offset + insert_length; shift_offset--) {
-                    UINT actual;
-                    f_lseek(&active_file, shift_offset - data_shift);
-                    f_read(&active_file, &data, 1, &actual);
-                    f_lseek(&active_file, shift_offset);
-                    f_write(&active_file, &data, 1, &actual);
-                }
-            }
-
-            f_lseek(&active_file, offset);
-            uint8_t *data = (uint8_t *)(current_command + 4);
-            UINT written;
-            f_write(&active_file, data, insert_length, &written);
-            f_sync(&active_file);
-            // Notify the new file length.
-            update_file_length();
-
-            // Trigger an autoreload
-            autoreload_now();
+        if (size == 0) {
+            break;
+        }
+        // TODO: If size < 0 return an error.
+        current_offset += size;
+        // mp_printf(&mp_plat_print, "buffer[:%d]:", current_offset);
+        // for (size_t i = 0; i < current_offset; i++) {
+        //     mp_printf(&mp_plat_print, " (%x %c)", current_command[i], current_command[i]);
+        // }
+        // mp_printf(&mp_plat_print, "\n");
+        uint8_t current_state = current_command[0];
+        // mp_printf(&mp_plat_print, "current command 0x%02x\n", current_state);
+        // Check for protocol error.
+        if (next_command != ANY_COMMAND && next_command != THIS_COMMAND && ((current_state & 0xf) != 0) && current_state != next_command) {
+            uint8_t response[2];
+            response[0] = next_command;
+            response[1] = STATUS_ERROR_PROTOCOL;
+            common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, response, 2, NULL, 0);
+            break;
+        }
+        switch (current_state) {
+            case READ:
+                next_command = _process_read(current_command, current_offset);
+                break;
+            case READ_PACING:
+                next_command = _process_read_pacing(current_command, current_offset);
+                break;
+            case WRITE:
+                next_command = _process_write(current_command, current_offset);
+                break;
+            case WRITE_DATA:
+                next_command = _process_write_data(current_command, current_offset);
+                break;
+            case DELETE:
+                next_command = _process_delete(current_command, current_offset);
+                break;
+            case MKDIR:
+                next_command = _process_mkdir(current_command, current_offset);
+                break;
+            case LISTDIR:
+                next_command = _process_listdir(current_command, current_offset);
+                break;
+        }
+        // Preserve the offset if we are waiting for more from this command.
+        if (next_command != THIS_COMMAND) {
+            current_offset = 0;
         }
-        current_offset = 0;
     }
 }
 
diff --git a/supervisor/shared/bluetooth.h b/supervisor/shared/bluetooth.h
index 55f9c86fa5..3784463af3 100644
--- a/supervisor/shared/bluetooth.h
+++ b/supervisor/shared/bluetooth.h
@@ -27,7 +27,14 @@
 #ifndef MICROPY_INCLUDED_SUPERVISOR_SHARED_BLUETOOTH_H
 #define MICROPY_INCLUDED_SUPERVISOR_SHARED_BLUETOOTH_H
 
+#include <stdbool.h>
+
+#include "shared-bindings/_bleio/Characteristic.h"
+
 void supervisor_bluetooth_background(void);
+void supervisor_bluetooth_init(void);
 void supervisor_start_bluetooth(void);
 
+extern bleio_characteristic_obj_t supervisor_ble_transfer_characteristic;
+
 #endif // MICROPY_INCLUDED_SUPERVISOR_SHARED_BLUETOOTH_H
diff --git a/supervisor/shared/safe_mode.c b/supervisor/shared/safe_mode.c
index e2a77a3f29..2b6e2c266b 100644
--- a/supervisor/shared/safe_mode.c
+++ b/supervisor/shared/safe_mode.c
@@ -28,7 +28,7 @@
 
 #include "mphalport.h"
 
-#if defined(MICROPY_HW_LED_STATUS) || defined(CIRCUITPY_BOOT_BUTTON)
+#if defined(CIRCUITPY_BOOT_BUTTON)
 #include "shared-bindings/digitalio/DigitalInOut.h"
 #endif
 #include "shared-bindings/microcontroller/Processor.h"
@@ -79,8 +79,8 @@ safe_mode_t wait_for_safe_mode_reset(void) {
     bool boot_in_safe_mode = false;
     while (diff < 1000) {
         #ifdef CIRCUITPY_STATUS_LED
-        // Blink on for 100, off for 100, on for 100, off for 100 and on for 200
-        bool led_on = diff > 100 && diff / 100 != 2 && diff / 100 != 4;
+        // Blink on for 100, off for 100
+        bool led_on = (diff % 250) < 125;
         if (led_on) {
             new_status_color(SAFE_MODE);
         } else {
@@ -102,7 +102,8 @@ safe_mode_t wait_for_safe_mode_reset(void) {
     if (boot_in_safe_mode) {
         return USER_SAFE_MODE;
     }
-    port_set_saved_word(SAFE_MODE_DATA_GUARD);
+    // Restore the original state of the saved word if no reset occured during our wait period.
+    port_set_saved_word(reset_state);
     return NO_SAFE_MODE;
 }
 
diff --git a/supervisor/shared/tick.c b/supervisor/shared/tick.c
index 77cdf8aba2..6a9a896467 100644
--- a/supervisor/shared/tick.c
+++ b/supervisor/shared/tick.c
@@ -90,11 +90,6 @@ void supervisor_background_tasks(void *unused) {
     #endif
     filesystem_background();
 
-    #if CIRCUITPY_BLEIO
-    supervisor_bluetooth_background();
-    bleio_background();
-    #endif
-
     port_background_task();
 
     assert_heap_ok();
diff --git a/supervisor/shared/usb/usb_msc_flash.c b/supervisor/shared/usb/usb_msc_flash.c
index d2ecd7a1ec..fe88f8c831 100644
--- a/supervisor/shared/usb/usb_msc_flash.c
+++ b/supervisor/shared/usb/usb_msc_flash.c
@@ -34,6 +34,7 @@
 #include "lib/oofatfs/ff.h"
 #include "py/mpstate.h"
 
+#include "shared-module/storage/__init__.h"
 #include "supervisor/filesystem.h"
 #include "supervisor/shared/autoreload.h"
 
@@ -41,16 +42,29 @@
 
 static bool ejected[1] = {true};
 
-void usb_msc_mount(void) {
-    // Reset the ejection tracking every time we're plugged into USB. This allows for us to battery
-    // power the device, eject, unplug and plug it back in to get the drive.
+// Lock to track if something else is using the filesystem when USB is plugged in. If so, the drive
+// will be made available once the lock is released.
+static bool _usb_msc_lock = false;
+static bool _usb_connected_while_locked = false;
+
+STATIC void _usb_msc_uneject(void) {
     for (uint8_t i = 0; i < sizeof(ejected); i++) {
         ejected[i] = false;
     }
 }
 
-void usb_msc_umount(void) {
+void usb_msc_mount(void) {
+    // Reset the ejection tracking every time we're plugged into USB. This allows for us to battery
+    // power the device, eject, unplug and plug it back in to get the drive.
+    if (_usb_msc_lock) {
+        _usb_connected_while_locked = true;
+        return;
+    }
+    _usb_msc_uneject();
+    _usb_connected_while_locked = false;
+}
 
+void usb_msc_umount(void) {
 }
 
 bool usb_msc_ejected(void) {
@@ -61,6 +75,25 @@ bool usb_msc_ejected(void) {
     return all_ejected;
 }
 
+bool usb_msc_lock(void) {
+    if ((storage_usb_enabled() && !usb_msc_ejected()) || _usb_msc_lock) {
+        return false;
+    }
+    _usb_msc_lock = true;
+    return true;
+}
+
+void usb_msc_unlock(void) {
+    if (!_usb_msc_lock) {
+        // Mismatched unlock.
+        return;
+    }
+    if (_usb_connected_while_locked) {
+        _usb_msc_uneject();
+    }
+    _usb_msc_lock = false;
+}
+
 // The root FS is always at the end of the list.
 static fs_user_mount_t *get_vfs(int lun) {
     // TODO(tannewt): Return the mount which matches the lun where 0 is the end
diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk
index d36b975c21..d1790d008a 100644
--- a/supervisor/supervisor.mk
+++ b/supervisor/supervisor.mk
@@ -28,7 +28,13 @@ SPI_FLASH_FILESYSTEM ?= 0
 CFLAGS += -DSPI_FLASH_FILESYSTEM=$(SPI_FLASH_FILESYSTEM)
 
 ifeq ($(CIRCUITPY_BLEIO),1)
-	SRC_SUPERVISOR += supervisor/shared/bluetooth.c supervisor/bluetooth.c
+	SRC_SUPERVISOR += supervisor/shared/bluetooth.c
+  ifeq ($(CIRCUITPY_BLE_FILE_SERVICE),1)
+    CIRCUITPY_CREATOR_ID ?= $(USB_VID)
+    CIRCUITPY_CREATION_ID ?= $(USB_PID)
+    CFLAGS += -DCIRCUITPY_CREATOR_ID=$(CIRCUITPY_CREATOR_ID)
+    CFLAGS += -DCIRCUITPY_CREATION_ID=$(CIRCUITPY_CREATION_ID)
+  endif
 endif
 
 # Choose which flash filesystem impl to use.
diff --git a/supervisor/usb.h b/supervisor/usb.h
index e0feb58ea8..19180ef758 100644
--- a/supervisor/usb.h
+++ b/supervisor/usb.h
@@ -78,6 +78,11 @@ void usb_setup_with_vm(void);
 void usb_msc_mount(void);
 void usb_msc_umount(void);
 bool usb_msc_ejected(void);
+
+// Locking MSC prevents presenting the drive on plug-in when in use by something
+// else (likely BLE.)
+bool usb_msc_lock(void);
+void usb_msc_unlock(void);
 #endif
 
 #endif // MICROPY_INCLUDED_SUPERVISOR_USB_H

From 1c2b49cfbaf9890fed1b2a5acaddceb9c4d0b830 Mon Sep 17 00:00:00 2001
From: Alvaro Figueroa <alvaro@greencore.co.cr>
Date: Thu, 24 Jun 2021 20:46:20 +0000
Subject: [PATCH 304/349] Translated using Weblate (Spanish)

Currently translated at 100.0% (1005 of 1005 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/es/
---
 locale/es.po | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/locale/es.po b/locale/es.po
index 2485817e15..fb88937a43 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2021-06-13 04:32+0000\n"
+"PO-Revision-Date: 2021-06-24 23:11+0000\n"
 "Last-Translator: Alvaro Figueroa <alvaro@greencore.co.cr>\n"
 "Language-Team: \n"
 "Language: es\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.7-dev\n"
+"X-Generator: Weblate 4.7.1-dev\n"
 
 #: main.c
 msgid ""
@@ -96,7 +96,7 @@ msgstr "%q indices deben ser enteros, no %s"
 
 #: py/argcheck.c
 msgid "%q length must be %q"
-msgstr ""
+msgstr "el tamaño de %q debe ser %q"
 
 #: shared-bindings/vectorio/Polygon.c
 msgid "%q list must be a list"
@@ -104,11 +104,11 @@ msgstr "%q lista debe ser una lista"
 
 #: py/argcheck.c
 msgid "%q must <= %d"
-msgstr ""
+msgstr "%q debe ser <= %d"
 
 #: py/argcheck.c
 msgid "%q must be %d-%d"
-msgstr ""
+msgstr "%q debe ser %d-%d"
 
 #: shared-bindings/usb_hid/Device.c
 msgid "%q must be 0-255"
@@ -120,7 +120,7 @@ msgstr "%q debe estar entre 1-255"
 
 #: py/argcheck.c
 msgid "%q must be >= %d"
-msgstr ""
+msgstr "%q debe ser >= %d"
 
 #: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c
 msgid "%q must be >= 0"
@@ -140,7 +140,7 @@ msgstr "%q debe ser None o entre 1 y len(report_descriptor)-1"
 
 #: py/argcheck.c
 msgid "%q must be a string"
-msgstr ""
+msgstr "%q debe ser una cadena"
 
 #: shared-module/vectorio/Polygon.c
 msgid "%q must be a tuple of length 2"
@@ -148,16 +148,16 @@ msgstr "%q debe ser una tupla de longitud 2"
 
 #: ports/esp32s2/common-hal/imagecapture/ParallelImageCapture.c
 msgid "%q must be between %d and %d"
-msgstr ""
+msgstr "%q debe estar entre %d y %d"
 
 #: py/argcheck.c
 msgid "%q must of type %q"
-msgstr ""
+msgstr "%q debe ser de tipo %q"
 
 #: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
 #: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q must store bytes"
-msgstr ""
+msgstr "%q debe almacenar bytes"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
@@ -1349,7 +1349,7 @@ msgstr "data_count inválido %d"
 #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
 #, c-format
 msgid "Invalid data_pins[%d]"
-msgstr ""
+msgstr "Inválidos los data_pins[%d]"
 
 #: shared-bindings/digitalio/DigitalInOut.c
 msgid "Invalid direction."
@@ -2660,7 +2660,7 @@ msgstr "operacion binaria %q no implementada"
 
 #: extmod/modurandom.c
 msgid "bits must be 32 or less"
-msgstr ""
+msgstr "los bits deben ser 32 o menos"
 
 #: shared-bindings/busio/UART.c
 msgid "bits must be in range 5 to 9"
@@ -3282,7 +3282,7 @@ msgstr "graphic debe ser 2048 bytes de largo"
 
 #: extmod/moduhashlib.c
 msgid "hash is final"
-msgstr ""
+msgstr "el hash es final"
 
 #: extmod/moduheapq.c
 msgid "heap must be a list"

From 682a789b0c767d3c285dd6403eb49ac8a4c393bd Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura <wellingtonuemura@gmail.com>
Date: Thu, 24 Jun 2021 18:11:25 +0000
Subject: [PATCH 305/349] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1005 of 1005 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/pt_BR/
---
 locale/pt_BR.po | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 77f048dfaf..12aad8f4b7 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2021-06-21 22:27+0000\n"
+"PO-Revision-Date: 2021-06-24 23:11+0000\n"
 "Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.7\n"
+"X-Generator: Weblate 4.7.1-dev\n"
 
 #: main.c
 msgid ""
@@ -94,7 +94,7 @@ msgstr "Os índices %q devem ser inteiros, e não %s"
 
 #: py/argcheck.c
 msgid "%q length must be %q"
-msgstr ""
+msgstr "o comprimento %q deve ser %q"
 
 #: shared-bindings/vectorio/Polygon.c
 msgid "%q list must be a list"
@@ -102,11 +102,11 @@ msgstr "A lista %q deve ser uma lista"
 
 #: py/argcheck.c
 msgid "%q must <= %d"
-msgstr ""
+msgstr "o %q deve ser <= %d"
 
 #: py/argcheck.c
 msgid "%q must be %d-%d"
-msgstr ""
+msgstr "o %q deve ser %d-%d"
 
 #: shared-bindings/usb_hid/Device.c
 msgid "%q must be 0-255"
@@ -118,7 +118,7 @@ msgstr "%q deve ser 1-255"
 
 #: py/argcheck.c
 msgid "%q must be >= %d"
-msgstr ""
+msgstr "o %q deve ser >= %d"
 
 #: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c
 msgid "%q must be >= 0"
@@ -138,7 +138,7 @@ msgstr "%q deve ser None ou entre 1 e len(report_descriptor)-1"
 
 #: py/argcheck.c
 msgid "%q must be a string"
-msgstr ""
+msgstr "%q deve ser uma string"
 
 #: shared-module/vectorio/Polygon.c
 msgid "%q must be a tuple of length 2"
@@ -150,12 +150,12 @@ msgstr "%q deve estar entre %d e %d"
 
 #: py/argcheck.c
 msgid "%q must of type %q"
-msgstr ""
+msgstr "o %q deve ser do tipo %q"
 
 #: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
 #: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q must store bytes"
-msgstr ""
+msgstr "o %q deve armazenar bytes"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
@@ -2665,7 +2665,7 @@ msgstr "a operação binário %q não foi implementada"
 
 #: extmod/modurandom.c
 msgid "bits must be 32 or less"
-msgstr ""
+msgstr "bits deve ser 32 ou menos"
 
 #: shared-bindings/busio/UART.c
 msgid "bits must be in range 5 to 9"
@@ -3289,7 +3289,7 @@ msgstr "o gráfico deve ter 2048 bytes de comprimento"
 
 #: extmod/moduhashlib.c
 msgid "hash is final"
-msgstr ""
+msgstr "o hash é final"
 
 #: extmod/moduheapq.c
 msgid "heap must be a list"

From 768a683ea96ce39e4872ea8f0560cf0f272ae488 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Fri, 25 Jun 2021 01:11:40 +0200
Subject: [PATCH 306/349] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/
---
 locale/ID.po             | 16 +++++++++++-----
 locale/cs.po             | 13 ++++++++-----
 locale/de_DE.po          | 16 +++++++++++-----
 locale/el.po             | 13 ++++++++-----
 locale/en_GB.po          | 16 +++++++++++-----
 locale/es.po             | 16 +++++++++++-----
 locale/fil.po            | 13 ++++++++-----
 locale/fr.po             | 16 +++++++++++-----
 locale/hi.po             | 13 ++++++++-----
 locale/it_IT.po          | 16 +++++++++++-----
 locale/ja.po             | 16 +++++++++++-----
 locale/ko.po             | 13 ++++++++-----
 locale/nl.po             | 16 +++++++++++-----
 locale/pl.po             | 16 +++++++++++-----
 locale/pt_BR.po          | 16 +++++++++++-----
 locale/sv.po             | 16 +++++++++++-----
 locale/zh_Latn_pinyin.po | 16 +++++++++++-----
 17 files changed, 172 insertions(+), 85 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index 1d274a1570..0a209f3c08 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -604,10 +604,6 @@ msgstr ""
 msgid "Buffer must be at least length 1"
 msgstr "Penyangga harus memiliki panjang setidaknya 1"
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
-msgid "Buffer too large and unable to allocate"
-msgstr "Buffer terlalu besar dan tidak dapat dialokasikan"
-
 #: shared-bindings/_bleio/PacketBuffer.c
 #, c-format
 msgid "Buffer too short by %d bytes"
@@ -891,6 +887,10 @@ msgstr ""
 msgid "Data chunk must follow fmt chunk"
 msgstr "Potongan data harus mengikuti fmt chunk"
 
+#: ports/nrf/common-hal/_bleio/Adapter.c
+msgid "Data not supported with directed advertising"
+msgstr ""
+
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data too large for advertisement packet"
 msgstr "Data terlalu besar untuk paket advertisment"
@@ -1687,7 +1687,6 @@ msgstr ""
 msgid "Not a valid IP string"
 msgstr ""
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
 #: ports/nrf/common-hal/_bleio/__init__.c
 #: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "Not connected"
@@ -1733,6 +1732,10 @@ msgstr ""
 "Hanya format Windows, mendukung BMP tidak dikompresi: ukuran header yang "
 "diberikan adalah %d"
 
+#: shared-bindings/_bleio/Adapter.c
+msgid "Only connectable advertisements can be directed"
+msgstr ""
+
 #: ports/stm/common-hal/alarm/pin/PinAlarm.c
 msgid "Only edge detection is available on this hardware"
 msgstr ""
@@ -4452,6 +4455,9 @@ msgstr "zi harus berjenis float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "Buffer too large and unable to allocate"
+#~ msgstr "Buffer terlalu besar dan tidak dapat dialokasikan"
+
 #~ msgid ""
 #~ "CircuitPython is in safe mode because you pressed the reset button during "
 #~ "boot. Press again to exit safe mode.\n"
diff --git a/locale/cs.po b/locale/cs.po
index d42bea036a..a1b8031145 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -598,10 +598,6 @@ msgstr ""
 msgid "Buffer must be at least length 1"
 msgstr ""
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
-msgid "Buffer too large and unable to allocate"
-msgstr ""
-
 #: shared-bindings/_bleio/PacketBuffer.c
 #, c-format
 msgid "Buffer too short by %d bytes"
@@ -876,6 +872,10 @@ msgstr ""
 msgid "Data chunk must follow fmt chunk"
 msgstr ""
 
+#: ports/nrf/common-hal/_bleio/Adapter.c
+msgid "Data not supported with directed advertising"
+msgstr ""
+
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data too large for advertisement packet"
 msgstr ""
@@ -1670,7 +1670,6 @@ msgstr ""
 msgid "Not a valid IP string"
 msgstr ""
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
 #: ports/nrf/common-hal/_bleio/__init__.c
 #: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "Not connected"
@@ -1713,6 +1712,10 @@ msgid ""
 "Only Windows format, uncompressed BMP supported: given header size is %d"
 msgstr ""
 
+#: shared-bindings/_bleio/Adapter.c
+msgid "Only connectable advertisements can be directed"
+msgstr ""
+
 #: ports/stm/common-hal/alarm/pin/PinAlarm.c
 msgid "Only edge detection is available on this hardware"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 2650c61171..31097a7be1 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -606,10 +606,6 @@ msgstr "Der Puffer muss ein vielfaches von 512 bytes sein"
 msgid "Buffer must be at least length 1"
 msgstr "Der Puffer muss eine Mindestenslänge von 1 haben"
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
-msgid "Buffer too large and unable to allocate"
-msgstr "Puffer zu groß und kann nicht reserviert werden"
-
 #: shared-bindings/_bleio/PacketBuffer.c
 #, c-format
 msgid "Buffer too short by %d bytes"
@@ -888,6 +884,10 @@ msgstr "Data 0 Pin muss Byte aligned sein."
 msgid "Data chunk must follow fmt chunk"
 msgstr "Dem fmt Block muss ein Datenblock folgen"
 
+#: ports/nrf/common-hal/_bleio/Adapter.c
+msgid "Data not supported with directed advertising"
+msgstr ""
+
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data too large for advertisement packet"
 msgstr "Zu vielen Daten für das advertisement packet"
@@ -1688,7 +1688,6 @@ msgstr ""
 msgid "Not a valid IP string"
 msgstr ""
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
 #: ports/nrf/common-hal/_bleio/__init__.c
 #: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "Not connected"
@@ -1735,6 +1734,10 @@ msgstr ""
 "Nur Windows-Format, unkomprimiertes BMP unterstützt: die gegebene Header-"
 "Größe ist %d"
 
+#: shared-bindings/_bleio/Adapter.c
+msgid "Only connectable advertisements can be directed"
+msgstr ""
+
 #: ports/stm/common-hal/alarm/pin/PinAlarm.c
 msgid "Only edge detection is available on this hardware"
 msgstr ""
@@ -4488,6 +4491,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "Buffer too large and unable to allocate"
+#~ msgstr "Puffer zu groß und kann nicht reserviert werden"
+
 #~ msgid "wrong operand type"
 #~ msgstr "falscher Operandentyp"
 
diff --git a/locale/el.po b/locale/el.po
index c0b12923a0..8f51d36529 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -595,10 +595,6 @@ msgstr ""
 msgid "Buffer must be at least length 1"
 msgstr ""
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
-msgid "Buffer too large and unable to allocate"
-msgstr ""
-
 #: shared-bindings/_bleio/PacketBuffer.c
 #, c-format
 msgid "Buffer too short by %d bytes"
@@ -873,6 +869,10 @@ msgstr ""
 msgid "Data chunk must follow fmt chunk"
 msgstr ""
 
+#: ports/nrf/common-hal/_bleio/Adapter.c
+msgid "Data not supported with directed advertising"
+msgstr ""
+
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data too large for advertisement packet"
 msgstr ""
@@ -1667,7 +1667,6 @@ msgstr ""
 msgid "Not a valid IP string"
 msgstr ""
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
 #: ports/nrf/common-hal/_bleio/__init__.c
 #: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "Not connected"
@@ -1710,6 +1709,10 @@ msgid ""
 "Only Windows format, uncompressed BMP supported: given header size is %d"
 msgstr ""
 
+#: shared-bindings/_bleio/Adapter.c
+msgid "Only connectable advertisements can be directed"
+msgstr ""
+
 #: ports/stm/common-hal/alarm/pin/PinAlarm.c
 msgid "Only edge detection is available on this hardware"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 39c6281a1f..6f3ad2f15a 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -606,10 +606,6 @@ msgstr "Buffer must be a multiple of 512 bytes"
 msgid "Buffer must be at least length 1"
 msgstr "Buffer must be at least length 1"
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
-msgid "Buffer too large and unable to allocate"
-msgstr "Buffer too large and unable to allocate"
-
 #: shared-bindings/_bleio/PacketBuffer.c
 #, c-format
 msgid "Buffer too short by %d bytes"
@@ -886,6 +882,10 @@ msgstr "Data 0 pin must be byte aligned."
 msgid "Data chunk must follow fmt chunk"
 msgstr "Data chunk must follow fmt chunk"
 
+#: ports/nrf/common-hal/_bleio/Adapter.c
+msgid "Data not supported with directed advertising"
+msgstr ""
+
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data too large for advertisement packet"
 msgstr "Data too large for advertisement packet"
@@ -1682,7 +1682,6 @@ msgstr ""
 msgid "Not a valid IP string"
 msgstr "Not a valid IP string"
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
 #: ports/nrf/common-hal/_bleio/__init__.c
 #: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "Not connected"
@@ -1727,6 +1726,10 @@ msgid ""
 msgstr ""
 "Only Windows format, uncompressed BMP supported: given header size is %d"
 
+#: shared-bindings/_bleio/Adapter.c
+msgid "Only connectable advertisements can be directed"
+msgstr ""
+
 #: ports/stm/common-hal/alarm/pin/PinAlarm.c
 msgid "Only edge detection is available on this hardware"
 msgstr ""
@@ -4450,6 +4453,9 @@ msgstr "zi must be of float type"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi must be of shape (n_section, 2)"
 
+#~ msgid "Buffer too large and unable to allocate"
+#~ msgstr "Buffer too large and unable to allocate"
+
 #~ msgid "interp is defined for 1D arrays of equal length"
 #~ msgstr "interp is defined for 1D arrays of equal length"
 
diff --git a/locale/es.po b/locale/es.po
index fb88937a43..3e8697e393 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -611,10 +611,6 @@ msgstr "Búfer deber ser un múltiplo de 512 bytes"
 msgid "Buffer must be at least length 1"
 msgstr "Buffer debe ser de longitud 1 como minimo"
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
-msgid "Buffer too large and unable to allocate"
-msgstr "Buffer demasiado grande e incapaz de asignar"
-
 #: shared-bindings/_bleio/PacketBuffer.c
 #, c-format
 msgid "Buffer too short by %d bytes"
@@ -895,6 +891,10 @@ msgstr "El pin de datos 0 debe ser alineado a byte."
 msgid "Data chunk must follow fmt chunk"
 msgstr "Trozo de datos debe seguir fmt chunk"
 
+#: ports/nrf/common-hal/_bleio/Adapter.c
+msgid "Data not supported with directed advertising"
+msgstr ""
+
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data too large for advertisement packet"
 msgstr "Data es muy grande para el paquete de anuncio"
@@ -1704,7 +1704,6 @@ msgstr "El firmware del sistema Nordic no tiene memoria"
 msgid "Not a valid IP string"
 msgstr "No es una cadena de IP válida"
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
 #: ports/nrf/common-hal/_bleio/__init__.c
 #: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "Not connected"
@@ -1751,6 +1750,10 @@ msgstr ""
 "Solo formato de Windows, sin comprimir BMP soportado: tamaño de encabezado "
 "dado es %d"
 
+#: shared-bindings/_bleio/Adapter.c
+msgid "Only connectable advertisements can be directed"
+msgstr ""
+
 #: ports/stm/common-hal/alarm/pin/PinAlarm.c
 msgid "Only edge detection is available on this hardware"
 msgstr "Este hardware solo tiene capacidad para detección de borde"
@@ -4505,6 +4508,9 @@ msgstr "zi debe ser de tipo flotante"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi debe ser una forma (n_section,2)"
 
+#~ msgid "Buffer too large and unable to allocate"
+#~ msgstr "Buffer demasiado grande e incapaz de asignar"
+
 #~ msgid "interp is defined for 1D arrays of equal length"
 #~ msgstr "interp está definido para arreglos de 1D del mismo tamaño"
 
diff --git a/locale/fil.po b/locale/fil.po
index 324686883d..700b8ec96c 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -600,10 +600,6 @@ msgstr ""
 msgid "Buffer must be at least length 1"
 msgstr "Buffer dapat ay hindi baba sa 1 na haba"
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
-msgid "Buffer too large and unable to allocate"
-msgstr ""
-
 #: shared-bindings/_bleio/PacketBuffer.c
 #, c-format
 msgid "Buffer too short by %d bytes"
@@ -882,6 +878,10 @@ msgstr ""
 msgid "Data chunk must follow fmt chunk"
 msgstr "Dapat sunurin ng Data chunk ang fmt chunk"
 
+#: ports/nrf/common-hal/_bleio/Adapter.c
+msgid "Data not supported with directed advertising"
+msgstr ""
+
 #: ports/nrf/common-hal/_bleio/Adapter.c
 #, fuzzy
 msgid "Data too large for advertisement packet"
@@ -1682,7 +1682,6 @@ msgstr ""
 msgid "Not a valid IP string"
 msgstr ""
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
 #: ports/nrf/common-hal/_bleio/__init__.c
 #: shared-bindings/_bleio/CharacteristicBuffer.c
 #, fuzzy
@@ -1728,6 +1727,10 @@ msgid ""
 "Only Windows format, uncompressed BMP supported: given header size is %d"
 msgstr ""
 
+#: shared-bindings/_bleio/Adapter.c
+msgid "Only connectable advertisements can be directed"
+msgstr ""
+
 #: ports/stm/common-hal/alarm/pin/PinAlarm.c
 msgid "Only edge detection is available on this hardware"
 msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index 2c1d3225a7..761aebe237 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -612,10 +612,6 @@ msgstr "La mémoire tampon doit être un multiple de 512"
 msgid "Buffer must be at least length 1"
 msgstr "Le tampon doit être de longueur au moins 1"
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
-msgid "Buffer too large and unable to allocate"
-msgstr "Tampon trop volumineux et impossible à allouer"
-
 #: shared-bindings/_bleio/PacketBuffer.c
 #, c-format
 msgid "Buffer too short by %d bytes"
@@ -901,6 +897,10 @@ msgstr "La broche Data 0 doit être aligné sur l'octet."
 msgid "Data chunk must follow fmt chunk"
 msgstr "Un bloc de données doit suivre un bloc fmt"
 
+#: ports/nrf/common-hal/_bleio/Adapter.c
+msgid "Data not supported with directed advertising"
+msgstr ""
+
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data too large for advertisement packet"
 msgstr "Données trop volumineuses pour un paquet d'avertissement"
@@ -1712,7 +1712,6 @@ msgstr "Logiciel systême Nordic hors de mémoire"
 msgid "Not a valid IP string"
 msgstr "Chaîne IP non valide"
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
 #: ports/nrf/common-hal/_bleio/__init__.c
 #: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "Not connected"
@@ -1759,6 +1758,10 @@ msgstr ""
 "Seulement le format BMP Windows, non compressé est supporté : la taille de "
 "l'entête fournie est %d"
 
+#: shared-bindings/_bleio/Adapter.c
+msgid "Only connectable advertisements can be directed"
+msgstr ""
+
 #: ports/stm/common-hal/alarm/pin/PinAlarm.c
 msgid "Only edge detection is available on this hardware"
 msgstr ""
@@ -4516,6 +4519,9 @@ msgstr "zi doit être de type float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi doit être de forme (n_section, 2)"
 
+#~ msgid "Buffer too large and unable to allocate"
+#~ msgstr "Tampon trop volumineux et impossible à allouer"
+
 #~ msgid "interp is defined for 1D arrays of equal length"
 #~ msgstr "interp est défini pour les matrices 1D de longueur égale"
 
diff --git a/locale/hi.po b/locale/hi.po
index 0f29629d4f..cbc07d270f 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -595,10 +595,6 @@ msgstr ""
 msgid "Buffer must be at least length 1"
 msgstr ""
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
-msgid "Buffer too large and unable to allocate"
-msgstr ""
-
 #: shared-bindings/_bleio/PacketBuffer.c
 #, c-format
 msgid "Buffer too short by %d bytes"
@@ -873,6 +869,10 @@ msgstr ""
 msgid "Data chunk must follow fmt chunk"
 msgstr ""
 
+#: ports/nrf/common-hal/_bleio/Adapter.c
+msgid "Data not supported with directed advertising"
+msgstr ""
+
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data too large for advertisement packet"
 msgstr ""
@@ -1667,7 +1667,6 @@ msgstr ""
 msgid "Not a valid IP string"
 msgstr ""
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
 #: ports/nrf/common-hal/_bleio/__init__.c
 #: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "Not connected"
@@ -1710,6 +1709,10 @@ msgid ""
 "Only Windows format, uncompressed BMP supported: given header size is %d"
 msgstr ""
 
+#: shared-bindings/_bleio/Adapter.c
+msgid "Only connectable advertisements can be directed"
+msgstr ""
+
 #: ports/stm/common-hal/alarm/pin/PinAlarm.c
 msgid "Only edge detection is available on this hardware"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 80d06b9dfe..925124c3b0 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -610,10 +610,6 @@ msgstr "Il buffer deve essere un multiplo di 512 bytes"
 msgid "Buffer must be at least length 1"
 msgstr "Il buffer deve essere lungo almeno 1"
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
-msgid "Buffer too large and unable to allocate"
-msgstr "Buffer troppo grande ed impossibile allocare"
-
 #: shared-bindings/_bleio/PacketBuffer.c
 #, c-format
 msgid "Buffer too short by %d bytes"
@@ -892,6 +888,10 @@ msgstr ""
 msgid "Data chunk must follow fmt chunk"
 msgstr ""
 
+#: ports/nrf/common-hal/_bleio/Adapter.c
+msgid "Data not supported with directed advertising"
+msgstr ""
+
 #: ports/nrf/common-hal/_bleio/Adapter.c
 #, fuzzy
 msgid "Data too large for advertisement packet"
@@ -1695,7 +1695,6 @@ msgstr ""
 msgid "Not a valid IP string"
 msgstr ""
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
 #: ports/nrf/common-hal/_bleio/__init__.c
 #: shared-bindings/_bleio/CharacteristicBuffer.c
 #, fuzzy
@@ -1742,6 +1741,10 @@ msgid ""
 "Only Windows format, uncompressed BMP supported: given header size is %d"
 msgstr ""
 
+#: shared-bindings/_bleio/Adapter.c
+msgid "Only connectable advertisements can be directed"
+msgstr ""
+
 #: ports/stm/common-hal/alarm/pin/PinAlarm.c
 msgid "Only edge detection is available on this hardware"
 msgstr ""
@@ -4481,6 +4484,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "Buffer too large and unable to allocate"
+#~ msgstr "Buffer troppo grande ed impossibile allocare"
+
 #~ msgid "USB Busy"
 #~ msgstr "USB occupata"
 
diff --git a/locale/ja.po b/locale/ja.po
index 11c6f9838a..ad58f1c5a3 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -602,10 +602,6 @@ msgstr "バッファは512の倍数でなければなりません"
 msgid "Buffer must be at least length 1"
 msgstr "バッファ長は少なくとも1以上でなければなりません"
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
-msgid "Buffer too large and unable to allocate"
-msgstr "バッファが大きすぎて確保できません"
-
 #: shared-bindings/_bleio/PacketBuffer.c
 #, c-format
 msgid "Buffer too short by %d bytes"
@@ -882,6 +878,10 @@ msgstr ""
 msgid "Data chunk must follow fmt chunk"
 msgstr "fmtチャンクの後にdataチャンクが続かなければなりません"
 
+#: ports/nrf/common-hal/_bleio/Adapter.c
+msgid "Data not supported with directed advertising"
+msgstr ""
+
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data too large for advertisement packet"
 msgstr "データが、アドバタイズメントパケットには大きすぎます"
@@ -1678,7 +1678,6 @@ msgstr ""
 msgid "Not a valid IP string"
 msgstr "不正なIP文字列です"
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
 #: ports/nrf/common-hal/_bleio/__init__.c
 #: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "Not connected"
@@ -1723,6 +1722,10 @@ msgid ""
 "Only Windows format, uncompressed BMP supported: given header size is %d"
 msgstr ""
 
+#: shared-bindings/_bleio/Adapter.c
+msgid "Only connectable advertisements can be directed"
+msgstr ""
+
 #: ports/stm/common-hal/alarm/pin/PinAlarm.c
 msgid "Only edge detection is available on this hardware"
 msgstr ""
@@ -4432,6 +4435,9 @@ msgstr "ziはfloat値でなければなりません"
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "Buffer too large and unable to allocate"
+#~ msgstr "バッファが大きすぎて確保できません"
+
 #~ msgid ""
 #~ "CircuitPython is in safe mode because you pressed the reset button during "
 #~ "boot. Press again to exit safe mode.\n"
diff --git a/locale/ko.po b/locale/ko.po
index f12240602a..2b7c9b1a7a 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -598,10 +598,6 @@ msgstr ""
 msgid "Buffer must be at least length 1"
 msgstr "잘못된 크기의 버퍼. >1 여야합니다"
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
-msgid "Buffer too large and unable to allocate"
-msgstr ""
-
 #: shared-bindings/_bleio/PacketBuffer.c
 #, c-format
 msgid "Buffer too short by %d bytes"
@@ -876,6 +872,10 @@ msgstr ""
 msgid "Data chunk must follow fmt chunk"
 msgstr ""
 
+#: ports/nrf/common-hal/_bleio/Adapter.c
+msgid "Data not supported with directed advertising"
+msgstr ""
+
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data too large for advertisement packet"
 msgstr "광고 (브로드 캐스트) 패킷에 대한 데이터가 너무 큽니다"
@@ -1670,7 +1670,6 @@ msgstr ""
 msgid "Not a valid IP string"
 msgstr ""
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
 #: ports/nrf/common-hal/_bleio/__init__.c
 #: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "Not connected"
@@ -1713,6 +1712,10 @@ msgid ""
 "Only Windows format, uncompressed BMP supported: given header size is %d"
 msgstr ""
 
+#: shared-bindings/_bleio/Adapter.c
+msgid "Only connectable advertisements can be directed"
+msgstr ""
+
 #: ports/stm/common-hal/alarm/pin/PinAlarm.c
 msgid "Only edge detection is available on this hardware"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 2d755f0917..e766c090c5 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -600,10 +600,6 @@ msgstr "Buffer moet een veelvoud van 512 bytes zijn"
 msgid "Buffer must be at least length 1"
 msgstr "Buffer moet op zijn minst lengte 1 zijn"
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
-msgid "Buffer too large and unable to allocate"
-msgstr "Buffer is te groot en niet in staat te alloceren"
-
 #: shared-bindings/_bleio/PacketBuffer.c
 #, c-format
 msgid "Buffer too short by %d bytes"
@@ -882,6 +878,10 @@ msgstr ""
 msgid "Data chunk must follow fmt chunk"
 msgstr "Data chunk moet gevolgd worden door fmt chunk"
 
+#: ports/nrf/common-hal/_bleio/Adapter.c
+msgid "Data not supported with directed advertising"
+msgstr ""
+
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data too large for advertisement packet"
 msgstr "Data te groot voor advertisement pakket"
@@ -1679,7 +1679,6 @@ msgstr ""
 msgid "Not a valid IP string"
 msgstr "Geen geldige IP string"
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
 #: ports/nrf/common-hal/_bleio/__init__.c
 #: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "Not connected"
@@ -1726,6 +1725,10 @@ msgstr ""
 "Alleen Windows formaat en ongecomprimeerd BMP ondersteund: gegeven header "
 "grootte is %d"
 
+#: shared-bindings/_bleio/Adapter.c
+msgid "Only connectable advertisements can be directed"
+msgstr ""
+
 #: ports/stm/common-hal/alarm/pin/PinAlarm.c
 msgid "Only edge detection is available on this hardware"
 msgstr ""
@@ -4461,6 +4464,9 @@ msgstr "zi moet van type float zijn"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi moet vorm (n_section, 2) hebben"
 
+#~ msgid "Buffer too large and unable to allocate"
+#~ msgstr "Buffer is te groot en niet in staat te alloceren"
+
 #~ msgid "interp is defined for 1D arrays of equal length"
 #~ msgstr ""
 #~ "interp is gedefinieerd voor eendimensionale arrays van gelijke lengte"
diff --git a/locale/pl.po b/locale/pl.po
index fd3fdfc889..5f1aea6bf4 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -602,10 +602,6 @@ msgstr "Bufor musi być wielokrotnością 512 bajtów"
 msgid "Buffer must be at least length 1"
 msgstr "Bufor musi mieć długość 1 lub więcej"
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
-msgid "Buffer too large and unable to allocate"
-msgstr "Bufor jest zbyt duży i nie można go przydzielić"
-
 #: shared-bindings/_bleio/PacketBuffer.c
 #, c-format
 msgid "Buffer too short by %d bytes"
@@ -882,6 +878,10 @@ msgstr ""
 msgid "Data chunk must follow fmt chunk"
 msgstr "Fragment danych musi następować po fragmencie fmt"
 
+#: ports/nrf/common-hal/_bleio/Adapter.c
+msgid "Data not supported with directed advertising"
+msgstr ""
+
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data too large for advertisement packet"
 msgstr "Zbyt dużo danych pakietu rozgłoszeniowego"
@@ -1678,7 +1678,6 @@ msgstr ""
 msgid "Not a valid IP string"
 msgstr ""
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
 #: ports/nrf/common-hal/_bleio/__init__.c
 #: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "Not connected"
@@ -1721,6 +1720,10 @@ msgid ""
 "Only Windows format, uncompressed BMP supported: given header size is %d"
 msgstr "Wspierane są tylko nieskompresowane pliki BMP: wielkość nagłówka %d"
 
+#: shared-bindings/_bleio/Adapter.c
+msgid "Only connectable advertisements can be directed"
+msgstr ""
+
 #: ports/stm/common-hal/alarm/pin/PinAlarm.c
 msgid "Only edge detection is available on this hardware"
 msgstr ""
@@ -4429,6 +4432,9 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#~ msgid "Buffer too large and unable to allocate"
+#~ msgstr "Bufor jest zbyt duży i nie można go przydzielić"
+
 #~ msgid "wrong operand type"
 #~ msgstr "zły typ operandu"
 
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 12aad8f4b7..df762a702a 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -613,10 +613,6 @@ msgstr "O buffer deve ser um múltiplo de 512 bytes"
 msgid "Buffer must be at least length 1"
 msgstr "O comprimento do buffer deve ter pelo menos 1"
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
-msgid "Buffer too large and unable to allocate"
-msgstr "O buffer é muito grande e incapaz de alocar"
-
 #: shared-bindings/_bleio/PacketBuffer.c
 #, c-format
 msgid "Buffer too short by %d bytes"
@@ -898,6 +894,10 @@ msgstr "O pino de dados 0 deve ser alinhado por bytes."
 msgid "Data chunk must follow fmt chunk"
 msgstr "Pedaço de dados deve seguir o pedaço de cortes"
 
+#: ports/nrf/common-hal/_bleio/Adapter.c
+msgid "Data not supported with directed advertising"
+msgstr ""
+
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data too large for advertisement packet"
 msgstr "Os dados são grandes demais para o pacote de publicidade"
@@ -1703,7 +1703,6 @@ msgstr "O firmware do sistema nórdico está sem memória"
 msgid "Not a valid IP string"
 msgstr "Não é uma sequência válida de IP"
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
 #: ports/nrf/common-hal/_bleio/__init__.c
 #: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "Not connected"
@@ -1749,6 +1748,10 @@ msgstr ""
 "O BMP descompactado é compatível apenas no formato Windows: o tamanho do "
 "cabeçalho é %d"
 
+#: shared-bindings/_bleio/Adapter.c
+msgid "Only connectable advertisements can be directed"
+msgstr ""
+
 #: ports/stm/common-hal/alarm/pin/PinAlarm.c
 msgid "Only edge detection is available on this hardware"
 msgstr "Apenas a detecção de borda está disponível neste hardware"
@@ -4515,6 +4518,9 @@ msgstr "zi deve ser de um tipo float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi deve estar na forma (n_section, 2)"
 
+#~ msgid "Buffer too large and unable to allocate"
+#~ msgstr "O buffer é muito grande e incapaz de alocar"
+
 #~ msgid "interp is defined for 1D arrays of equal length"
 #~ msgstr "o interp é definido para matrizes 1D de igual comprimento"
 
diff --git a/locale/sv.po b/locale/sv.po
index 9ef10d2d6d..176c7f02be 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -605,10 +605,6 @@ msgstr "Bufferten måste vara en multipel av 512 byte"
 msgid "Buffer must be at least length 1"
 msgstr "Bufferten måste ha minst längd 1"
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
-msgid "Buffer too large and unable to allocate"
-msgstr "Bufferten är för stor och kan inte allokeras"
-
 #: shared-bindings/_bleio/PacketBuffer.c
 #, c-format
 msgid "Buffer too short by %d bytes"
@@ -888,6 +884,10 @@ msgstr "Datapinne 0 måste vara byte-justerad."
 msgid "Data chunk must follow fmt chunk"
 msgstr "Datasegmentet måste följa fmt-segmentet"
 
+#: ports/nrf/common-hal/_bleio/Adapter.c
+msgid "Data not supported with directed advertising"
+msgstr ""
+
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data too large for advertisement packet"
 msgstr "Data för stor för annonseringspaket"
@@ -1687,7 +1687,6 @@ msgstr "Nordic systemfirmware fick slut på minne"
 msgid "Not a valid IP string"
 msgstr "Inte en giltig IP-sträng"
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
 #: ports/nrf/common-hal/_bleio/__init__.c
 #: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "Not connected"
@@ -1733,6 +1732,10 @@ msgid ""
 msgstr ""
 "Endast Windows-format, okomprimerad BMP stöds: given headerstorlek är %d"
 
+#: shared-bindings/_bleio/Adapter.c
+msgid "Only connectable advertisements can be directed"
+msgstr ""
+
 #: ports/stm/common-hal/alarm/pin/PinAlarm.c
 msgid "Only edge detection is available on this hardware"
 msgstr "Endast kantdetektering är tillgänglig för denna hårdvara"
@@ -4474,6 +4477,9 @@ msgstr "zi måste vara av typ float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi måste vara i formen (n_section, 2)"
 
+#~ msgid "Buffer too large and unable to allocate"
+#~ msgstr "Bufferten är för stor och kan inte allokeras"
+
 #~ msgid "interp is defined for 1D arrays of equal length"
 #~ msgstr "interp är definierad för 1D-matriser med samma längd"
 
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 40fe4c0b3c..bb6fba4dd2 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -607,10 +607,6 @@ msgstr "Huǎn chōng qū bì xū shì 512 zì jié de bèi shù"
 msgid "Buffer must be at least length 1"
 msgstr "Huǎnchōng qū bìxū zhìshǎo chángdù 1"
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
-msgid "Buffer too large and unable to allocate"
-msgstr "Huǎn chōng qū tài dà ， wú fǎ fēn pèi"
-
 #: shared-bindings/_bleio/PacketBuffer.c
 #, c-format
 msgid "Buffer too short by %d bytes"
@@ -887,6 +883,10 @@ msgstr "shù jù 0 yǐn jiǎo bì xū àn zì jié duì qí."
 msgid "Data chunk must follow fmt chunk"
 msgstr "Shùjù kuài bìxū zūnxún fmt qū kuài"
 
+#: ports/nrf/common-hal/_bleio/Adapter.c
+msgid "Data not supported with directed advertising"
+msgstr ""
+
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data too large for advertisement packet"
 msgstr "Guǎnggào bāo de shùjù tài dà"
@@ -1690,7 +1690,6 @@ msgstr "běi ōu xì tǒng gù jiàn chū nèi cún"
 msgid "Not a valid IP string"
 msgstr "Wúxiào de IP zìfú chuàn"
 
-#: ports/nrf/common-hal/_bleio/PacketBuffer.c
 #: ports/nrf/common-hal/_bleio/__init__.c
 #: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "Not connected"
@@ -1736,6 +1735,10 @@ msgstr ""
 "Jǐn zhīchí Windows géshì, zhīchí wèi yāsuō de BMP: Gěi dìng de biāo tóu "
 "dàxiǎo wèi %d"
 
+#: shared-bindings/_bleio/Adapter.c
+msgid "Only connectable advertisements can be directed"
+msgstr ""
+
 #: ports/stm/common-hal/alarm/pin/PinAlarm.c
 msgid "Only edge detection is available on this hardware"
 msgstr "cǐ yìng jiàn shàng jǐn tí gòng biān yuán jiǎn cè"
@@ -4471,6 +4474,9 @@ msgstr "zi bìxū wèi fú diǎn xíng"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi bìxū jùyǒu xíngzhuàng (n_section,2)"
 
+#~ msgid "Buffer too large and unable to allocate"
+#~ msgstr "Huǎn chōng qū tài dà ， wú fǎ fēn pèi"
+
 #~ msgid "interp is defined for 1D arrays of equal length"
 #~ msgstr "interp shì wèi děng zhǎng de 1D shùzǔ dìngyì de"
 

From 62aca944f4ddd49e6615f52d54b406dcf5ca29c2 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Fri, 25 Jun 2021 09:50:31 -0400
Subject: [PATCH 307/349] Failed to advance buffer ptrs in usb_cdc.Serial
 properly

---
 shared-module/usb_cdc/Serial.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/shared-module/usb_cdc/Serial.c b/shared-module/usb_cdc/Serial.c
index b4d8667ca6..3ffb22cc3d 100644
--- a/shared-module/usb_cdc/Serial.c
+++ b/shared-module/usb_cdc/Serial.c
@@ -40,6 +40,10 @@ size_t common_hal_usb_cdc_serial_read(usb_cdc_serial_obj_t *self, uint8_t *data,
     uint32_t total_num_read = tud_cdc_n_read(self->idx, data, len);
 
     if (wait_forever || wait_for_timeout) {
+        // Continue filling the buffer past what we already read.
+        len -= total_num_read;
+        data += total_num_read;
+
         // Read more if we have time.
         // Use special routine to avoid pulling in uint64-float-compatible math routines.
         uint64_t timeout_ms = float_to_uint64(self->timeout * 1000);  // Junk value if timeout < 0.
@@ -78,6 +82,10 @@ size_t common_hal_usb_cdc_serial_write(usb_cdc_serial_obj_t *self, const uint8_t
     tud_cdc_n_write_flush(self->idx);
 
     if (wait_forever || wait_for_timeout) {
+        // Continue writing the rest of the buffer.
+        len -= total_num_written;
+        data += total_num_written;
+
         // Write more if we have time.
         // Use special routine to avoid pulling in uint64-float-compatible math routines.
         uint64_t timeout_ms = float_to_uint64(self->write_timeout * 1000);  // Junk value if write_timeout < 0.

From 322f1269e054f7922caac804133c1ed4b6910ec3 Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura <wellingtonuemura@gmail.com>
Date: Fri, 25 Jun 2021 09:48:27 +0000
Subject: [PATCH 308/349] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1006 of 1006 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/pt_BR/
---
 locale/pt_BR.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index df762a702a..3b95d85b9f 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2021-06-24 23:11+0000\n"
+"PO-Revision-Date: 2021-06-25 18:00+0000\n"
 "Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -896,7 +896,7 @@ msgstr "Pedaço de dados deve seguir o pedaço de cortes"
 
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data not supported with directed advertising"
-msgstr ""
+msgstr "Os dados não são compatíveis com publicidade direcionada"
 
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data too large for advertisement packet"
@@ -1750,7 +1750,7 @@ msgstr ""
 
 #: shared-bindings/_bleio/Adapter.c
 msgid "Only connectable advertisements can be directed"
-msgstr ""
+msgstr "Somente anúncios conectáveis podem ser direcionados"
 
 #: ports/stm/common-hal/alarm/pin/PinAlarm.c
 msgid "Only edge detection is available on this hardware"

From 4e9bbee02f14349cb4c3b4847b1e901e47377fa9 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Fri, 25 Jun 2021 20:01:02 +0200
Subject: [PATCH 309/349] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/
---
 locale/ID.po             | 6 +++++-
 locale/cs.po             | 6 +++++-
 locale/de_DE.po          | 6 +++++-
 locale/el.po             | 6 +++++-
 locale/en_GB.po          | 6 +++++-
 locale/es.po             | 6 +++++-
 locale/fil.po            | 6 +++++-
 locale/fr.po             | 6 +++++-
 locale/hi.po             | 6 +++++-
 locale/it_IT.po          | 6 +++++-
 locale/ja.po             | 6 +++++-
 locale/ko.po             | 6 +++++-
 locale/nl.po             | 6 +++++-
 locale/pl.po             | 6 +++++-
 locale/pt_BR.po          | 6 +++++-
 locale/sv.po             | 6 +++++-
 locale/zh_Latn_pinyin.po | 6 +++++-
 17 files changed, 85 insertions(+), 17 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index 0a209f3c08..7198339718 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -54,6 +54,10 @@ msgstr "  File \"%q\", baris %d"
 msgid " is of type %q\n"
 msgstr ""
 
+#: main.c
+msgid " not found.\n"
+msgstr ""
+
 #: main.c
 msgid " output:\n"
 msgstr "output:\n"
@@ -2549,7 +2553,7 @@ msgstr "Argumen argsort harus berupa ndarray"
 msgid "argsort is not implemented for flattened arrays"
 msgstr ""
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/__init__.c
 msgid "argument has wrong type"
 msgstr "argumen memiliki tipe yang salah"
 
diff --git a/locale/cs.po b/locale/cs.po
index a1b8031145..ebdd4f1264 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -50,6 +50,10 @@ msgstr "  Soubor \"%q\", řádek %d"
 msgid " is of type %q\n"
 msgstr ""
 
+#: main.c
+msgid " not found.\n"
+msgstr ""
+
 #: main.c
 msgid " output:\n"
 msgstr " výstup:\n"
@@ -2510,7 +2514,7 @@ msgstr ""
 msgid "argsort is not implemented for flattened arrays"
 msgstr ""
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/__init__.c
 msgid "argument has wrong type"
 msgstr ""
 
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 31097a7be1..97d76fb91e 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -53,6 +53,10 @@ msgstr "  Datei \"%q\", Zeile %d"
 msgid " is of type %q\n"
 msgstr " ist vom Type %q\n"
 
+#: main.c
+msgid " not found.\n"
+msgstr ""
+
 #: main.c
 msgid " output:\n"
 msgstr " Ausgabe:\n"
@@ -2555,7 +2559,7 @@ msgstr "Das Argument argsort muss ein ndarray sein"
 msgid "argsort is not implemented for flattened arrays"
 msgstr ""
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/__init__.c
 msgid "argument has wrong type"
 msgstr "Argument hat falschen Typ"
 
diff --git a/locale/el.po b/locale/el.po
index 8f51d36529..ad6ab6f189 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -47,6 +47,10 @@ msgstr ""
 msgid " is of type %q\n"
 msgstr ""
 
+#: main.c
+msgid " not found.\n"
+msgstr ""
+
 #: main.c
 msgid " output:\n"
 msgstr ""
@@ -2507,7 +2511,7 @@ msgstr ""
 msgid "argsort is not implemented for flattened arrays"
 msgstr ""
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/__init__.c
 msgid "argument has wrong type"
 msgstr ""
 
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 6f3ad2f15a..771de391af 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -55,6 +55,10 @@ msgstr "  File \"%q\", line %d"
 msgid " is of type %q\n"
 msgstr " is of type %q\n"
 
+#: main.c
+msgid " not found.\n"
+msgstr ""
+
 #: main.c
 msgid " output:\n"
 msgstr " output:\n"
@@ -2542,7 +2546,7 @@ msgstr "argsort argument must be an ndarray"
 msgid "argsort is not implemented for flattened arrays"
 msgstr "argsort is not implemented for flattened arrays"
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/__init__.c
 msgid "argument has wrong type"
 msgstr "argument has wrong type"
 
diff --git a/locale/es.po b/locale/es.po
index 3e8697e393..1363b35df5 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -56,6 +56,10 @@ msgstr "  Archivo \"%q\", línea %d"
 msgid " is of type %q\n"
 msgstr " es de tipo %q\n"
 
+#: main.c
+msgid " not found.\n"
+msgstr ""
+
 #: main.c
 msgid " output:\n"
 msgstr " salida:\n"
@@ -2586,7 +2590,7 @@ msgstr "El argumento para argsort debe ser un ndarray"
 msgid "argsort is not implemented for flattened arrays"
 msgstr "El argot no está implementado para arrays aplanados"
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/__init__.c
 msgid "argument has wrong type"
 msgstr "el argumento tiene un tipo erroneo"
 
diff --git a/locale/fil.po b/locale/fil.po
index 700b8ec96c..e0d80d7b4b 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -46,6 +46,10 @@ msgstr "  File \"%q\", line %d"
 msgid " is of type %q\n"
 msgstr ""
 
+#: main.c
+msgid " not found.\n"
+msgstr ""
+
 #: main.c
 msgid " output:\n"
 msgstr " output:\n"
@@ -2535,7 +2539,7 @@ msgstr ""
 msgid "argsort is not implemented for flattened arrays"
 msgstr ""
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/__init__.c
 msgid "argument has wrong type"
 msgstr "may maling type ang argument"
 
diff --git a/locale/fr.po b/locale/fr.po
index 761aebe237..d579a9e2a4 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -56,6 +56,10 @@ msgstr "  Fichier \"%q\", ligne %d"
 msgid " is of type %q\n"
 msgstr " est de type %q\n"
 
+#: main.c
+msgid " not found.\n"
+msgstr ""
+
 #: main.c
 msgid " output:\n"
 msgstr " sortie :\n"
@@ -2588,7 +2592,7 @@ msgstr "Le paramêtre argsort doit être un ndarray"
 msgid "argsort is not implemented for flattened arrays"
 msgstr "argsort n'est pas mis en œuvre pour les matrices aplatis"
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/__init__.c
 msgid "argument has wrong type"
 msgstr "l'argument est d'un mauvais type"
 
diff --git a/locale/hi.po b/locale/hi.po
index cbc07d270f..97823956e9 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -47,6 +47,10 @@ msgstr ""
 msgid " is of type %q\n"
 msgstr ""
 
+#: main.c
+msgid " not found.\n"
+msgstr ""
+
 #: main.c
 msgid " output:\n"
 msgstr ""
@@ -2507,7 +2511,7 @@ msgstr ""
 msgid "argsort is not implemented for flattened arrays"
 msgstr ""
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/__init__.c
 msgid "argument has wrong type"
 msgstr ""
 
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 925124c3b0..03ae1d68ca 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -55,6 +55,10 @@ msgstr "  File \"%q\", riga %d"
 msgid " is of type %q\n"
 msgstr " è di tipo %q\n"
 
+#: main.c
+msgid " not found.\n"
+msgstr ""
+
 #: main.c
 msgid " output:\n"
 msgstr " output:\n"
@@ -2550,7 +2554,7 @@ msgstr ""
 msgid "argsort is not implemented for flattened arrays"
 msgstr ""
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/__init__.c
 msgid "argument has wrong type"
 msgstr "il tipo dell'argomento è errato"
 
diff --git a/locale/ja.po b/locale/ja.po
index ad58f1c5a3..d6cbde47c2 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -52,6 +52,10 @@ msgstr "  ファイル \"%q\", 行 %d"
 msgid " is of type %q\n"
 msgstr ""
 
+#: main.c
+msgid " not found.\n"
+msgstr ""
+
 #: main.c
 msgid " output:\n"
 msgstr " 出力:\n"
@@ -2522,7 +2526,7 @@ msgstr "argsortの引数はndarrayでなければなりません"
 msgid "argsort is not implemented for flattened arrays"
 msgstr ""
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/__init__.c
 msgid "argument has wrong type"
 msgstr ""
 
diff --git a/locale/ko.po b/locale/ko.po
index 2b7c9b1a7a..0dfd9a596d 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -48,6 +48,10 @@ msgstr "  파일 \"%q\", 라인 %d"
 msgid " is of type %q\n"
 msgstr ""
 
+#: main.c
+msgid " not found.\n"
+msgstr ""
+
 #: main.c
 msgid " output:\n"
 msgstr " 산출:\n"
@@ -2511,7 +2515,7 @@ msgstr ""
 msgid "argsort is not implemented for flattened arrays"
 msgstr ""
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/__init__.c
 msgid "argument has wrong type"
 msgstr ""
 
diff --git a/locale/nl.po b/locale/nl.po
index e766c090c5..c697cfbf4d 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -50,6 +50,10 @@ msgstr "  Bestand \"%q\", regel %d"
 msgid " is of type %q\n"
 msgstr ""
 
+#: main.c
+msgid " not found.\n"
+msgstr ""
+
 #: main.c
 msgid " output:\n"
 msgstr " uitvoer:\n"
@@ -2548,7 +2552,7 @@ msgstr "argsort argument moet een ndarray zijn"
 msgid "argsort is not implemented for flattened arrays"
 msgstr "argsort wordt niet geïmplementeerd voor vlakke arrays"
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/__init__.c
 msgid "argument has wrong type"
 msgstr "argument heeft onjuist type"
 
diff --git a/locale/pl.po b/locale/pl.po
index 5f1aea6bf4..df71c704b0 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -52,6 +52,10 @@ msgstr "  Plik \"%q\", linia %d"
 msgid " is of type %q\n"
 msgstr ""
 
+#: main.c
+msgid " not found.\n"
+msgstr ""
+
 #: main.c
 msgid " output:\n"
 msgstr " wyjście:\n"
@@ -2524,7 +2528,7 @@ msgstr ""
 msgid "argsort is not implemented for flattened arrays"
 msgstr ""
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/__init__.c
 msgid "argument has wrong type"
 msgstr "argument ma zły typ"
 
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 3b95d85b9f..4e3124c2c9 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -54,6 +54,10 @@ msgstr "  Arquivo \"%q\", linha %d"
 msgid " is of type %q\n"
 msgstr " é do tipo %q\n"
 
+#: main.c
+msgid " not found.\n"
+msgstr ""
+
 #: main.c
 msgid " output:\n"
 msgstr " saída:\n"
@@ -2591,7 +2595,7 @@ msgstr "O argumento argsort deve ser um ndarray"
 msgid "argsort is not implemented for flattened arrays"
 msgstr "argsort não é implementado para matrizes achatadas"
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/__init__.c
 msgid "argument has wrong type"
 msgstr "argumento tem tipo errado"
 
diff --git a/locale/sv.po b/locale/sv.po
index 176c7f02be..0931d53800 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -54,6 +54,10 @@ msgstr "  Fil \"%q\", rad %d"
 msgid " is of type %q\n"
 msgstr " är av typen %q\n"
 
+#: main.c
+msgid " not found.\n"
+msgstr ""
+
 #: main.c
 msgid " output:\n"
 msgstr " utdata:\n"
@@ -2561,7 +2565,7 @@ msgstr "argumentet argsort måste vara en ndarray"
 msgid "argsort is not implemented for flattened arrays"
 msgstr "argsort är inte implementerad för tillplattade matriser"
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/__init__.c
 msgid "argument has wrong type"
 msgstr "argumentet har fel typ"
 
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index bb6fba4dd2..cb7745d4e8 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -55,6 +55,10 @@ msgstr "  Wénjiàn \"%q\", dì %d xíng"
 msgid " is of type %q\n"
 msgstr " shì %q lèi xíng\n"
 
+#: main.c
+msgid " not found.\n"
+msgstr ""
+
 #: main.c
 msgid " output:\n"
 msgstr " shūchū:\n"
@@ -2560,7 +2564,7 @@ msgstr "argsort cānshù bìxū shì ndarray"
 msgid "argsort is not implemented for flattened arrays"
 msgstr "wèi wéi pīn hé shù zǔ shí xiàn argsort"
 
-#: py/runtime.c
+#: py/runtime.c shared-bindings/supervisor/__init__.c
 msgid "argument has wrong type"
 msgstr "cānshù lèixíng cuòwù"
 

From 1987bead3179c65842bc52998eecb5a85d0df59e Mon Sep 17 00:00:00 2001
From: hexthat <hexthat@gmail.com>
Date: Fri, 25 Jun 2021 18:14:16 +0000
Subject: [PATCH 310/349] Translated using Weblate (Chinese (Pinyin))

Currently translated at 100.0% (1007 of 1007 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/zh_Latn/
---
 locale/zh_Latn_pinyin.po | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index cb7745d4e8..4f71db3fd3 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: circuitpython-cn\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2021-06-23 17:15+0000\n"
+"PO-Revision-Date: 2021-06-25 18:15+0000\n"
 "Last-Translator: hexthat <hexthat@gmail.com>\n"
 "Language-Team: Chinese Hanyu Pinyin\n"
 "Language: zh_Latn_pinyin\n"
@@ -57,7 +57,7 @@ msgstr " shì %q lèi xíng\n"
 
 #: main.c
 msgid " not found.\n"
-msgstr ""
+msgstr " wèi zhǎo dào.\n"
 
 #: main.c
 msgid " output:\n"
@@ -99,7 +99,7 @@ msgstr "%q suǒyǐn bìxū shì zhěngshù, ér bùshì %s"
 
 #: py/argcheck.c
 msgid "%q length must be %q"
-msgstr ""
+msgstr "%q cháng dù bì xū wéi %q"
 
 #: shared-bindings/vectorio/Polygon.c
 msgid "%q list must be a list"
@@ -107,11 +107,11 @@ msgstr "%q lièbiǎo bìxū shì lièbiǎo"
 
 #: py/argcheck.c
 msgid "%q must <= %d"
-msgstr ""
+msgstr "%q bì xū <= %d"
 
 #: py/argcheck.c
 msgid "%q must be %d-%d"
-msgstr ""
+msgstr "%q bì xū wéi %d-%d"
 
 #: shared-bindings/usb_hid/Device.c
 msgid "%q must be 0-255"
@@ -123,7 +123,7 @@ msgstr "%q bì xū wéi 1-255"
 
 #: py/argcheck.c
 msgid "%q must be >= %d"
-msgstr ""
+msgstr "%q bì xū >= %d"
 
 #: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c
 msgid "%q must be >= 0"
@@ -143,7 +143,7 @@ msgstr "%q bì xū wéi wú huò zài 1 hé len(report_descriptor)-1 zhī jiān"
 
 #: py/argcheck.c
 msgid "%q must be a string"
-msgstr ""
+msgstr "%q bì xū shì yí gè zì fú chuàn"
 
 #: shared-module/vectorio/Polygon.c
 msgid "%q must be a tuple of length 2"
@@ -155,12 +155,12 @@ msgstr "%q bì xū zài %d hé %d zhī jiān"
 
 #: py/argcheck.c
 msgid "%q must of type %q"
-msgstr ""
+msgstr "%q bì xū lèi xíng %q"
 
 #: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
 #: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q must store bytes"
-msgstr ""
+msgstr "%q bì xū cún chǔ zì jié"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
@@ -889,7 +889,7 @@ msgstr "Shùjù kuài bìxū zūnxún fmt qū kuài"
 
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data not supported with directed advertising"
-msgstr ""
+msgstr "bù zhī chí dìng xiàng guǎng gào de shù jù"
 
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data too large for advertisement packet"
@@ -1741,7 +1741,7 @@ msgstr ""
 
 #: shared-bindings/_bleio/Adapter.c
 msgid "Only connectable advertisements can be directed"
-msgstr ""
+msgstr "zhǐ yǒu kě lián jiē de guǎng gào cái néng bèi yǐn dǎo"
 
 #: ports/stm/common-hal/alarm/pin/PinAlarm.c
 msgid "Only edge detection is available on this hardware"
@@ -2641,7 +2641,7 @@ msgstr "èrjìnzhì bǎn qián bǎn %q wèi zhíxíng"
 
 #: extmod/modurandom.c
 msgid "bits must be 32 or less"
-msgstr ""
+msgstr "wèi bì xū shì 32 huò gèng shǎo"
 
 #: shared-bindings/busio/UART.c
 msgid "bits must be in range 5 to 9"
@@ -3262,7 +3262,7 @@ msgstr "túxíng bìxū wèi 2048 zì jié"
 
 #: extmod/moduhashlib.c
 msgid "hash is final"
-msgstr ""
+msgstr "hā xī shì zuì zhōng de"
 
 #: extmod/moduheapq.c
 msgid "heap must be a list"

From 11325bd338bbd92f74f0a9ef732c327678986a68 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Fri, 25 Jun 2021 20:15:49 +0200
Subject: [PATCH 311/349] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/
---
 locale/ID.po             | 4 ++++
 locale/cs.po             | 4 ++++
 locale/de_DE.po          | 4 ++++
 locale/el.po             | 4 ++++
 locale/en_GB.po          | 4 ++++
 locale/es.po             | 4 ++++
 locale/fil.po            | 4 ++++
 locale/fr.po             | 4 ++++
 locale/hi.po             | 4 ++++
 locale/it_IT.po          | 4 ++++
 locale/ja.po             | 4 ++++
 locale/ko.po             | 4 ++++
 locale/nl.po             | 4 ++++
 locale/pl.po             | 4 ++++
 locale/pt_BR.po          | 4 ++++
 locale/sv.po             | 4 ++++
 locale/zh_Latn_pinyin.po | 4 ++++
 17 files changed, 68 insertions(+)

diff --git a/locale/ID.po b/locale/ID.po
index 7198339718..bb8428a3f2 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -2068,6 +2068,10 @@ msgstr "Kesalahan Init SPI"
 msgid "SPI Re-initialization error"
 msgstr "Kesalahan Inisialisasi ulang SPI"
 
+#: ports/esp32s2/common-hal/busio/SPI.c
+msgid "SPI configuration failed"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"
 msgstr ""
diff --git a/locale/cs.po b/locale/cs.po
index ebdd4f1264..ed87ef5768 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -2037,6 +2037,10 @@ msgstr ""
 msgid "SPI Re-initialization error"
 msgstr ""
 
+#: ports/esp32s2/common-hal/busio/SPI.c
+msgid "SPI configuration failed"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 97d76fb91e..498f3bcd49 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2066,6 +2066,10 @@ msgstr "SPI-Init-Fehler"
 msgid "SPI Re-initialization error"
 msgstr "SPI-Neuinitialisierungsfehler"
 
+#: ports/esp32s2/common-hal/busio/SPI.c
+msgid "SPI configuration failed"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"
 msgstr ""
diff --git a/locale/el.po b/locale/el.po
index ad6ab6f189..68052d303d 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -2034,6 +2034,10 @@ msgstr ""
 msgid "SPI Re-initialization error"
 msgstr ""
 
+#: ports/esp32s2/common-hal/busio/SPI.c
+msgid "SPI configuration failed"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"
 msgstr ""
diff --git a/locale/en_GB.po b/locale/en_GB.po
index 771de391af..b8e0e96034 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -2062,6 +2062,10 @@ msgstr "SPI init error"
 msgid "SPI Re-initialization error"
 msgstr "SPI reinitialisation error"
 
+#: ports/esp32s2/common-hal/busio/SPI.c
+msgid "SPI configuration failed"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"
 msgstr "SPI peripheral in use"
diff --git a/locale/es.po b/locale/es.po
index 1363b35df5..e184742e79 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -2090,6 +2090,10 @@ msgstr "Error de inicio de SPI"
 msgid "SPI Re-initialization error"
 msgstr "Error de reinicialización de SPI"
 
+#: ports/esp32s2/common-hal/busio/SPI.c
+msgid "SPI configuration failed"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"
 msgstr "Periférico SPI en uso"
diff --git a/locale/fil.po b/locale/fil.po
index e0d80d7b4b..da7b003bbc 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -2054,6 +2054,10 @@ msgstr ""
 msgid "SPI Re-initialization error"
 msgstr ""
 
+#: ports/esp32s2/common-hal/busio/SPI.c
+msgid "SPI configuration failed"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"
 msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index d579a9e2a4..c224337e01 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -2099,6 +2099,10 @@ msgstr "Erreur d'initialisation SPI"
 msgid "SPI Re-initialization error"
 msgstr "Erreur de réinitialisation SPI"
 
+#: ports/esp32s2/common-hal/busio/SPI.c
+msgid "SPI configuration failed"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"
 msgstr "Périphérique SPI utilisé"
diff --git a/locale/hi.po b/locale/hi.po
index 97823956e9..a6327c63d9 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -2034,6 +2034,10 @@ msgstr ""
 msgid "SPI Re-initialization error"
 msgstr ""
 
+#: ports/esp32s2/common-hal/busio/SPI.c
+msgid "SPI configuration failed"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 03ae1d68ca..28c4012afd 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -2073,6 +2073,10 @@ msgstr ""
 msgid "SPI Re-initialization error"
 msgstr ""
 
+#: ports/esp32s2/common-hal/busio/SPI.c
+msgid "SPI configuration failed"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"
 msgstr ""
diff --git a/locale/ja.po b/locale/ja.po
index d6cbde47c2..e3f25b8f9c 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -2048,6 +2048,10 @@ msgstr "SPI初期化エラー"
 msgid "SPI Re-initialization error"
 msgstr "SPI再初期化エラー"
 
+#: ports/esp32s2/common-hal/busio/SPI.c
+msgid "SPI configuration failed"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"
 msgstr ""
diff --git a/locale/ko.po b/locale/ko.po
index 0dfd9a596d..06ced23109 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -2037,6 +2037,10 @@ msgstr ""
 msgid "SPI Re-initialization error"
 msgstr ""
 
+#: ports/esp32s2/common-hal/busio/SPI.c
+msgid "SPI configuration failed"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index c697cfbf4d..2561eeb710 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -2064,6 +2064,10 @@ msgstr "SPI Init Fout"
 msgid "SPI Re-initialization error"
 msgstr "SPI Herinitialisatie Fout"
 
+#: ports/esp32s2/common-hal/busio/SPI.c
+msgid "SPI configuration failed"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"
 msgstr ""
diff --git a/locale/pl.po b/locale/pl.po
index df71c704b0..6d736c6ce6 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -2045,6 +2045,10 @@ msgstr "Błąd inicjowania SPI"
 msgid "SPI Re-initialization error"
 msgstr "Błąd ponownej inicjalizacji SPI"
 
+#: ports/esp32s2/common-hal/busio/SPI.c
+msgid "SPI configuration failed"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"
 msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 4e3124c2c9..82a4cb62b6 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -2091,6 +2091,10 @@ msgstr "Houve um erro na inicialização SPI"
 msgid "SPI Re-initialization error"
 msgstr "Houve um erro na reinicialização SPI"
 
+#: ports/esp32s2/common-hal/busio/SPI.c
+msgid "SPI configuration failed"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"
 msgstr "O periférico SPI está em uso"
diff --git a/locale/sv.po b/locale/sv.po
index 0931d53800..76127123ff 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -2070,6 +2070,10 @@ msgstr "SPI Init-fel"
 msgid "SPI Re-initialization error"
 msgstr "SPI reinitialiseringsfel"
 
+#: ports/esp32s2/common-hal/busio/SPI.c
+msgid "SPI configuration failed"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"
 msgstr "SPI-enhet används redan"
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 4f71db3fd3..9cbd84ebfd 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -2069,6 +2069,10 @@ msgstr "SPI chūshǐhuà cuòwù"
 msgid "SPI Re-initialization error"
 msgstr "SPI chóngxīn chūshǐhuà cuòwù"
 
+#: ports/esp32s2/common-hal/busio/SPI.c
+msgid "SPI configuration failed"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"
 msgstr "SPI wài shè zhèng zài shǐ yòng zhōng"

From 3177973843e429d019037a62a91d3f54e9bf6c5d Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Fri, 25 Jun 2021 14:58:32 -0700
Subject: [PATCH 312/349] Add BLE serial service

---
 locale/circuitpython.pot                      |   5 -
 main.c                                        |   2 +-
 ports/nrf/background.c                        |   5 -
 ports/nrf/bluetooth/ble_drv.c                 |   2 +-
 ports/nrf/bluetooth/ble_uart.c                | 191 ---------
 ports/nrf/bluetooth/ringbuffer.h              |  99 -----
 ports/nrf/common-hal/_bleio/Adapter.c         |   2 +-
 ports/nrf/common-hal/_bleio/Characteristic.c  |   5 +-
 .../common-hal/_bleio/CharacteristicBuffer.c  |  32 +-
 ports/nrf/common-hal/_bleio/Connection.c      |   4 +-
 ports/nrf/common-hal/_bleio/PacketBuffer.c    |  17 +
 ports/nrf/common-hal/_bleio/Service.c         |  16 +-
 ports/nrf/common-hal/_bleio/__init__.c        |   2 +-
 ports/nrf/mpconfigport.mk                     |   3 +
 py/circuitpy_mpconfig.mk                      |  15 +-
 shared-bindings/_bleio/Characteristic.c       |  18 +-
 shared-bindings/_bleio/Characteristic.h       |   2 +-
 shared-bindings/_bleio/CharacteristicBuffer.h |  10 +-
 shared-bindings/_bleio/Service.h              |   2 +-
 supervisor/shared/bluetooth/bluetooth.c       | 232 +++++++++++
 supervisor/shared/{ => bluetooth}/bluetooth.h |   4 -
 .../file_transfer.c}                          | 364 +++---------------
 .../shared/bluetooth/file_transfer.h          |  18 +-
 .../shared/bluetooth/file_transfer_protocol.h | 149 +++++++
 supervisor/shared/bluetooth/serial.c          | 153 ++++++++
 supervisor/shared/bluetooth/serial.h          |  39 ++
 supervisor/shared/serial.c                    |  85 +++-
 supervisor/shared/tick.c                      |   5 -
 supervisor/supervisor.mk                      |  14 +-
 29 files changed, 793 insertions(+), 702 deletions(-)
 delete mode 100644 ports/nrf/bluetooth/ble_uart.c
 delete mode 100644 ports/nrf/bluetooth/ringbuffer.h
 create mode 100644 supervisor/shared/bluetooth/bluetooth.c
 rename supervisor/shared/{ => bluetooth}/bluetooth.h (92%)
 rename supervisor/shared/{bluetooth.c => bluetooth/file_transfer.c} (66%)
 rename ports/nrf/bluetooth/ble_uart.h => supervisor/shared/bluetooth/file_transfer.h (73%)
 create mode 100644 supervisor/shared/bluetooth/file_transfer_protocol.h
 create mode 100644 supervisor/shared/bluetooth/serial.c
 create mode 100644 supervisor/shared/bluetooth/serial.h

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 0fc96f8b6e..e421eef8ea 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -147,11 +147,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/main.c b/main.c
index dc2eaebb50..395b8c3057 100755
--- a/main.c
+++ b/main.c
@@ -71,7 +71,7 @@
 
 #if CIRCUITPY_BLEIO
 #include "shared-bindings/_bleio/__init__.h"
-#include "supervisor/shared/bluetooth.h"
+#include "supervisor/shared/bluetooth/bluetooth.h"
 #endif
 
 #if CIRCUITPY_BOARD
diff --git a/ports/nrf/background.c b/ports/nrf/background.c
index 269bf6737f..f4d6b0f79f 100644
--- a/ports/nrf/background.c
+++ b/ports/nrf/background.c
@@ -41,11 +41,6 @@
 #include "common-hal/audiopwmio/PWMAudioOut.h"
 #endif
 
-#if CIRCUITPY_BLEIO
-#include "supervisor/shared/bluetooth.h"
-#include "common-hal/_bleio/bonding.h"
-#endif
-
 void port_start_background_task(void) {
 }
 void port_finish_background_task(void) {
diff --git a/ports/nrf/bluetooth/ble_drv.c b/ports/nrf/bluetooth/ble_drv.c
index 044acbebfc..29b2844736 100644
--- a/ports/nrf/bluetooth/ble_drv.c
+++ b/ports/nrf/bluetooth/ble_drv.c
@@ -38,7 +38,7 @@
 #include "py/misc.h"
 #include "py/mpstate.h"
 
-#include "supervisor/shared/bluetooth.h"
+// #include "supervisor/shared/bluetooth.h"
 
 nrf_nvic_state_t nrf_nvic_state = { 0 };
 
diff --git a/ports/nrf/bluetooth/ble_uart.c b/ports/nrf/bluetooth/ble_uart.c
deleted file mode 100644
index 6b1fed1ad5..0000000000
--- a/ports/nrf/bluetooth/ble_uart.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2019 Dan Halbert for Adafruit Industries
- * Copyright (c) 2018 Artur Pacholec
- * Copyright (c) 2017 Glenn Ruben Bakke
- *
- * 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 <string.h>
-
-#include "ble.h"
-#include "ble_uart.h"
-#include "ringbuffer.h"
-#include "py/mphal.h"
-#include "py/runtime.h"
-#include "lib/utils/interrupt_char.h"
-#include "shared-bindings/_bleio/Adapter.h"
-#include "shared-bindings/_bleio/Characteristic.h"
-#include "shared-bindings/_bleio/Device.h"
-#include "shared-bindings/_bleio/Service.h"
-#include "shared-bindings/_bleio/UUID.h"
-
-#if CIRCUITPY_CONSOLE_BLE
-
-static const char default_name[] = "CP-REPL"; // max 8 chars or uuid won't fit in adv data
-static const char NUS_UUID[] = "6e400001-b5a3-f393-e0a9-e50e24dcca9e";
-
-#define NUS_RX_UUID 0x0002
-#define NUS_TX_UUID 0x0003
-#define BUFFER_SIZE 128
-
-ringBuffer_typedef(uint8_t, ringbuffer_t);
-
-static bleio_device_obj_t m_device;
-static bleio_service_obj_t *m_nus;
-static bleio_characteristic_obj_t *m_tx_chara;
-static bleio_characteristic_obj_t *m_rx_chara;
-
-static volatile bool m_cccd_enabled;
-
-static uint8_t m_rx_ring_buffer_data[BUFFER_SIZE];
-static ringbuffer_t m_rx_ring_buffer = {
-    .size = sizeof(m_rx_ring_buffer_data) + 1,
-    .elems = m_rx_ring_buffer_data,
-};
-
-STATIC void on_ble_evt(ble_evt_t *ble_evt, void *param) {
-    switch (ble_evt->header.evt_id) {
-        case BLE_GAP_EVT_DISCONNECTED: {
-            mp_obj_t device_obj = MP_OBJ_FROM_PTR(&m_device);
-            mp_call_function_0(mp_load_attr(device_obj, qstr_from_str("start_advertising")));
-            break;
-        }
-
-        case BLE_GATTS_EVT_WRITE: {
-            ble_gatts_evt_write_t *write = &ble_evt->evt.gatts_evt.params.write;
-
-            if (write->handle == m_tx_chara->cccd_handle) {
-                m_cccd_enabled = true;
-            } else if (write->handle == m_rx_chara->handle) {
-                for (size_t i = 0; i < write->len; ++i) {
-                    #if MICROPY_KBD_EXCEPTION
-                    if (write->data[i] == mp_interrupt_char) {
-                        mp_sched_keyboard_interrupt();
-                    } else
-                    #endif
-                    {
-                        bufferWrite(&m_rx_ring_buffer, write->data[i]);
-                    }
-                }
-            }
-        }
-    }
-}
-
-void ble_uart_init(void) {
-    mp_obj_t device_obj = MP_OBJ_FROM_PTR(&m_device);
-    m_device.base.type = &bleio_device_type;
-    m_device.service_list = mp_obj_new_list(0, NULL);
-    m_device.notif_handler = mp_const_none;
-    m_device.conn_handler = mp_const_none;
-    m_device.conn_handle = 0xFFFF;
-    m_device.is_peripheral = true;
-    m_device.name = mp_obj_new_str(default_name, strlen(default_name), false);
-    common_hal_bleio_adapter_get_address(&m_device.address);
-
-    mp_obj_t nus_uuid_str = mp_obj_new_str(NUS_UUID, strlen(NUS_UUID), false);
-    mp_obj_t nus_uuid_obj = bleio_uuid_type.make_new(&bleio_uuid_type, 1, 0, &nus_uuid_str);
-    mp_obj_t nus_obj = bleio_service_type.make_new(&bleio_service_type, 1, 0, &nus_uuid_obj);
-    m_nus = MP_OBJ_TO_PTR(nus_obj);
-    mp_call_function_1(mp_load_attr(device_obj, qstr_from_str("add_service")), nus_obj);
-
-    mp_obj_t tx_uuid_int = mp_obj_new_int(NUS_TX_UUID);
-    mp_obj_t tx_uuid_obj = bleio_uuid_type.make_new(&bleio_uuid_type, 1, 0, &tx_uuid_int);
-    mp_obj_t tx_obj = bleio_characteristic_type.make_new(&bleio_characteristic_type, 1, 0, &tx_uuid_obj);
-    m_tx_chara = MP_OBJ_TO_PTR(tx_obj);
-    m_tx_chara->uuid->type = UUID_TYPE_128BIT;
-    m_tx_chara->uuid->uuid_vs_idx = m_nus->uuid->uuid_vs_idx;
-    m_tx_chara->props.notify = true;
-    mp_call_function_1(mp_load_attr(nus_obj, qstr_from_str("add_characteristic")), tx_obj);
-
-    mp_obj_t rx_uuid_int = mp_obj_new_int(NUS_RX_UUID);
-    mp_obj_t rx_uuid_obj = bleio_uuid_type.make_new(&bleio_uuid_type, 1, 0, &rx_uuid_int);
-    mp_obj_t rx_obj = bleio_characteristic_type.make_new(&bleio_characteristic_type, 1, 0, &rx_uuid_obj);
-    m_rx_chara = MP_OBJ_TO_PTR(rx_obj);
-    m_rx_chara->uuid->type = UUID_TYPE_128BIT;
-    m_rx_chara->uuid->uuid_vs_idx = m_nus->uuid->uuid_vs_idx;
-    m_rx_chara->props.write = true;
-    m_rx_chara->props.write_wo_resp = true;
-    mp_call_function_1(mp_load_attr(nus_obj, qstr_from_str("add_characteristic")), rx_obj);
-
-    mp_call_function_0(mp_load_attr(device_obj, qstr_from_str("start_advertising")));
-
-    ble_drv_add_event_handler(on_ble_evt, &m_device);
-
-    m_cccd_enabled = false;
-
-    while (!m_cccd_enabled) {
-        RUN_BACKGROUND_TASKS;
-    }
-}
-
-bool ble_uart_connected(void) {
-    return m_device.conn_handle != BLE_CONN_HANDLE_INVALID;
-}
-
-char ble_uart_rx_chr(void) {
-    while (isBufferEmpty(&m_rx_ring_buffer)) {
-        RUN_BACKGROUND_TASKS;
-    }
-
-    uint8_t byte;
-    bufferRead(&m_rx_ring_buffer, byte);
-    return (int)byte;
-}
-
-bool ble_uart_stdin_any(void) {
-    return !isBufferEmpty(&m_rx_ring_buffer);
-}
-
-void ble_uart_stdout_tx_str(const char *text) {
-    mp_hal_stdout_tx_strn(text, strlen(text));
-}
-
-int mp_hal_stdin_rx_chr(void) {
-    return ble_uart_rx_chr();
-}
-
-void mp_hal_stdout_tx_strn(const char *str, size_t len) {
-    size_t send_len;
-
-    while (len > 0) {
-        if (len >= BLE_GATT_ATT_MTU_DEFAULT - 3) {
-            send_len = (BLE_GATT_ATT_MTU_DEFAULT - 3);
-        } else {
-            send_len = len;
-        }
-
-        mp_buffer_info_t bufinfo = {
-            .buf = (uint8_t *)str,
-            .len = send_len,
-        };
-
-        common_hal_bleio_characteristic_write_value(m_tx_chara, &bufinfo);
-
-        len -= send_len;
-        str += send_len;
-    }
-}
-
-#endif // CIRCUITPY_CONSOLE_BLE
diff --git a/ports/nrf/bluetooth/ringbuffer.h b/ports/nrf/bluetooth/ringbuffer.h
deleted file mode 100644
index baf2732931..0000000000
--- a/ports/nrf/bluetooth/ringbuffer.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* The MIT License (MIT)
- *
- * Copyright (c) 2013 Philip Thrasher
- *
- * 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.
- * Philip Thrasher's Crazy Awesome Ring Buffer Macros!
- *
- * Below you will find some naughty macros for easy owning and manipulating
- * generic ring buffers. Yes, they are slightly evil in readability, but they
- * are really fast, and they work great.
- *
- * Example usage:
- *
- * #include <stdio.h>
- *
- * // So we can use this in any method, this gives us a typedef
- * // named 'intBuffer'.
- * ringBuffer_typedef(int, intBuffer);
- *
- * int main() {
- *   // Declare vars.
- *   intBuffer myBuffer;
- *
- *   bufferInit(myBuffer,1024,int);
- *
- *   // We must have the pointer. All of the macros deal with the pointer.
- *   // (except for init.)
- *   intBuffer* myBuffer_ptr;
- *   myBuffer_ptr = &myBuffer;
- *
- *   // Write two values.
- *   bufferWrite(myBuffer_ptr,37);
- *   bufferWrite(myBuffer_ptr,72);
- *
- *   // Read a value into a local variable.
- *   int first;
- *   bufferRead(myBuffer_ptr,first);
- *   assert(first == 37); // true
- *
- *   int second;
- *   bufferRead(myBuffer_ptr,second);
- *   assert(second == 72); // true
- *
- *   return 0;
- * }
- *
- */
-
-#ifndef _ringbuffer_h
-#define _ringbuffer_h
-
-#define ringBuffer_typedef(T, NAME) \
-    typedef struct { \
-        int size; \
-        volatile int start; \
-        volatile int end; \
-        T *elems; \
-    } NAME
-
-#define bufferInit(BUF, S, T) \
-    BUF.size = S + 1; \
-    BUF.start = 0; \
-    BUF.end = 0; \
-    BUF.elems = (T *)calloc(BUF.size, sizeof(T))
-
-
-#define bufferDestroy(BUF) free((BUF)->elems)
-#define nextStartIndex(BUF) (((BUF)->start + 1) % (BUF)->size)
-#define nextEndIndex(BUF) (((BUF)->end + 1) % (BUF)->size)
-#define isBufferEmpty(BUF) ((BUF)->end == (BUF)->start)
-#define isBufferFull(BUF) (nextEndIndex(BUF) == (BUF)->start)
-
-#define bufferWrite(BUF, ELEM) \
-    (BUF)->elems[(BUF)->end] = ELEM; \
-    (BUF)->end = ((BUF)->end + 1) % (BUF)->size; \
-    if (isBufferEmpty(BUF)) { \
-        (BUF)->start = nextStartIndex(BUF); \
-    }
-
-#define bufferRead(BUF, ELEM) \
-    ELEM = (BUF)->elems[(BUF)->start]; \
-    (BUF)->start = nextStartIndex(BUF);
-
-#endif
diff --git a/ports/nrf/common-hal/_bleio/Adapter.c b/ports/nrf/common-hal/_bleio/Adapter.c
index 3f8fbc3a97..bf92c7b3ba 100644
--- a/ports/nrf/common-hal/_bleio/Adapter.c
+++ b/ports/nrf/common-hal/_bleio/Adapter.c
@@ -40,7 +40,7 @@
 #include "py/gc.h"
 #include "py/objstr.h"
 #include "py/runtime.h"
-#include "supervisor/shared/bluetooth.h"
+#include "supervisor/shared/bluetooth/bluetooth.h"
 #include "supervisor/shared/safe_mode.h"
 #include "supervisor/shared/tick.h"
 #include "supervisor/usb.h"
diff --git a/ports/nrf/common-hal/_bleio/Characteristic.c b/ports/nrf/common-hal/_bleio/Characteristic.c
index 621d400794..df86654c70 100644
--- a/ports/nrf/common-hal/_bleio/Characteristic.c
+++ b/ports/nrf/common-hal/_bleio/Characteristic.c
@@ -86,7 +86,8 @@ STATIC void characteristic_gatts_notify_indicate(uint16_t handle, uint16_t conn_
 void common_hal_bleio_characteristic_construct(bleio_characteristic_obj_t *self, bleio_service_obj_t *service,
     uint16_t handle, bleio_uuid_obj_t *uuid, bleio_characteristic_properties_t props,
     bleio_attribute_security_mode_t read_perm, bleio_attribute_security_mode_t write_perm,
-    mp_int_t max_length, bool fixed_length, mp_buffer_info_t *initial_value_bufinfo) {
+    mp_int_t max_length, bool fixed_length, mp_buffer_info_t *initial_value_bufinfo,
+    const char *user_description) {
     self->service = service;
     self->uuid = uuid;
     self->handle = BLE_GATT_HANDLE_INVALID;
@@ -125,7 +126,7 @@ void common_hal_bleio_characteristic_construct(bleio_characteristic_obj_t *self,
     if (service->is_remote) {
         self->handle = handle;
     } else {
-        common_hal_bleio_service_add_characteristic(self->service, self, initial_value_bufinfo);
+        common_hal_bleio_service_add_characteristic(self->service, self, initial_value_bufinfo, user_description);
     }
 }
 
diff --git a/ports/nrf/common-hal/_bleio/CharacteristicBuffer.c b/ports/nrf/common-hal/_bleio/CharacteristicBuffer.c
index b17327da47..ca37f41c1a 100644
--- a/ports/nrf/common-hal/_bleio/CharacteristicBuffer.c
+++ b/ports/nrf/common-hal/_bleio/CharacteristicBuffer.c
@@ -80,20 +80,34 @@ STATIC bool characteristic_buffer_on_ble_evt(ble_evt_t *ble_evt, void *param) {
     return true;
 }
 
+void _common_hal_bleio_characteristic_buffer_construct(bleio_characteristic_buffer_obj_t *self,
+    bleio_characteristic_obj_t *characteristic,
+    mp_float_t timeout,
+    uint8_t *buffer, size_t buffer_size,
+    void *static_handler_entry) {
+
+    self->characteristic = characteristic;
+    self->timeout_ms = timeout * 1000;
+
+    self->ringbuf.buf = (uint8_t *)buffer;
+    self->ringbuf.size = buffer_size;
+    self->ringbuf.iget = 0;
+    self->ringbuf.iput = 0;
+
+    if (static_handler_entry != NULL) {
+        ble_drv_add_event_handler_entry((ble_drv_evt_handler_entry_t *)static_handler_entry, characteristic_buffer_on_ble_evt, self);
+    } else {
+        ble_drv_add_event_handler(characteristic_buffer_on_ble_evt, self);
+    }
+}
+
 // Assumes that timeout and buffer_size have been validated before call.
 void common_hal_bleio_characteristic_buffer_construct(bleio_characteristic_buffer_obj_t *self,
     bleio_characteristic_obj_t *characteristic,
     mp_float_t timeout,
     size_t buffer_size) {
-
-    self->characteristic = characteristic;
-    self->timeout_ms = timeout * 1000;
-    // This is a macro.
-    // true means long-lived, so it won't be moved.
-    ringbuf_alloc(&self->ringbuf, buffer_size, true);
-
-    ble_drv_add_event_handler(characteristic_buffer_on_ble_evt, self);
-
+    uint8_t *buffer = m_malloc(buffer_size, true);
+    _common_hal_bleio_characteristic_buffer_construct(self, characteristic, timeout, buffer, buffer_size, NULL);
 }
 
 uint32_t common_hal_bleio_characteristic_buffer_read(bleio_characteristic_buffer_obj_t *self, uint8_t *data, size_t len, int *errcode) {
diff --git a/ports/nrf/common-hal/_bleio/Connection.c b/ports/nrf/common-hal/_bleio/Connection.c
index 335f56c30c..0e7c6a3c54 100644
--- a/ports/nrf/common-hal/_bleio/Connection.c
+++ b/ports/nrf/common-hal/_bleio/Connection.c
@@ -311,6 +311,7 @@ bool connection_on_ble_evt(ble_evt_t *ble_evt, void *self_in) {
                     // Did an sd_ble_gatts_sys_attr_set() with the stored sys_attr values.
                     // Indicate ATTR table change because we may have reloaded since the peer last
                     // connected.
+                    mp_printf(&mp_plat_print, "restore sys attrs\n");
                     sd_ble_gatts_service_changed(self->conn_handle, 0xC, 0xFFFF);
                 } else {
                     // No matching bonding found, so use fresh system attributes.
@@ -533,7 +534,8 @@ STATIC void on_char_discovery_rsp(ble_gattc_evt_char_disc_rsp_t *response, bleio
             characteristic, m_char_discovery_service, gattc_char->handle_value, uuid,
             props, SECURITY_MODE_OPEN, SECURITY_MODE_OPEN,
             GATT_MAX_DATA_LENGTH, false,   // max_length, fixed_length: values don't matter for gattc
-            mp_const_empty_bytes);
+            mp_const_empty_bytes,
+            NULL);
 
         mp_obj_list_append(MP_OBJ_FROM_PTR(m_char_discovery_service->characteristic_list),
             MP_OBJ_FROM_PTR(characteristic));
diff --git a/ports/nrf/common-hal/_bleio/PacketBuffer.c b/ports/nrf/common-hal/_bleio/PacketBuffer.c
index e721cfb53b..4a123a7c00 100644
--- a/ports/nrf/common-hal/_bleio/PacketBuffer.c
+++ b/ports/nrf/common-hal/_bleio/PacketBuffer.c
@@ -173,6 +173,23 @@ STATIC bool packet_buffer_on_ble_server_evt(ble_evt_t *ble_evt, void *param) {
             }
             break;
         }
+        case BLE_GAP_EVT_CONN_SEC_UPDATE: { // 0x1a
+            if (self->conn_handle != BLE_CONN_HANDLE_INVALID) {
+                break;
+            }
+            uint16_t conn_handle = ble_evt->evt.gatts_evt.conn_handle;
+            // Check to see if the bond restored the HVX state.
+            uint16_t cccd;
+            ble_gatts_value_t value;
+            value.len = sizeof(uint16_t);
+            value.offset = 0;
+            value.p_value = (uint8_t *)&cccd;
+            sd_ble_gatts_value_get(conn_handle, self->characteristic->cccd_handle, &value);
+            if (cccd & BLE_GATT_HVX_NOTIFICATION) {
+                self->conn_handle = conn_handle;
+            }
+            break;
+        }
         case BLE_GAP_EVT_CONNECTED:
             break;
         case BLE_GAP_EVT_DISCONNECTED:
diff --git a/ports/nrf/common-hal/_bleio/Service.c b/ports/nrf/common-hal/_bleio/Service.c
index 5302f25946..0c4ded2d1b 100644
--- a/ports/nrf/common-hal/_bleio/Service.c
+++ b/ports/nrf/common-hal/_bleio/Service.c
@@ -112,7 +112,8 @@ STATIC void _expand_range(uint16_t new_value, uint16_t *start, uint16_t *end) {
 
 void common_hal_bleio_service_add_characteristic(bleio_service_obj_t *self,
     bleio_characteristic_obj_t *characteristic,
-    mp_buffer_info_t *initial_value_bufinfo) {
+    mp_buffer_info_t *initial_value_bufinfo,
+    const char *user_description) {
     ble_gatts_char_md_t char_md = {
         .char_props.broadcast = (characteristic->props & CHAR_PROP_BROADCAST) ? 1 : 0,
         .char_props.read = (characteristic->props & CHAR_PROP_READ) ? 1 : 0,
@@ -142,6 +143,19 @@ void common_hal_bleio_service_add_characteristic(bleio_service_obj_t *self,
         char_md.p_cccd_md = &cccd_md;
     }
 
+    ble_gatts_attr_md_t user_desc_md;
+    if (user_description != NULL && strlen(user_description) > 0) {
+        BLE_GAP_CONN_SEC_MODE_SET_OPEN(&user_desc_md.read_perm);
+        // If the description is on the Python heap, then have the SD copy it. If not, assume it's
+        // static and will live for longer than the SD.
+        user_desc_md.vloc = gc_nbytes(user_description) > 0 ? BLE_GATTS_VLOC_STACK : BLE_GATTS_VLOC_USER;
+        char_md.p_user_desc_md = &user_desc_md;
+        char_md.p_char_user_desc = (const uint8_t *)user_description;
+        char_md.char_user_desc_max_size = strlen(user_description);
+        char_md.char_user_desc_size = strlen(user_description);
+        mp_printf(&mp_plat_print, "user description %s\n", user_description);
+    }
+
     bleio_attribute_gatts_set_security_mode(&char_attr_md.read_perm, characteristic->read_perm);
     bleio_attribute_gatts_set_security_mode(&char_attr_md.write_perm, characteristic->write_perm);
     #if CIRCUITPY_VERBOSE_BLE
diff --git a/ports/nrf/common-hal/_bleio/__init__.c b/ports/nrf/common-hal/_bleio/__init__.c
index 3c919c9ffe..de1641eb9d 100644
--- a/ports/nrf/common-hal/_bleio/__init__.c
+++ b/ports/nrf/common-hal/_bleio/__init__.c
@@ -36,7 +36,7 @@
 #include "shared-bindings/_bleio/Descriptor.h"
 #include "shared-bindings/_bleio/Service.h"
 #include "shared-bindings/_bleio/UUID.h"
-#include "supervisor/shared/bluetooth.h"
+#include "supervisor/shared/bluetooth/bluetooth.h"
 
 #include "common-hal/_bleio/__init__.h"
 #include "common-hal/_bleio/bonding.h"
diff --git a/ports/nrf/mpconfigport.mk b/ports/nrf/mpconfigport.mk
index 6bd63bcd72..87d79cb0e5 100644
--- a/ports/nrf/mpconfigport.mk
+++ b/ports/nrf/mpconfigport.mk
@@ -50,6 +50,9 @@ CIRCUITPY_ALARM ?= 1
 # Turn on the BLE file service
 CIRCUITPY_BLE_FILE_SERVICE ?= 1
 
+# Turn on the BLE serial service
+CIRCUITPY_SERIAL_BLE ?= 1
+
 CIRCUITPY_COMPUTED_GOTO_SAVE_SPACE ?= 1
 
 # nRF52840-specific
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index f4075f0d5a..0e2c577c69 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -136,9 +136,6 @@ CFLAGS += -DCIRCUITPY_DIGITALIO=$(CIRCUITPY_DIGITALIO)
 CIRCUITPY_COMPUTED_GOTO_SAVE_SPACE ?= 0
 CFLAGS += -DCIRCUITPY_COMPUTED_GOTO_SAVE_SPACE=$(CIRCUITPY_COMPUTED_GOTO_SAVE_SPACE)
 
-CIRCUITPY_CONSOLE_BLE ?= 0
-CFLAGS += -DCIRCUITPY_CONSOLE_BLE=$(CIRCUITPY_CONSOLE_BLE)
-
 CIRCUITPY_CONSOLE_UART ?= 0
 CFLAGS += -DCIRCUITPY_CONSOLE_UART=$(CIRCUITPY_CONSOLE_UART)
 
@@ -255,15 +252,6 @@ CFLAGS += -DCIRCUITPY_RANDOM=$(CIRCUITPY_RANDOM)
 CIRCUITPY_RE ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_RE=$(CIRCUITPY_RE)
 
-CIRCUITPY_REPL_BLE ?= 0
-CFLAGS += -DCIRCUITPY_REPL_BLE=$(CIRCUITPY_REPL_BLE)
-
-CIRCUITPY_REPL_UART ?= 0
-CFLAGS += -DCIRCUITPY_REPL_UART=$(CIRCUITPY_REPL_UART)
-
-CIRCUITPY_REPL_USB ?= 1
-CFLAGS += -DCIRCUITPY_REPL_USB=$(CIRCUITPY_REPL_USB)
-
 # Should busio.I2C() check for pullups?
 # Some boards in combination with certain peripherals may not want this.
 CIRCUITPY_REQUIRE_I2C_PULLUPS ?= 1
@@ -299,6 +287,9 @@ CFLAGS += -DCIRCUITPY_SDCARDIO=$(CIRCUITPY_SDCARDIO)
 CIRCUITPY_SDIOIO ?= 0
 CFLAGS += -DCIRCUITPY_SDIOIO=$(CIRCUITPY_SDIOIO)
 
+CIRCUITPY_SERIAL_BLE ?= 0
+CFLAGS += -DCIRCUITPY_SERIAL_BLE=$(CIRCUITPY_SERIAL_BLE)
+
 CIRCUITPY_SHARPDISPLAY ?= $(CIRCUITPY_FRAMEBUFFERIO)
 CFLAGS += -DCIRCUITPY_SHARPDISPLAY=$(CIRCUITPY_SHARPDISPLAY)
 
diff --git a/shared-bindings/_bleio/Characteristic.c b/shared-bindings/_bleio/Characteristic.c
index 3c9e189d48..b6b6ee69d4 100644
--- a/shared-bindings/_bleio/Characteristic.c
+++ b/shared-bindings/_bleio/Characteristic.c
@@ -45,7 +45,11 @@
 //|         ...
 //|
 
-//|     def add_to_service(self, service: Service, uuid: UUID, *, properties: int = 0, read_perm: int = Attribute.OPEN, write_perm: int = Attribute.OPEN, max_length: int = 20, fixed_length: bool = False, initial_value: Optional[ReadableBuffer] = None) -> Characteristic:
+//|     def add_to_service(self, service: Service, uuid: UUID, *, properties: int = 0,
+//|                        read_perm: int = Attribute.OPEN, write_perm: int = Attribute.OPEN,
+//|                        max_length: int = 20, fixed_length: bool = False,
+//|                        initial_value: Optional[ReadableBuffer] = None,
+//|                        user_description: Optional[str] = None) -> Characteristic:
 //|         """Create a new Characteristic object, and add it to this Service.
 //|
 //|         :param Service service: The service that will provide this characteristic
@@ -65,6 +69,7 @@
 //|         :param bool fixed_length: True if the characteristic value is of fixed length.
 //|         :param ~_typing.ReadableBuffer initial_value: The initial value for this characteristic. If not given, will be
 //|          filled with zeros.
+//|         :param str user_description: User friendly description of the characteristic
 //|
 //|         :return: the new Characteristic."""
 //|         ...
@@ -73,7 +78,7 @@ STATIC mp_obj_t bleio_characteristic_add_to_service(size_t n_args, const mp_obj_
     // class is arg[0], which we can ignore.
 
     enum { ARG_service, ARG_uuid, ARG_properties, ARG_read_perm, ARG_write_perm,
-           ARG_max_length, ARG_fixed_length, ARG_initial_value };
+           ARG_max_length, ARG_fixed_length, ARG_initial_value, ARG_user_description };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_service,  MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_uuid,  MP_ARG_REQUIRED | MP_ARG_OBJ },
@@ -83,6 +88,7 @@ STATIC mp_obj_t bleio_characteristic_add_to_service(size_t n_args, const mp_obj_
         { MP_QSTR_max_length, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 20} },
         { MP_QSTR_fixed_length, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
         { MP_QSTR_initial_value, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_user_description, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
     };
 
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -132,6 +138,11 @@ STATIC mp_obj_t bleio_characteristic_add_to_service(size_t n_args, const mp_obj_
         mp_raise_ValueError(translate("initial_value length is wrong"));
     }
 
+    const char *user_description = NULL;
+    if (args[ARG_user_description].u_obj != mp_const_none) {
+        user_description = mp_obj_str_get_str(args[ARG_user_description].u_obj);
+    }
+
     bleio_characteristic_obj_t *characteristic = m_new_obj(bleio_characteristic_obj_t);
     characteristic->base.type = &bleio_characteristic_type;
 
@@ -140,7 +151,8 @@ STATIC mp_obj_t bleio_characteristic_add_to_service(size_t n_args, const mp_obj_
     common_hal_bleio_characteristic_construct(
         characteristic, MP_OBJ_TO_PTR(service_obj), 0, MP_OBJ_TO_PTR(uuid_obj),
         properties, read_perm, write_perm,
-        max_length, fixed_length, &initial_value_bufinfo);
+        max_length, fixed_length, &initial_value_bufinfo,
+        user_description);
 
     return MP_OBJ_FROM_PTR(characteristic);
 }
diff --git a/shared-bindings/_bleio/Characteristic.h b/shared-bindings/_bleio/Characteristic.h
index 5807abf418..349dd5fdcf 100644
--- a/shared-bindings/_bleio/Characteristic.h
+++ b/shared-bindings/_bleio/Characteristic.h
@@ -44,7 +44,7 @@ extern bleio_uuid_obj_t *common_hal_bleio_characteristic_get_uuid(bleio_characte
 extern size_t common_hal_bleio_characteristic_get_max_length(bleio_characteristic_obj_t *self);
 extern size_t common_hal_bleio_characteristic_get_value(bleio_characteristic_obj_t *self, uint8_t *buf, size_t len);
 extern void common_hal_bleio_characteristic_add_descriptor(bleio_characteristic_obj_t *self, bleio_descriptor_obj_t *descriptor);
-extern void common_hal_bleio_characteristic_construct(bleio_characteristic_obj_t *self, bleio_service_obj_t *service, uint16_t handle, bleio_uuid_obj_t *uuid, bleio_characteristic_properties_t props, bleio_attribute_security_mode_t read_perm, bleio_attribute_security_mode_t write_perm, mp_int_t max_length, bool fixed_length, mp_buffer_info_t *initial_value_bufinfo);
+extern void common_hal_bleio_characteristic_construct(bleio_characteristic_obj_t *self, bleio_service_obj_t *service, uint16_t handle, bleio_uuid_obj_t *uuid, bleio_characteristic_properties_t props, bleio_attribute_security_mode_t read_perm, bleio_attribute_security_mode_t write_perm, mp_int_t max_length, bool fixed_length, mp_buffer_info_t *initial_value_bufinfo, const char *user_description);
 extern void common_hal_bleio_characteristic_set_cccd(bleio_characteristic_obj_t *self, bool notify, bool indicate);
 extern void common_hal_bleio_characteristic_set_value(bleio_characteristic_obj_t *self, mp_buffer_info_t *bufinfo);
 
diff --git a/shared-bindings/_bleio/CharacteristicBuffer.h b/shared-bindings/_bleio/CharacteristicBuffer.h
index e82e96ca96..1fd9dd838c 100644
--- a/shared-bindings/_bleio/CharacteristicBuffer.h
+++ b/shared-bindings/_bleio/CharacteristicBuffer.h
@@ -31,7 +31,15 @@
 
 extern const mp_obj_type_t bleio_characteristic_buffer_type;
 
-extern void common_hal_bleio_characteristic_buffer_construct(bleio_characteristic_buffer_obj_t *self, bleio_characteristic_obj_t *characteristic, mp_float_t timeout, size_t buffer_size);
+void _common_hal_bleio_characteristic_buffer_construct(bleio_characteristic_buffer_obj_t *self,
+    bleio_characteristic_obj_t *characteristic,
+    mp_float_t timeout,
+    uint8_t *buffer, size_t buffer_size,
+    void *static_handler_entry);
+void common_hal_bleio_characteristic_buffer_construct(bleio_characteristic_buffer_obj_t *self,
+    bleio_characteristic_obj_t *characteristic,
+    mp_float_t timeout,
+    size_t buffer_size);
 uint32_t common_hal_bleio_characteristic_buffer_read(bleio_characteristic_buffer_obj_t *self, uint8_t *data, size_t len, int *errcode);
 uint32_t common_hal_bleio_characteristic_buffer_rx_characters_available(bleio_characteristic_buffer_obj_t *self);
 void common_hal_bleio_characteristic_buffer_clear_rx_buffer(bleio_characteristic_buffer_obj_t *self);
diff --git a/shared-bindings/_bleio/Service.h b/shared-bindings/_bleio/Service.h
index b2a35793fb..eb1d29b57e 100644
--- a/shared-bindings/_bleio/Service.h
+++ b/shared-bindings/_bleio/Service.h
@@ -44,6 +44,6 @@ extern bleio_uuid_obj_t *common_hal_bleio_service_get_uuid(bleio_service_obj_t *
 extern mp_obj_tuple_t *common_hal_bleio_service_get_characteristics(bleio_service_obj_t *self);
 extern bool common_hal_bleio_service_get_is_remote(bleio_service_obj_t *self);
 extern bool common_hal_bleio_service_get_is_secondary(bleio_service_obj_t *self);
-extern void common_hal_bleio_service_add_characteristic(bleio_service_obj_t *self, bleio_characteristic_obj_t *characteristic, mp_buffer_info_t *initial_value_bufinfo);
+extern void common_hal_bleio_service_add_characteristic(bleio_service_obj_t *self, bleio_characteristic_obj_t *characteristic, mp_buffer_info_t *initial_value_bufinfo, const char *user_description);
 
 #endif // MICROPY_INCLUDED_SHARED_BINDINGS_BLEIO_SERVICE_H
diff --git a/supervisor/shared/bluetooth/bluetooth.c b/supervisor/shared/bluetooth/bluetooth.c
new file mode 100644
index 0000000000..abfbecd8c8
--- /dev/null
+++ b/supervisor/shared/bluetooth/bluetooth.c
@@ -0,0 +1,232 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 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 <string.h>
+
+#include "supervisor/shared/bluetooth/bluetooth.h"
+
+#include "shared-bindings/_bleio/__init__.h"
+#include "shared-bindings/_bleio/Adapter.h"
+#if defined(CIRCUITPY_BOOT_BUTTON)
+#include "shared-bindings/digitalio/DigitalInOut.h"
+#endif
+#include "shared-bindings/microcontroller/Processor.h"
+#include "shared-bindings/microcontroller/ResetReason.h"
+#include "shared-module/storage/__init__.h"
+
+#include "bluetooth/ble_drv.h"
+
+#include "common-hal/_bleio/__init__.h"
+
+#include "supervisor/shared/status_leds.h"
+#include "supervisor/shared/tick.h"
+
+#include "py/mpstate.h"
+
+#if CIRCUITPY_BLE_FILE_SERVICE
+#include "supervisor/shared/bluetooth/file_transfer.h"
+#endif
+
+#if CIRCUITPY_SERIAL_BLE
+#include "supervisor/shared/bluetooth/serial.h"
+#endif
+
+// This standard advertisement advertises the CircuitPython editing service and a CIRCUITPY short name.
+const uint8_t public_advertising_data[] = { 0x02, 0x01, 0x06, // 0-2 Flags
+                                            0x02, 0x0a, 0xd8,  // 3-5 TX power level -40
+                                            #if CIRCUITPY_BLE_FILE_SERVICE
+                                            0x03, 0x02, 0xbb, 0xfe,  // 6 - 9 Incomplete service list (File Transfer service)
+                                            #endif
+                                            0x0e, 0xff, 0x22, 0x08,  // 10 - 13 Adafruit Manufacturer Data
+                                            0x0a, 0x04, 0x00,        // 14 - 16 Creator ID / Creation ID
+                                            CIRCUITPY_CREATOR_ID & 0xff,              // 17 - 20 Creator ID
+                                            (CIRCUITPY_CREATOR_ID >> 8) & 0xff,
+                                            (CIRCUITPY_CREATOR_ID >> 16) & 0xff,
+                                            (CIRCUITPY_CREATOR_ID >> 24) & 0xff,
+                                            CIRCUITPY_CREATION_ID & 0xff,              // 21 - 24 Creation ID
+                                            (CIRCUITPY_CREATION_ID >> 8) & 0xff,
+                                            (CIRCUITPY_CREATION_ID >> 16) & 0xff,
+                                            (CIRCUITPY_CREATION_ID >> 24) & 0xff,
+                                            0x05, 0x08, 0x43, 0x49, 0x52, 0x43  // 25 - 31 - Short name
+};
+const uint8_t private_advertising_data[] = { 0x02, 0x01, 0x06, // 0-2 Flags
+                                             0x02, 0x0a, 0x00 // 3-5 TX power level 0
+};
+// This scan response advertises the full CIRCUITPYXXXX device name.
+uint8_t circuitpython_scan_response_data[] = {
+    0x0e, 0x09, 0x43, 0x49, 0x52, 0x43, 0x55, 0x49, 0x54, 0x50, 0x59, 0x00, 0x00, 0x00, 0x00,
+    #if CIRCUITPY_SERIAL_BLE
+    0x06, 0x10, 0x9e, 0xca, 0xdc, 0x24, 0x0e, 0xe5, 0xa9, 0xe0, 0x93, 0xf3, 0xa3, 0xb5, 0x00, 0x00, 0x40, 0x6e,
+    #endif
+};
+
+bool boot_in_discovery_mode = false;
+bool advertising = false;
+
+STATIC void supervisor_bluetooth_start_advertising(void) {
+    bool is_connected = common_hal_bleio_adapter_get_connected(&common_hal_bleio_adapter_obj);
+    if (is_connected) {
+        return;
+    }
+    bool bonded = common_hal_bleio_adapter_is_bonded_to_central(&common_hal_bleio_adapter_obj);
+    #if CIRCUITPY_USB
+    // Don't advertise when we have USB instead of BLE.
+    if (!bonded && !boot_in_discovery_mode) {
+        // mp_printf(&mp_plat_print, "skipping advertising\n");
+        return;
+    }
+    #endif
+    uint32_t timeout = 0;
+    float interval = 0.1f;
+    int tx_power = 0;
+    const uint8_t *adv = private_advertising_data;
+    size_t adv_len = sizeof(private_advertising_data);
+    const uint8_t *scan_response = NULL;
+    size_t scan_response_len = 0;
+    // Advertise with less power when doing so publicly to reduce who can hear us. This will make it
+    // harder for someone with bad intentions to pair from a distance.
+    if (!bonded) {
+        tx_power = -40;
+        adv = public_advertising_data;
+        adv_len = sizeof(public_advertising_data);
+        scan_response = circuitpython_scan_response_data;
+        scan_response_len = sizeof(circuitpython_scan_response_data);
+    }
+    uint32_t status = _common_hal_bleio_adapter_start_advertising(&common_hal_bleio_adapter_obj,
+        true,
+        bonded, // Advertise anonymously if we are bonded
+        timeout,
+        interval,
+        adv,
+        adv_len,
+        scan_response,
+        scan_response_len,
+        tx_power,
+        NULL);
+    // This may fail if we are already advertising.
+    advertising = status == NRF_SUCCESS;
+}
+
+#define BLE_DISCOVERY_DATA_GUARD 0xbb0000bb
+#define BLE_DISCOVERY_DATA_GUARD_MASK 0xff0000ff
+
+void supervisor_bluetooth_init(void) {
+    uint32_t reset_state = port_get_saved_word();
+    uint32_t ble_mode = 0;
+    if ((reset_state & BLE_DISCOVERY_DATA_GUARD_MASK) == BLE_DISCOVERY_DATA_GUARD) {
+        ble_mode = (reset_state & ~BLE_DISCOVERY_DATA_GUARD_MASK) >> 8;
+    }
+    const mcu_reset_reason_t reset_reason = common_hal_mcu_processor_get_reset_reason();
+    boot_in_discovery_mode = false;
+    if (reset_reason != RESET_REASON_POWER_ON &&
+        reset_reason != RESET_REASON_RESET_PIN &&
+        reset_reason != RESET_REASON_UNKNOWN &&
+        reset_reason != RESET_REASON_SOFTWARE) {
+        return;
+    }
+
+    if (ble_mode == 0) {
+        port_set_saved_word(BLE_DISCOVERY_DATA_GUARD | (0x01 << 8));
+    }
+    // Wait for a while to allow for reset.
+
+    #ifdef CIRCUITPY_BOOT_BUTTON
+    digitalio_digitalinout_obj_t boot_button;
+    common_hal_digitalio_digitalinout_construct(&boot_button, CIRCUITPY_BOOT_BUTTON);
+    common_hal_digitalio_digitalinout_switch_to_input(&boot_button, PULL_UP);
+    #endif
+    uint64_t start_ticks = supervisor_ticks_ms64();
+    uint64_t diff = 0;
+    if (ble_mode != 0) {
+        #ifdef CIRCUITPY_STATUS_LED
+        new_status_color(0x0000ff);
+        #endif
+        common_hal_bleio_adapter_erase_bonding(&common_hal_bleio_adapter_obj);
+        boot_in_discovery_mode = true;
+        reset_state = 0x0;
+    }
+    while (diff < 1000) {
+        #ifdef CIRCUITPY_STATUS_LED
+        // Blink on for 100, off for 100, on for 100, off for 100 and on for 200
+        bool led_on = ble_mode != 0 || (diff % 150) <= 75;
+        if (led_on) {
+            new_status_color(0x0000ff);
+        } else {
+            new_status_color(BLACK);
+        }
+        #endif
+        #ifdef CIRCUITPY_BOOT_BUTTON
+        if (!common_hal_digitalio_digitalinout_get_value(&boot_button)) {
+            boot_in_discovery_mode = true;
+            break;
+        }
+        #endif
+        diff = supervisor_ticks_ms64() - start_ticks;
+    }
+    #if CIRCUITPY_STATUS_LED
+    new_status_color(BLACK);
+    status_led_deinit();
+    #endif
+    port_set_saved_word(reset_state);
+}
+
+STATIC bool was_connected;
+void supervisor_bluetooth_background(void) {
+    bool is_connected = common_hal_bleio_adapter_get_connected(&common_hal_bleio_adapter_obj);
+    if (was_connected && !is_connected) {
+        #if CIRCUITPY_BLE_FILE_SERVICE
+        supervisor_bluetooth_file_transfer_disconnected();
+        #endif
+    }
+    was_connected = is_connected;
+    if (!is_connected) {
+        supervisor_bluetooth_start_advertising();
+        return;
+    }
+
+    #if CIRCUITPY_BLE_FILE_SERVICE
+    supervisor_bluetooth_file_transfer_background();
+    #endif
+}
+
+void supervisor_start_bluetooth(void) {
+    #if !CIRCUITPY_BLE_FILE_SERVICE && !CIRCUITPY_SERIAL_BLE
+    return;
+    #endif
+
+    common_hal_bleio_adapter_set_enabled(&common_hal_bleio_adapter_obj, true);
+
+    #if CIRCUITPY_BLE_FILE_SERVICE
+    supervisor_start_bluetooth_file_transfer();
+    #endif
+
+    #if CIRCUITPY_SERIAL_BLE
+    supervisor_start_bluetooth_serial();
+    #endif
+
+    // Kick off advertisments
+    supervisor_bluetooth_background();
+}
diff --git a/supervisor/shared/bluetooth.h b/supervisor/shared/bluetooth/bluetooth.h
similarity index 92%
rename from supervisor/shared/bluetooth.h
rename to supervisor/shared/bluetooth/bluetooth.h
index 3784463af3..a8f3e8b159 100644
--- a/supervisor/shared/bluetooth.h
+++ b/supervisor/shared/bluetooth/bluetooth.h
@@ -29,12 +29,8 @@
 
 #include <stdbool.h>
 
-#include "shared-bindings/_bleio/Characteristic.h"
-
 void supervisor_bluetooth_background(void);
 void supervisor_bluetooth_init(void);
 void supervisor_start_bluetooth(void);
 
-extern bleio_characteristic_obj_t supervisor_ble_transfer_characteristic;
-
 #endif // MICROPY_INCLUDED_SUPERVISOR_SHARED_BLUETOOTH_H
diff --git a/supervisor/shared/bluetooth.c b/supervisor/shared/bluetooth/file_transfer.c
similarity index 66%
rename from supervisor/shared/bluetooth.c
rename to supervisor/shared/bluetooth/file_transfer.c
index f89d8e3334..dcd3d36e78 100644
--- a/supervisor/shared/bluetooth.c
+++ b/supervisor/shared/bluetooth/file_transfer.c
@@ -24,23 +24,8 @@
  * THE SOFTWARE.
  */
 
-#if !CIRCUITPY_BLE_FILE_SERVICE
-
-void supervisor_bluetooth_init(void) {
-}
-
-void supervisor_start_bluetooth(void) {
-}
-
-void supervisor_bluetooth_background(void) {
-}
-
-#else
-
 #include <string.h>
 
-#include "supervisor/shared/bluetooth.h"
-
 #include "extmod/vfs.h"
 #include "extmod/vfs_fat.h"
 
@@ -50,11 +35,6 @@ void supervisor_bluetooth_background(void) {
 #include "shared-bindings/_bleio/PacketBuffer.h"
 #include "shared-bindings/_bleio/Service.h"
 #include "shared-bindings/_bleio/UUID.h"
-#if defined(CIRCUITPY_BOOT_BUTTON)
-#include "shared-bindings/digitalio/DigitalInOut.h"
-#endif
-#include "shared-bindings/microcontroller/Processor.h"
-#include "shared-bindings/microcontroller/ResetReason.h"
 #include "shared-module/storage/__init__.h"
 
 #include "bluetooth/ble_drv.h"
@@ -62,169 +42,34 @@ void supervisor_bluetooth_background(void) {
 #include "common-hal/_bleio/__init__.h"
 
 #include "supervisor/shared/autoreload.h"
-#include "supervisor/shared/status_leds.h"
+#include "supervisor/shared/bluetooth/file_transfer_protocol.h"
 #include "supervisor/shared/tick.h"
 #include "supervisor/usb.h"
 
 #include "py/mpstate.h"
 
-bleio_service_obj_t supervisor_ble_service;
-bleio_uuid_obj_t supervisor_ble_service_uuid;
-bleio_characteristic_obj_t supervisor_ble_version_characteristic;
-bleio_uuid_obj_t supervisor_ble_version_uuid;
-bleio_characteristic_obj_t supervisor_ble_transfer_characteristic;
-bleio_uuid_obj_t supervisor_ble_transfer_uuid;
+STATIC bleio_service_obj_t supervisor_ble_service;
+STATIC bleio_uuid_obj_t supervisor_ble_service_uuid;
+STATIC bleio_characteristic_obj_t supervisor_ble_version_characteristic;
+STATIC bleio_uuid_obj_t supervisor_ble_version_uuid;
+STATIC bleio_characteristic_obj_t supervisor_ble_transfer_characteristic;
+STATIC bleio_uuid_obj_t supervisor_ble_transfer_uuid;
 
 // This is the base UUID for the file transfer service.
 const uint8_t file_transfer_base_uuid[16] = {0x72, 0x65, 0x66, 0x73, 0x6e, 0x61, 0x72, 0x54, 0x65, 0x6c, 0x69, 0x46, 0x00, 0x00, 0xaf, 0xad };
-// This standard advertisement advertises the CircuitPython editing service and a CIRCUITPY short name.
-const uint8_t public_advertising_data[] = { 0x02, 0x01, 0x06, // 0-2 Flags
-                                            0x02, 0x0a, 0xd8,  // 3-5 TX power level -40
-                                            0x03, 0x02, 0xbb, 0xfe,  // 6 - 9 Incomplete service list (File Transfer service)
-                                            0x0e, 0xff, 0x22, 0x08,  // 10 - 13 Adafruit Manufacturer Data
-                                            0x0a, 0x04, 0x00,        // 14 - 16 Creator ID / Creation ID
-                                            CIRCUITPY_CREATOR_ID & 0xff,              // 17 - 20 Creator ID
-                                            (CIRCUITPY_CREATOR_ID >> 8) & 0xff,
-                                            (CIRCUITPY_CREATOR_ID >> 16) & 0xff,
-                                            (CIRCUITPY_CREATOR_ID >> 24) & 0xff,
-                                            CIRCUITPY_CREATION_ID & 0xff,              // 21 - 24 Creation ID
-                                            (CIRCUITPY_CREATION_ID >> 8) & 0xff,
-                                            (CIRCUITPY_CREATION_ID >> 16) & 0xff,
-                                            (CIRCUITPY_CREATION_ID >> 24) & 0xff,
-                                            0x05, 0x08, 0x43, 0x49, 0x52, 0x43  // 25 - 31 - Short name
-};
-const uint8_t private_advertising_data[] = { 0x02, 0x01, 0x06, // 0-2 Flags
-                                             0x02, 0x0a, 0x00 // 3-5 TX power level 0
-};
-// This scan response advertises the full CIRCUITPYXXXX device name.
-uint8_t circuitpython_scan_response_data[15] = {0x0e, 0x09, 0x43, 0x49, 0x52, 0x43, 0x55, 0x49, 0x54, 0x50, 0x59, 0x00, 0x00, 0x00, 0x00};
-mp_obj_list_t service_list;
-mp_obj_t service_list_items[1];
-mp_obj_list_t characteristic_list;
-mp_obj_t characteristic_list_items[2];
+
+STATIC mp_obj_list_t characteristic_list;
+STATIC mp_obj_t characteristic_list_items[2];
 // 2 * 10 ringbuf packets, 512 for a disk sector and 12 for the file transfer write header.
 #define PACKET_BUFFER_SIZE (2 * 10 + 512 + 12)
 // uint32_t so its aligned
-uint32_t _buffer[PACKET_BUFFER_SIZE / 4 + 1];
-uint32_t _outgoing1[BLE_GATTS_VAR_ATTR_LEN_MAX / 4];
-uint32_t _outgoing2[BLE_GATTS_VAR_ATTR_LEN_MAX / 4];
-ble_drv_evt_handler_entry_t static_handler_entry;
-bleio_packet_buffer_obj_t _transfer_packet_buffer;
-bool boot_in_discovery_mode = false;
-bool advertising = false;
-
-STATIC void supervisor_bluetooth_start_advertising(void) {
-    bool is_connected = common_hal_bleio_adapter_get_connected(&common_hal_bleio_adapter_obj);
-    if (is_connected) {
-        return;
-    }
-    bool bonded = common_hal_bleio_adapter_is_bonded_to_central(&common_hal_bleio_adapter_obj);
-    #if CIRCUITPY_USB
-    // Don't advertise when we have USB instead of BLE.
-    if (!bonded && !boot_in_discovery_mode) {
-        // mp_printf(&mp_plat_print, "skipping advertising\n");
-        return;
-    }
-    #endif
-    uint32_t timeout = 0;
-    float interval = 0.1f;
-    int tx_power = 0;
-    const uint8_t *adv = private_advertising_data;
-    size_t adv_len = sizeof(private_advertising_data);
-    const uint8_t *scan_response = NULL;
-    size_t scan_response_len = 0;
-    // Advertise with less power when doing so publicly to reduce who can hear us. This will make it
-    // harder for someone with bad intentions to pair from a distance.
-    if (!bonded) {
-        tx_power = -40;
-        adv = public_advertising_data;
-        adv_len = sizeof(public_advertising_data);
-        scan_response = circuitpython_scan_response_data;
-        scan_response_len = sizeof(circuitpython_scan_response_data);
-    }
-    uint32_t status = _common_hal_bleio_adapter_start_advertising(&common_hal_bleio_adapter_obj,
-        true,
-        bonded, // Advertise anonymously if we are bonded
-        timeout,
-        interval,
-        adv,
-        adv_len,
-        scan_response,
-        scan_response_len,
-        tx_power,
-        NULL);
-    // This may fail if we are already advertising.
-    advertising = status == NRF_SUCCESS;
-}
-
-#define BLE_DISCOVERY_DATA_GUARD 0xbb0000bb
-#define BLE_DISCOVERY_DATA_GUARD_MASK 0xff0000ff
-
-void supervisor_bluetooth_init(void) {
-    uint32_t reset_state = port_get_saved_word();
-    uint32_t ble_mode = 0;
-    if ((reset_state & BLE_DISCOVERY_DATA_GUARD_MASK) == BLE_DISCOVERY_DATA_GUARD) {
-        ble_mode = (reset_state & ~BLE_DISCOVERY_DATA_GUARD_MASK) >> 8;
-    }
-    const mcu_reset_reason_t reset_reason = common_hal_mcu_processor_get_reset_reason();
-    boot_in_discovery_mode = false;
-    if (reset_reason != RESET_REASON_POWER_ON &&
-        reset_reason != RESET_REASON_RESET_PIN &&
-        reset_reason != RESET_REASON_UNKNOWN &&
-        reset_reason != RESET_REASON_SOFTWARE) {
-        return;
-    }
-
-    // ble_mode = 1;
-
-    if (ble_mode == 0) {
-        port_set_saved_word(BLE_DISCOVERY_DATA_GUARD | (0x01 << 8));
-    }
-    // Wait for a while to allow for reset.
-
-    #ifdef CIRCUITPY_BOOT_BUTTON
-    digitalio_digitalinout_obj_t boot_button;
-    common_hal_digitalio_digitalinout_construct(&boot_button, CIRCUITPY_BOOT_BUTTON);
-    common_hal_digitalio_digitalinout_switch_to_input(&boot_button, PULL_UP);
-    #endif
-    uint64_t start_ticks = supervisor_ticks_ms64();
-    uint64_t diff = 0;
-    if (ble_mode != 0) {
-        #ifdef CIRCUITPY_STATUS_LED
-        new_status_color(0x0000ff);
-        #endif
-        common_hal_bleio_adapter_erase_bonding(&common_hal_bleio_adapter_obj);
-        boot_in_discovery_mode = true;
-        reset_state = 0x0;
-    }
-    while (diff < 1000) {
-        #ifdef CIRCUITPY_STATUS_LED
-        // Blink on for 100, off for 100, on for 100, off for 100 and on for 200
-        bool led_on = ble_mode != 0 || (diff % 150) <= 75;
-        if (led_on) {
-            new_status_color(0x0000ff);
-        } else {
-            new_status_color(BLACK);
-        }
-        #endif
-        #ifdef CIRCUITPY_BOOT_BUTTON
-        if (!common_hal_digitalio_digitalinout_get_value(&boot_button)) {
-            boot_in_discovery_mode = true;
-            break;
-        }
-        #endif
-        diff = supervisor_ticks_ms64() - start_ticks;
-    }
-    #if CIRCUITPY_STATUS_LED
-    new_status_color(BLACK);
-    status_led_deinit();
-    #endif
-    port_set_saved_word(reset_state);
-}
-
-void supervisor_start_bluetooth(void) {
-    common_hal_bleio_adapter_set_enabled(&common_hal_bleio_adapter_obj, true);
+STATIC uint32_t _buffer[PACKET_BUFFER_SIZE / 4 + 1];
+STATIC uint32_t _outgoing1[BLE_GATTS_VAR_ATTR_LEN_MAX / 4];
+STATIC uint32_t _outgoing2[BLE_GATTS_VAR_ATTR_LEN_MAX / 4];
+STATIC ble_drv_evt_handler_entry_t static_handler_entry;
+STATIC bleio_packet_buffer_obj_t _transfer_packet_buffer;
 
+void supervisor_start_bluetooth_file_transfer(void) {
     supervisor_ble_service_uuid.base.type = &bleio_uuid_type;
     common_hal_bleio_uuid_construct(&supervisor_ble_service_uuid, 0xfebb, NULL);
 
@@ -249,7 +94,8 @@ void supervisor_start_bluetooth(void) {
         SECURITY_MODE_NO_ACCESS,
         4,                                       // max length
         true,                                       // fixed length
-        NULL);                                       // no initial value
+        NULL,                                       // no initial value
+        NULL); // no description
 
     uint32_t version = 1;
     mp_buffer_info_t bufinfo;
@@ -269,71 +115,24 @@ void supervisor_start_bluetooth(void) {
         SECURITY_MODE_ENC_NO_MITM,
         BLE_GATTS_VAR_ATTR_LEN_MAX,                  // max length
         false,                                       // fixed length
-        NULL);                                       // no initial value
+        NULL,                                       // no initial valuen
+        NULL);
 
     _common_hal_bleio_packet_buffer_construct(
         &_transfer_packet_buffer, &supervisor_ble_transfer_characteristic,
         _buffer, PACKET_BUFFER_SIZE,
         _outgoing1, _outgoing2, BLE_GATTS_VAR_ATTR_LEN_MAX,
         &static_handler_entry);
-
-    // Kick off advertisments
-    supervisor_bluetooth_background();
 }
 
 #define COMMAND_SIZE 1024
 
 #define ANY_COMMAND 0x00
 #define THIS_COMMAND 0x01
-#define READ 0x10
-#define READ_DATA 0x11
-#define READ_PACING 0x12
-#define WRITE 0x20
-#define WRITE_PACING 0x21
-#define WRITE_DATA 0x22
-#define DELETE 0x30
-#define DELETE_STATUS 0x31
-#define MKDIR 0x40
-#define MKDIR_STATUS 0x41
-#define LISTDIR 0x50
-#define LISTDIR_ENTRY 0x51
-
-#define STATUS_OK 0x01
-#define STATUS_ERROR 0x02
-#define STATUS_ERROR_NO_FILE 0x03
-#define STATUS_ERROR_PROTOCOL 0x04
 
 // Used by read and write.
-FIL active_file;
-
-struct read_command {
-    uint8_t command;
-    uint8_t reserved;
-    uint16_t path_length;
-    uint32_t chunk_offset;
-    uint32_t chunk_size;
-    uint8_t path[];
-};
-
-struct read_data {
-    uint8_t command;
-    uint8_t status;
-    uint16_t reserved;
-    uint32_t chunk_offset;
-    uint32_t total_length;
-    uint32_t data_size;
-    uint8_t data[];
-};
-
-struct read_pacing {
-    uint8_t command;
-    uint8_t status;
-    uint16_t reserved;
-    uint32_t chunk_offset;
-    uint32_t chunk_size;
-};
-
-uint8_t _process_read(const uint8_t *raw_buf, size_t command_len) {
+STATIC FIL active_file;
+STATIC uint8_t _process_read(const uint8_t *raw_buf, size_t command_len) {
     struct read_command *command = (struct read_command *)raw_buf;
     size_t header_size = 12;
     size_t response_size = 16;
@@ -390,7 +189,7 @@ uint8_t _process_read(const uint8_t *raw_buf, size_t command_len) {
     return READ_PACING;
 }
 
-uint8_t _process_read_pacing(const uint8_t *command, size_t command_len) {
+STATIC uint8_t _process_read_pacing(const uint8_t *command, size_t command_len) {
     size_t response_size = 4 * sizeof(uint32_t);
     uint32_t response[response_size / sizeof(uint32_t)];
     uint8_t *response_bytes = (uint8_t *)response;
@@ -429,35 +228,9 @@ uint8_t _process_read_pacing(const uint8_t *command, size_t command_len) {
 }
 
 // Used by write and write data to know when the write is complete.
-size_t total_write_length;
+STATIC size_t total_write_length;
 
-struct write_command {
-    uint8_t command;
-    uint8_t reserved;
-    uint16_t path_length;
-    uint32_t offset;
-    uint32_t total_length;
-    uint8_t path[];
-};
-
-struct write_data {
-    uint8_t command;
-    uint8_t status;
-    uint16_t reserved;
-    uint32_t offset;
-    uint32_t data_size;
-    uint8_t data[];
-};
-
-struct write_pacing {
-    uint8_t command;
-    uint8_t status;
-    uint16_t reserved;
-    uint32_t offset;
-    uint32_t free_space;
-};
-
-uint8_t _process_write(const uint8_t *raw_buf, size_t command_len) {
+STATIC uint8_t _process_write(const uint8_t *raw_buf, size_t command_len) {
     struct write_command *command = (struct write_command *)raw_buf;
     size_t header_size = 12;
     struct write_pacing response;
@@ -508,7 +281,7 @@ uint8_t _process_write(const uint8_t *raw_buf, size_t command_len) {
     return WRITE_DATA;
 }
 
-uint8_t _process_write_data(const uint8_t *raw_buf, size_t command_len) {
+STATIC uint8_t _process_write_data(const uint8_t *raw_buf, size_t command_len) {
     struct write_data *command = (struct write_data *)raw_buf;
     size_t header_size = 12;
     struct write_pacing response;
@@ -561,28 +334,16 @@ uint8_t _process_write_data(const uint8_t *raw_buf, size_t command_len) {
     return WRITE_DATA;
 }
 
-struct delete_command {
-    uint8_t command;
-    uint8_t reserved;
-    uint16_t path_length;
-    uint8_t path[];
-};
-
-struct delete_response {
-    uint8_t command;
-    uint8_t status;
-};
-
-uint8_t _process_delete(const uint8_t *raw_buf, size_t command_len) {
+STATIC uint8_t _process_delete(const uint8_t *raw_buf, size_t command_len) {
     const struct delete_command *command = (struct delete_command *)raw_buf;
     size_t header_size = 4;
-    struct delete_response response;
+    struct delete_status response;
     response.command = DELETE_STATUS;
     response.status = STATUS_OK;
     if (command->path_length > (COMMAND_SIZE - header_size - 1)) { // -1 for the null we'll write
         // TODO: throw away any more packets of path.
         response.status = STATUS_ERROR;
-        common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct delete_response), NULL, 0);
+        common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct delete_status), NULL, 0);
         return ANY_COMMAND;
     }
     // We need to receive another packet to have the full path.
@@ -596,32 +357,20 @@ uint8_t _process_delete(const uint8_t *raw_buf, size_t command_len) {
     if (result != FR_OK) {
         response.status = STATUS_ERROR;
     }
-    common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct delete_response), NULL, 0);
+    common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct delete_status), NULL, 0);
     return ANY_COMMAND;
 }
 
-struct mkdir_command {
-    uint8_t command;
-    uint8_t reserved;
-    uint16_t path_length;
-    uint8_t path[];
-};
-
-struct mkdir_response {
-    uint8_t command;
-    uint8_t status;
-};
-
-uint8_t _process_mkdir(const uint8_t *raw_buf, size_t command_len) {
+STATIC uint8_t _process_mkdir(const uint8_t *raw_buf, size_t command_len) {
     const struct mkdir_command *command = (struct mkdir_command *)raw_buf;
     size_t header_size = 4;
-    struct mkdir_response response;
+    struct mkdir_status response;
     response.command = MKDIR_STATUS;
     response.status = STATUS_OK;
     if (command->path_length > (COMMAND_SIZE - header_size - 1)) { // -1 for the null we'll write
         // TODO: throw away any more packets of path.
         response.status = STATUS_ERROR;
-        common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct mkdir_response), NULL, 0);
+        common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct mkdir_status), NULL, 0);
         return ANY_COMMAND;
     }
     // We need to receive another packet to have the full path.
@@ -636,29 +385,11 @@ uint8_t _process_mkdir(const uint8_t *raw_buf, size_t command_len) {
     if (result != FR_OK) {
         response.status = STATUS_ERROR;
     }
-    common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct mkdir_response), NULL, 0);
+    common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct mkdir_status), NULL, 0);
     return ANY_COMMAND;
 }
 
-struct listdir_command {
-    uint8_t command;
-    uint8_t reserved;
-    uint16_t path_length;
-    uint8_t path[];
-};
-
-struct listdir_entry {
-    uint8_t command;
-    uint8_t status;
-    uint16_t path_length;
-    uint32_t entry_number;
-    uint32_t entry_count;
-    uint32_t flags;
-    uint32_t file_size;
-    uint8_t path[];
-};
-
-uint8_t _process_listdir(uint8_t *raw_buf, size_t command_len) {
+STATIC uint8_t _process_listdir(uint8_t *raw_buf, size_t command_len) {
     const struct listdir_command *command = (struct listdir_command *)raw_buf;
     struct listdir_entry *entry = (struct listdir_entry *)raw_buf;
     size_t header_size = 4;
@@ -740,22 +471,10 @@ uint8_t _process_listdir(uint8_t *raw_buf, size_t command_len) {
 
 // Background state that must live across background calls. After the _process
 // helpers to force them to not use them.
-uint8_t current_command[COMMAND_SIZE] __attribute__ ((aligned(4)));
-volatile size_t current_offset;
-uint8_t next_command;
-bool was_connected;
-void supervisor_bluetooth_background(void) {
-    bool is_connected = common_hal_bleio_adapter_get_connected(&common_hal_bleio_adapter_obj);
-    if (was_connected && !is_connected) {
-        f_close(&active_file);
-    }
-    was_connected = is_connected;
-    if (!is_connected) {
-        next_command = 0;
-        supervisor_bluetooth_start_advertising();
-        return;
-    }
-
+STATIC uint8_t current_command[COMMAND_SIZE] __attribute__ ((aligned(4)));
+STATIC volatile size_t current_offset;
+STATIC uint8_t next_command;
+void supervisor_bluetooth_file_transfer_background(void) {
     mp_int_t size = 1;
     while (size > 0) {
         size = common_hal_bleio_packet_buffer_readinto(&_transfer_packet_buffer, current_command + current_offset, COMMAND_SIZE - current_offset);
@@ -810,4 +529,7 @@ void supervisor_bluetooth_background(void) {
     }
 }
 
-#endif // #else
+void supervisor_bluetooth_file_transfer_disconnected(void) {
+    next_command = ANY_COMMAND;
+    f_close(&active_file);
+}
diff --git a/ports/nrf/bluetooth/ble_uart.h b/supervisor/shared/bluetooth/file_transfer.h
similarity index 73%
rename from ports/nrf/bluetooth/ble_uart.h
rename to supervisor/shared/bluetooth/file_transfer.h
index d86e6293ae..e27924e7fa 100644
--- a/ports/nrf/bluetooth/ble_uart.h
+++ b/supervisor/shared/bluetooth/file_transfer.h
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2017 Glenn Ruben Bakke
+ * Copyright (c) 2021 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
@@ -24,17 +24,13 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_NRF_BLUETOOTH_BLE_UART_H
-#define MICROPY_INCLUDED_NRF_BLUETOOTH_BLE_UART_H
+#ifndef MICROPY_INCLUDED_SUPERVISOR_SHARED_BLUETOOTH_FILE_TRANSFER_H
+#define MICROPY_INCLUDED_SUPERVISOR_SHARED_BLUETOOTH_FILE_TRANSFER_H
 
 #include <stdbool.h>
 
-#include "ble_drv.h"
+void supervisor_bluetooth_file_transfer_background(void);
+void supervisor_start_bluetooth_file_transfer(void);
+void supervisor_bluetooth_file_transfer_disconnected(void);
 
-void ble_uart_init(void);
-bool ble_uart_connected(void);
-char ble_uart_rx_chr(void);
-bool ble_uart_stdin_any(void);
-void ble_uart_stdout_tx_str(const char *text);
-
-#endif // MICROPY_INCLUDED_NRF_BLUETOOTH_BLE_UART_H
+#endif // MICROPY_INCLUDED_SUPERVISOR_SHARED_BLUETOOTH_FILE_TRANSFER_H
diff --git a/supervisor/shared/bluetooth/file_transfer_protocol.h b/supervisor/shared/bluetooth/file_transfer_protocol.h
new file mode 100644
index 0000000000..2c8fe1e5e7
--- /dev/null
+++ b/supervisor/shared/bluetooth/file_transfer_protocol.h
@@ -0,0 +1,149 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 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_SUPERVISOR_SHARED_BLUETOOTH_FILE_TRANSFER_PROTOCOL_H
+#define MICROPY_INCLUDED_SUPERVISOR_SHARED_BLUETOOTH_FILE_TRANSFER_PROTOCOL_H
+
+#include <stdint.h>
+
+// See https://github.com/adafruit/Adafruit_CircuitPython_BLE_File_Transfer
+// for full protocol documentation and a Python client API.
+
+// 0x00 - 0x0f are never used by the protocol as a command
+#define READ 0x10
+struct read_command {
+    uint8_t command;
+    uint8_t reserved;
+    uint16_t path_length;
+    uint32_t chunk_offset;
+    uint32_t chunk_size;
+    uint8_t path[];
+};
+
+#define READ_DATA 0x11
+struct read_data {
+    uint8_t command;
+    uint8_t status;
+    uint16_t reserved;
+    uint32_t chunk_offset;
+    uint32_t total_length;
+    uint32_t data_size;
+    uint8_t data[];
+};
+
+#define READ_PACING 0x12
+struct read_pacing {
+    uint8_t command;
+    uint8_t status;
+    uint16_t reserved;
+    uint32_t chunk_offset;
+    uint32_t chunk_size;
+};
+
+#define WRITE 0x20
+struct write_command {
+    uint8_t command;
+    uint8_t reserved;
+    uint16_t path_length;
+    uint32_t offset;
+    uint32_t total_length;
+    uint8_t path[];
+};
+
+#define WRITE_PACING 0x21
+struct write_pacing {
+    uint8_t command;
+    uint8_t status;
+    uint16_t reserved;
+    uint32_t offset;
+    uint32_t free_space;
+};
+
+#define WRITE_DATA 0x22
+struct write_data {
+    uint8_t command;
+    uint8_t status;
+    uint16_t reserved;
+    uint32_t offset;
+    uint32_t data_size;
+    uint8_t data[];
+};
+
+#define DELETE 0x30
+struct delete_command {
+    uint8_t command;
+    uint8_t reserved;
+    uint16_t path_length;
+    uint8_t path[];
+};
+
+#define DELETE_STATUS 0x31
+struct delete_status {
+    uint8_t command;
+    uint8_t status;
+};
+
+#define MKDIR 0x40
+struct mkdir_command {
+    uint8_t command;
+    uint8_t reserved;
+    uint16_t path_length;
+    uint8_t path[];
+};
+
+#define MKDIR_STATUS 0x41
+struct mkdir_status {
+    uint8_t command;
+    uint8_t status;
+};
+
+#define LISTDIR 0x50
+struct listdir_command {
+    uint8_t command;
+    uint8_t reserved;
+    uint16_t path_length;
+    uint8_t path[];
+};
+
+#define LISTDIR_ENTRY 0x51
+struct listdir_entry {
+    uint8_t command;
+    uint8_t status;
+    uint16_t path_length;
+    uint32_t entry_number;
+    uint32_t entry_count;
+    uint32_t flags;
+    uint32_t file_size;
+    uint8_t path[];
+};
+
+#define STATUS_OK 0x01
+#define STATUS_ERROR 0x02
+#define STATUS_ERROR_NO_FILE 0x03
+#define STATUS_ERROR_PROTOCOL 0x04
+
+
+#endif // MICROPY_INCLUDED_SUPERVISOR_SHARED_BLUETOOTH_FILE_TRANSFER_PROTOCOL_H
diff --git a/supervisor/shared/bluetooth/serial.c b/supervisor/shared/bluetooth/serial.c
new file mode 100644
index 0000000000..e1d26b89ce
--- /dev/null
+++ b/supervisor/shared/bluetooth/serial.c
@@ -0,0 +1,153 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 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 <string.h>
+
+#include "shared-bindings/_bleio/__init__.h"
+#include "shared-bindings/_bleio/Adapter.h"
+#include "shared-bindings/_bleio/Characteristic.h"
+#include "shared-bindings/_bleio/CharacteristicBuffer.h"
+#include "shared-bindings/_bleio/PacketBuffer.h"
+#include "shared-bindings/_bleio/Service.h"
+#include "shared-bindings/_bleio/UUID.h"
+#include "shared-module/storage/__init__.h"
+
+#include "common-hal/_bleio/__init__.h"
+
+#include "py/mpstate.h"
+
+STATIC bleio_service_obj_t supervisor_ble_serial_service;
+STATIC bleio_uuid_obj_t supervisor_ble_serial_service_uuid;
+STATIC bleio_characteristic_obj_t supervisor_ble_rx_characteristic;
+STATIC bleio_uuid_obj_t supervisor_ble_rx_uuid;
+STATIC bleio_characteristic_obj_t supervisor_ble_tx_characteristic;
+STATIC bleio_uuid_obj_t supervisor_ble_tx_uuid;
+
+// This is the base UUID for the nordic uart service.
+const uint8_t nordic_uart_base_uuid[16] = {0x9e, 0xca, 0xdc, 0x24, 0x0e, 0xe5, 0xa9, 0xe0, 0x93, 0xf3, 0xa3, 0xb5, 0x00, 0x00, 0x40, 0x6e };
+
+STATIC mp_obj_list_t characteristic_list;
+STATIC mp_obj_t characteristic_list_items[2];
+
+STATIC uint32_t _outgoing1[BLE_GATTS_VAR_ATTR_LEN_MAX / 4];
+STATIC uint32_t _outgoing2[BLE_GATTS_VAR_ATTR_LEN_MAX / 4];
+STATIC ble_drv_evt_handler_entry_t rx_static_handler_entry;
+STATIC ble_drv_evt_handler_entry_t tx_static_handler_entry;
+STATIC bleio_packet_buffer_obj_t _tx_packet_buffer;
+STATIC uint32_t _incoming[64];
+STATIC bleio_characteristic_buffer_obj_t _rx_buffer;
+
+void supervisor_start_bluetooth_serial(void) {
+    supervisor_ble_serial_service_uuid.base.type = &bleio_uuid_type;
+    common_hal_bleio_uuid_construct(&supervisor_ble_serial_service_uuid, 0x0001, nordic_uart_base_uuid);
+
+    // We know we'll only be N characteristics so we can statically allocate it.
+    characteristic_list.base.type = &mp_type_list;
+    characteristic_list.alloc = sizeof(characteristic_list_items) / sizeof(characteristic_list_items[0]);
+    characteristic_list.len = 0;
+    characteristic_list.items = characteristic_list_items;
+    mp_seq_clear(characteristic_list.items, 0, characteristic_list.alloc, sizeof(*characteristic_list.items));
+
+    _common_hal_bleio_service_construct(&supervisor_ble_serial_service, &supervisor_ble_serial_service_uuid, false /* is secondary */, &characteristic_list);
+
+    // RX
+    supervisor_ble_rx_uuid.base.type = &bleio_uuid_type;
+    common_hal_bleio_uuid_construct(&supervisor_ble_rx_uuid, 0x0002, nordic_uart_base_uuid);
+    common_hal_bleio_characteristic_construct(&supervisor_ble_rx_characteristic,
+        &supervisor_ble_serial_service,
+        0,                                       // handle (for remote only)
+        &supervisor_ble_rx_uuid,
+        CHAR_PROP_WRITE | CHAR_PROP_WRITE_NO_RESPONSE,
+        SECURITY_MODE_NO_ACCESS,
+        SECURITY_MODE_ENC_NO_MITM,
+        BLE_GATTS_VAR_ATTR_LEN_MAX,                 // max length
+        false,                                      // fixed length
+        NULL,                                      // no initial value
+        "CircuitPython Serial");
+
+    // TX
+    supervisor_ble_tx_uuid.base.type = &bleio_uuid_type;
+    common_hal_bleio_uuid_construct(&supervisor_ble_tx_uuid, 0x0003, nordic_uart_base_uuid);
+    common_hal_bleio_characteristic_construct(&supervisor_ble_tx_characteristic,
+        &supervisor_ble_serial_service,
+        0,                                       // handle (for remote only)
+        &supervisor_ble_tx_uuid,
+        CHAR_PROP_NOTIFY,
+        SECURITY_MODE_ENC_NO_MITM,
+        SECURITY_MODE_NO_ACCESS,
+        BLE_GATTS_VAR_ATTR_LEN_MAX,                  // max length
+        false,                                       // fixed length
+        NULL,                                       // no initial value
+        "CircuitPython Serial");
+
+    // Use a PacketBuffer to transmit so that we glom characters to transmit
+    // together and save BLE overhead.
+    _common_hal_bleio_packet_buffer_construct(
+        &_tx_packet_buffer, &supervisor_ble_tx_characteristic,
+        NULL, 0,
+        _outgoing1, _outgoing2, BLE_GATTS_VAR_ATTR_LEN_MAX,
+        &tx_static_handler_entry);
+
+    // Use a CharacteristicBuffer for rx so we can read a single character at a time.
+    _common_hal_bleio_characteristic_buffer_construct(&_rx_buffer,
+        &supervisor_ble_rx_characteristic,
+        0.1f,
+        (uint8_t *)_incoming, sizeof(_incoming) * sizeof(uint32_t),
+        &rx_static_handler_entry);
+}
+
+bool ble_serial_connected(void) {
+    return _tx_packet_buffer.conn_handle != BLE_CONN_HANDLE_INVALID;
+}
+
+bool ble_serial_available(void) {
+    return !common_hal_bleio_characteristic_buffer_deinited(&_rx_buffer) && common_hal_bleio_characteristic_buffer_rx_characters_available(&_rx_buffer);
+}
+
+char ble_serial_read_char(void) {
+    if (common_hal_bleio_characteristic_buffer_deinited(&_rx_buffer)) {
+        return -1;
+    }
+    uint8_t c;
+    common_hal_bleio_characteristic_buffer_read(&_rx_buffer, &c, 1, NULL);
+    return c;
+}
+
+void ble_serial_write(const char *text, size_t len) {
+    if (common_hal_bleio_packet_buffer_deinited(&_tx_packet_buffer)) {
+        return;
+    }
+    size_t sent = 0;
+    while (sent < len) {
+        uint16_t packet_size = MIN(len, (size_t)common_hal_bleio_packet_buffer_get_outgoing_packet_length(&_tx_packet_buffer));
+        mp_int_t written = common_hal_bleio_packet_buffer_write(&_tx_packet_buffer, (const uint8_t *)text + sent, packet_size, NULL, 0);
+        // Error, so we drop characters to transmit.
+        if (written < 0) {
+            break;
+        }
+        sent += written;
+    }
+}
diff --git a/supervisor/shared/bluetooth/serial.h b/supervisor/shared/bluetooth/serial.h
new file mode 100644
index 0000000000..ac96a67f40
--- /dev/null
+++ b/supervisor/shared/bluetooth/serial.h
@@ -0,0 +1,39 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 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_SUPERVISOR_SHARED_BLUETOOTH_SERIAL_H
+#define MICROPY_INCLUDED_SUPERVISOR_SHARED_BLUETOOTH_SERIAL_H
+
+#include <stdbool.h>
+
+void supervisor_start_bluetooth_serial(void);
+
+bool ble_serial_connected(void);
+bool ble_serial_available(void);
+char ble_serial_read_char(void);
+void ble_serial_write(const char *text, size_t len);
+
+#endif // MICROPY_INCLUDED_SUPERVISOR_SHARED_BLUETOOTH_SERIAL_H
diff --git a/supervisor/shared/serial.c b/supervisor/shared/serial.c
index f3a0d5a976..35feacb527 100644
--- a/supervisor/shared/serial.c
+++ b/supervisor/shared/serial.c
@@ -36,6 +36,10 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-module/usb_cdc/__init__.h"
 
+#if CIRCUITPY_SERIAL_BLE
+#include "supervisor/shared/bluetooth/serial.h"
+#endif
+
 #include "tusb.h"
 
 #ifdef NRF_DEBUG_PRINT
@@ -93,11 +97,24 @@ bool serial_connected(void) {
 
     #if defined(DEBUG_UART_TX) && defined(DEBUG_UART_RX)
     return true;
-    #elif CIRCUITPY_USB_CDC
-    return usb_cdc_console_enabled() && tud_cdc_connected();
-    #else
-    return tud_cdc_connected();
     #endif
+
+    #if CIRCUITPY_SERIAL_BLE
+    if (ble_serial_connected()) {
+        return true;
+    }
+    #endif
+
+    #if CIRCUITPY_USB_CDC
+    if (usb_cdc_console_enabled() && tud_cdc_connected()) {
+        return true;
+    }
+    #else
+    if (tud_cdc_connected()) {
+        return true;
+    }
+    #endif
+    return false;
 }
 
 char serial_read(void) {
@@ -117,7 +134,15 @@ char serial_read(void) {
     char text;
     common_hal_busio_uart_read(&debug_uart, (uint8_t *)&text, 1, &uart_errcode);
     return text;
-    #elif CIRCUITPY_USB_CDC
+    #endif
+
+    #if CIRCUITPY_SERIAL_BLE
+    if (ble_serial_available() > 0) {
+        return ble_serial_read_char();
+    }
+    #endif
+
+    #if CIRCUITPY_USB_CDC
     if (!usb_cdc_console_enabled()) {
         return -1;
     }
@@ -133,14 +158,29 @@ bool serial_bytes_available(void) {
     #endif
 
     #if defined(DEBUG_UART_TX) && defined(DEBUG_UART_RX)
-    return common_hal_busio_uart_rx_characters_available(&debug_uart) || (tud_cdc_available() > 0);
-    #elif CIRCUITPY_USB_CDC
-    if (!usb_cdc_console_enabled()) {
-        return 0;
+    if (common_hal_busio_uart_rx_characters_available(&debug_uart)) {
+        return true;
     }
     #endif
-    return tud_cdc_available() > 0;
+
+    #if CIRCUITPY_SERIAL_BLE
+    if (ble_serial_available()) {
+        return true;
+    }
+    #endif
+
+    #if CIRCUITPY_USB_CDC
+    if (usb_cdc_console_enabled() && tud_cdc_available() > 0) {
+        return true;
+    }
+    #else
+    if (tud_cdc_available() > 0) {
+        return true;
+    }
+    #endif
+    return false;
 }
+
 void serial_write_substring(const char *text, uint32_t length) {
     if (length == 0) {
         return;
@@ -156,6 +196,20 @@ void serial_write_substring(const char *text, uint32_t length) {
     }
     #endif
 
+    #if defined(DEBUG_UART_TX) && defined(DEBUG_UART_RX)
+    int uart_errcode;
+
+    common_hal_busio_uart_write(&debug_uart, (const uint8_t *)text, length, &uart_errcode);
+    #endif
+
+    #ifdef NRF_DEBUG_PRINT
+    _debug_print_substr(text, length);
+    #endif
+
+    #if CIRCUITPY_SERIAL_BLE
+    ble_serial_write(text, length);
+    #endif
+
     #if CIRCUITPY_USB_CDC
     if (!usb_cdc_console_enabled()) {
         return;
@@ -171,17 +225,6 @@ void serial_write_substring(const char *text, uint32_t length) {
         }
         usb_background();
     }
-
-    #if defined(DEBUG_UART_TX) && defined(DEBUG_UART_RX)
-    int uart_errcode;
-
-    common_hal_busio_uart_write(&debug_uart, (const uint8_t *)text, length, &uart_errcode);
-    #endif
-
-    #ifdef NRF_DEBUG_PRINT
-    _debug_print_substr(text, length);
-    #endif
-
 }
 
 void serial_write(const char *text) {
diff --git a/supervisor/shared/tick.c b/supervisor/shared/tick.c
index 6a9a896467..05b728826e 100644
--- a/supervisor/shared/tick.c
+++ b/supervisor/shared/tick.c
@@ -36,11 +36,6 @@
 #include "supervisor/shared/autoreload.h"
 #include "supervisor/shared/stack.h"
 
-#if CIRCUITPY_BLEIO
-#include "supervisor/shared/bluetooth.h"
-#include "common-hal/_bleio/__init__.h"
-#endif
-
 #if CIRCUITPY_DISPLAYIO
 #include "shared-module/displayio/__init__.h"
 #endif
diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk
index d1790d008a..0f53e1ebeb 100644
--- a/supervisor/supervisor.mk
+++ b/supervisor/supervisor.mk
@@ -28,12 +28,16 @@ SPI_FLASH_FILESYSTEM ?= 0
 CFLAGS += -DSPI_FLASH_FILESYSTEM=$(SPI_FLASH_FILESYSTEM)
 
 ifeq ($(CIRCUITPY_BLEIO),1)
-	SRC_SUPERVISOR += supervisor/shared/bluetooth.c
+	SRC_SUPERVISOR += supervisor/shared/bluetooth/bluetooth.c
+  CIRCUITPY_CREATOR_ID ?= $(USB_VID)
+  CIRCUITPY_CREATION_ID ?= $(USB_PID)
+  CFLAGS += -DCIRCUITPY_CREATOR_ID=$(CIRCUITPY_CREATOR_ID)
+  CFLAGS += -DCIRCUITPY_CREATION_ID=$(CIRCUITPY_CREATION_ID)
   ifeq ($(CIRCUITPY_BLE_FILE_SERVICE),1)
-    CIRCUITPY_CREATOR_ID ?= $(USB_VID)
-    CIRCUITPY_CREATION_ID ?= $(USB_PID)
-    CFLAGS += -DCIRCUITPY_CREATOR_ID=$(CIRCUITPY_CREATOR_ID)
-    CFLAGS += -DCIRCUITPY_CREATION_ID=$(CIRCUITPY_CREATION_ID)
+    SRC_SUPERVISOR += supervisor/shared/bluetooth/file_transfer.c
+  endif
+  ifeq ($(CIRCUITPY_SERIAL_BLE),1)
+    SRC_SUPERVISOR += supervisor/shared/bluetooth/serial.c
   endif
 endif
 

From b36858daa06cd3b3d361f6aee17b9d0c2d97b6cb Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Fri, 25 Jun 2021 16:40:23 -0700
Subject: [PATCH 313/349] Fix advertisement

---
 devices/ble_hci/common-hal/_bleio/Adapter.c   |  9 +++--
 .../common-hal/_bleio/Characteristic.c        |  4 +--
 devices/ble_hci/common-hal/_bleio/Service.c   |  3 +-
 devices/ble_hci/common-hal/_bleio/__init__.c  |  2 +-
 supervisor/shared/bluetooth/bluetooth.c       | 33 +++++++++++--------
 5 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/devices/ble_hci/common-hal/_bleio/Adapter.c b/devices/ble_hci/common-hal/_bleio/Adapter.c
index d9971b05a1..04231a4a76 100644
--- a/devices/ble_hci/common-hal/_bleio/Adapter.c
+++ b/devices/ble_hci/common-hal/_bleio/Adapter.c
@@ -118,7 +118,8 @@ STATIC void add_generic_services(bleio_adapter_obj_t *adapter) {
         SECURITY_MODE_NO_ACCESS,
         248,                    // max length, from Bluetooth spec
         false,                  // not fixed length
-        &generic_name_bufinfo
+        &generic_name_bufinfo,
+        NULL
         );
 
     uint16_t zero_16 = 0;
@@ -140,7 +141,8 @@ STATIC void add_generic_services(bleio_adapter_obj_t *adapter) {
         SECURITY_MODE_NO_ACCESS,
         2,                      // max length, from Bluetooth spec
         true,                  // fixed length
-        &zero_16_value
+        &zero_16_value,
+        NULL
         );
 
     // Generic Attribute Service setup.
@@ -176,7 +178,8 @@ STATIC void add_generic_services(bleio_adapter_obj_t *adapter) {
         SECURITY_MODE_NO_ACCESS,
         4,                     // max length, from Bluetooth spec
         true,                  // fixed length
-        &zero_32_value
+        &zero_32_value,
+        NULL
         );
 }
 
diff --git a/devices/ble_hci/common-hal/_bleio/Characteristic.c b/devices/ble_hci/common-hal/_bleio/Characteristic.c
index 940fdfc755..e2f9cad0ef 100644
--- a/devices/ble_hci/common-hal/_bleio/Characteristic.c
+++ b/devices/ble_hci/common-hal/_bleio/Characteristic.c
@@ -41,7 +41,7 @@
 #define CCCD_INDICATE 0x2
 
 
-void common_hal_bleio_characteristic_construct(bleio_characteristic_obj_t *self, bleio_service_obj_t *service, uint16_t handle, bleio_uuid_obj_t *uuid, bleio_characteristic_properties_t props, bleio_attribute_security_mode_t read_perm, bleio_attribute_security_mode_t write_perm, mp_int_t max_length, bool fixed_length, mp_buffer_info_t *initial_value_bufinfo) {
+void common_hal_bleio_characteristic_construct(bleio_characteristic_obj_t *self, bleio_service_obj_t *service, uint16_t handle, bleio_uuid_obj_t *uuid, bleio_characteristic_properties_t props, bleio_attribute_security_mode_t read_perm, bleio_attribute_security_mode_t write_perm, mp_int_t max_length, bool fixed_length, mp_buffer_info_t *initial_value_bufinfo, const char *user_description) {
     self->service = service;
     self->uuid = uuid;
     self->decl_handle = BLE_GATT_HANDLE_INVALID;
@@ -66,7 +66,7 @@ void common_hal_bleio_characteristic_construct(bleio_characteristic_obj_t *self,
     if (service->is_remote) {
         self->handle = handle;
     } else {
-        common_hal_bleio_service_add_characteristic(self->service, self, initial_value_bufinfo);
+        common_hal_bleio_service_add_characteristic(self->service, self, initial_value_bufinfo, user_description);
     }
 }
 
diff --git a/devices/ble_hci/common-hal/_bleio/Service.c b/devices/ble_hci/common-hal/_bleio/Service.c
index 0bf00566f2..11b7efd523 100644
--- a/devices/ble_hci/common-hal/_bleio/Service.c
+++ b/devices/ble_hci/common-hal/_bleio/Service.c
@@ -84,7 +84,8 @@ bool common_hal_bleio_service_get_is_secondary(bleio_service_obj_t *self) {
 
 void common_hal_bleio_service_add_characteristic(bleio_service_obj_t *self,
     bleio_characteristic_obj_t *characteristic,
-    mp_buffer_info_t *initial_value_bufinfo) {
+    mp_buffer_info_t *initial_value_bufinfo,
+    const char *user_description) {
 
     if (self->handle != common_hal_bleio_adapter_obj.last_added_service_handle) {
         mp_raise_bleio_BluetoothError(
diff --git a/devices/ble_hci/common-hal/_bleio/__init__.c b/devices/ble_hci/common-hal/_bleio/__init__.c
index 5b592de83a..4a439e8dd2 100644
--- a/devices/ble_hci/common-hal/_bleio/__init__.c
+++ b/devices/ble_hci/common-hal/_bleio/__init__.c
@@ -36,7 +36,7 @@
 #include "shared-bindings/_bleio/Descriptor.h"
 #include "shared-bindings/_bleio/Service.h"
 #include "shared-bindings/_bleio/UUID.h"
-#include "supervisor/shared/bluetooth.h"
+#include "supervisor/shared/bluetooth/bluetooth.h"
 
 // UUID shared by all cccd's.
 bleio_uuid_obj_t cccd_uuid;
diff --git a/supervisor/shared/bluetooth/bluetooth.c b/supervisor/shared/bluetooth/bluetooth.c
index abfbecd8c8..1a57075c6e 100644
--- a/supervisor/shared/bluetooth/bluetooth.c
+++ b/supervisor/shared/bluetooth/bluetooth.c
@@ -37,8 +37,6 @@
 #include "shared-bindings/microcontroller/ResetReason.h"
 #include "shared-module/storage/__init__.h"
 
-#include "bluetooth/ble_drv.h"
-
 #include "common-hal/_bleio/__init__.h"
 
 #include "supervisor/shared/status_leds.h"
@@ -48,10 +46,12 @@
 
 #if CIRCUITPY_BLE_FILE_SERVICE
 #include "supervisor/shared/bluetooth/file_transfer.h"
+#include "bluetooth/ble_drv.h"
 #endif
 
 #if CIRCUITPY_SERIAL_BLE
 #include "supervisor/shared/bluetooth/serial.h"
+#include "bluetooth/ble_drv.h"
 #endif
 
 // This standard advertisement advertises the CircuitPython editing service and a CIRCUITPY short name.
@@ -75,11 +75,11 @@ const uint8_t public_advertising_data[] = { 0x02, 0x01, 0x06, // 0-2 Flags
 const uint8_t private_advertising_data[] = { 0x02, 0x01, 0x06, // 0-2 Flags
                                              0x02, 0x0a, 0x00 // 3-5 TX power level 0
 };
-// This scan response advertises the full CIRCUITPYXXXX device name.
+// This scan response advertises the full CIRCPYXXXX device name.
 uint8_t circuitpython_scan_response_data[] = {
-    0x0e, 0x09, 0x43, 0x49, 0x52, 0x43, 0x55, 0x49, 0x54, 0x50, 0x59, 0x00, 0x00, 0x00, 0x00,
+    0x0a, 0x09, 0x43, 0x49, 0x52, 0x50, 0x59, 0x00, 0x00, 0x00, 0x00,
     #if CIRCUITPY_SERIAL_BLE
-    0x06, 0x10, 0x9e, 0xca, 0xdc, 0x24, 0x0e, 0xe5, 0xa9, 0xe0, 0x93, 0xf3, 0xa3, 0xb5, 0x00, 0x00, 0x40, 0x6e,
+    0x11, 0x06, 0x9e, 0xca, 0xdc, 0x24, 0x0e, 0xe5, 0xa9, 0xe0, 0x93, 0xf3, 0xa3, 0xb5, 0x01, 0x00, 0x40, 0x6e,
     #endif
 };
 
@@ -87,6 +87,9 @@ bool boot_in_discovery_mode = false;
 bool advertising = false;
 
 STATIC void supervisor_bluetooth_start_advertising(void) {
+    // #if !CIRCUITPY_BLE_FILE_SERVICE && !CIRCUITPY_SERIAL_BLE
+    // return;
+    // #else
     bool is_connected = common_hal_bleio_adapter_get_connected(&common_hal_bleio_adapter_obj);
     if (is_connected) {
         return;
@@ -95,7 +98,7 @@ STATIC void supervisor_bluetooth_start_advertising(void) {
     #if CIRCUITPY_USB
     // Don't advertise when we have USB instead of BLE.
     if (!bonded && !boot_in_discovery_mode) {
-        // mp_printf(&mp_plat_print, "skipping advertising\n");
+        mp_printf(&mp_plat_print, "skipping advertising\n");
         return;
     }
     #endif
@@ -109,6 +112,7 @@ STATIC void supervisor_bluetooth_start_advertising(void) {
     // Advertise with less power when doing so publicly to reduce who can hear us. This will make it
     // harder for someone with bad intentions to pair from a distance.
     if (!bonded) {
+        mp_printf(&mp_plat_print, "public advertising\n");
         tx_power = -40;
         adv = public_advertising_data;
         adv_len = sizeof(public_advertising_data);
@@ -126,6 +130,7 @@ STATIC void supervisor_bluetooth_start_advertising(void) {
         scan_response_len,
         tx_power,
         NULL);
+    mp_printf(&mp_plat_print, "advert %d\n", status);
     // This may fail if we are already advertising.
     advertising = status == NRF_SUCCESS;
 }
@@ -139,20 +144,22 @@ void supervisor_bluetooth_init(void) {
     if ((reset_state & BLE_DISCOVERY_DATA_GUARD_MASK) == BLE_DISCOVERY_DATA_GUARD) {
         ble_mode = (reset_state & ~BLE_DISCOVERY_DATA_GUARD_MASK) >> 8;
     }
-    const mcu_reset_reason_t reset_reason = common_hal_mcu_processor_get_reset_reason();
+    // const mcu_reset_reason_t reset_reason = common_hal_mcu_processor_get_reset_reason();
     boot_in_discovery_mode = false;
-    if (reset_reason != RESET_REASON_POWER_ON &&
-        reset_reason != RESET_REASON_RESET_PIN &&
-        reset_reason != RESET_REASON_UNKNOWN &&
-        reset_reason != RESET_REASON_SOFTWARE) {
-        return;
-    }
+    // if (reset_reason != RESET_REASON_POWER_ON &&
+    //     reset_reason != RESET_REASON_RESET_PIN &&
+    //     reset_reason != RESET_REASON_UNKNOWN &&
+    //     reset_reason != RESET_REASON_SOFTWARE) {
+    //     return;
+    // }
 
     if (ble_mode == 0) {
         port_set_saved_word(BLE_DISCOVERY_DATA_GUARD | (0x01 << 8));
     }
     // Wait for a while to allow for reset.
 
+    ble_mode = 1;
+
     #ifdef CIRCUITPY_BOOT_BUTTON
     digitalio_digitalinout_obj_t boot_button;
     common_hal_digitalio_digitalinout_construct(&boot_button, CIRCUITPY_BOOT_BUTTON);

From 3387edc424a7592ec97bfbc0083a44919e5ef1ca Mon Sep 17 00:00:00 2001
From: Brendan <2bndy5@gmail.com>
Date: Fri, 25 Jun 2021 23:32:24 -0700
Subject: [PATCH 314/349] rm intersphinx_mapping to bus_device pkg

---
 conf.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/conf.py b/conf.py
index 7acc981f3d..fb988499c3 100644
--- a/conf.py
+++ b/conf.py
@@ -414,7 +414,6 @@ texinfo_documents = [
 
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {"cpython": ('https://docs.python.org/3/', None),
-                       "bus_device": ('https://circuitpython.readthedocs.io/projects/busdevice/en/latest/', None),
                        "register": ('https://circuitpython.readthedocs.io/projects/register/en/latest/', None)}
 
 # Adapted from sphinxcontrib-redirects

From dc02f97640dccc941ef43132cc14d2f62d169af1 Mon Sep 17 00:00:00 2001
From: Brendan <2bndy5@gmail.com>
Date: Fri, 25 Jun 2021 23:35:30 -0700
Subject: [PATCH 315/349] fix SPIDevice docs

---
 shared-bindings/adafruit_bus_device/SPIDevice.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shared-bindings/adafruit_bus_device/SPIDevice.c b/shared-bindings/adafruit_bus_device/SPIDevice.c
index 94901e4a15..a695a168ed 100644
--- a/shared-bindings/adafruit_bus_device/SPIDevice.c
+++ b/shared-bindings/adafruit_bus_device/SPIDevice.c
@@ -45,6 +45,7 @@
 //|
 //|         """
 //|         Represents a single SPI device and manages locking the bus and the device address.
+//|
 //|         :param ~busio.SPI spi: The SPI bus the device is on
 //|         :param ~digitalio.DigitalInOut chip_select: The chip select pin object that implements the DigitalInOut API.
 //|         :param int extra_clocks: The minimum number of clock cycles to cycle the bus after CS is high. (Used for SD cards.)

From 02c70336ffbb858471fc2a2857f63fa8a9d89eef Mon Sep 17 00:00:00 2001
From: Brendan <2bndy5@gmail.com>
Date: Fri, 25 Jun 2021 23:38:08 -0700
Subject: [PATCH 316/349] fix I2CDevice docs

---
 shared-bindings/adafruit_bus_device/I2CDevice.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/shared-bindings/adafruit_bus_device/I2CDevice.c b/shared-bindings/adafruit_bus_device/I2CDevice.c
index ac760a490f..12c836396d 100644
--- a/shared-bindings/adafruit_bus_device/I2CDevice.c
+++ b/shared-bindings/adafruit_bus_device/I2CDevice.c
@@ -46,6 +46,7 @@
 //|
 //|         """Represents a single I2C device and manages locking the bus and the device
 //|         address.
+//|
 //|         :param ~busio.I2C i2c: The I2C bus the device is on
 //|         :param int device_address: The 7 bit device address
 //|         :param bool probe: Probe for the device upon object creation, default is true
@@ -114,6 +115,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(adafruit_bus_device_i2cdevice___exit_
 //|         If ``start`` or ``end`` is provided, then the buffer will be sliced
 //|         as if ``buf[start:end]``. This will not cause an allocation like
 //|         ``buf[start:end]`` will so it saves memory.
+//|
 //|         :param bytearray buf: buffer to write into
 //|         :param int start: Index to start writing at
 //|         :param int end: Index to write up to but not include; if None, use ``len(buf)``"""
@@ -157,6 +159,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(adafruit_bus_device_i2cdevice_readinto_obj, 2,
 //|         If ``start`` or ``end`` is provided, then the buffer will be sliced
 //|         as if ``buffer[start:end]``. This will not cause an allocation like
 //|         ``buffer[start:end]`` will so it saves memory.
+//|
 //|         :param bytearray buf: buffer containing the bytes to write
 //|         :param int start: Index to start writing from
 //|         :param int end: Index to read up to but not include; if None, use ``len(buf)``
@@ -208,6 +211,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(adafruit_bus_device_i2cdevice_write_obj, 2, adafruit_
 //|         will be sliced as if ``in_buffer[in_start:in_end]``. This will not
 //|         cause an allocation like ``in_buffer[in_start:in_end]`` will so
 //|         it saves memory.
+//|
 //|         :param bytearray out_buffer: buffer containing the bytes to write
 //|         :param bytearray in_buffer: buffer containing the bytes to read into
 //|         :param int out_start: Index to start writing from

From 9ff9259d1ccda8179c6b3d28a949e01a2bd1ed21 Mon Sep 17 00:00:00 2001
From: Brendan <2bndy5@gmail.com>
Date: Sat, 26 Jun 2021 01:50:28 -0700
Subject: [PATCH 317/349] fix interlinking in busio docs

---
 shared-bindings/busio/I2C.c | 11 ++++++-----
 shared-bindings/busio/SPI.c |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/shared-bindings/busio/I2C.c b/shared-bindings/busio/I2C.c
index 56a6e1b8ae..d300956d0a 100644
--- a/shared-bindings/busio/I2C.c
+++ b/shared-bindings/busio/I2C.c
@@ -46,7 +46,7 @@
 //|         lines respectively.
 //|
 //|         .. seealso:: Using this class directly requires careful lock management.
-//|             Instead, use :class:`~adafruit_bus_device.i2c_device.I2CDevice` to
+//|             Instead, use :class:`~adafruit_bus_device.I2CDevice` to
 //|             manage locks.
 //|
 //|         .. seealso:: Using this class to directly read registers requires manual
@@ -56,7 +56,8 @@
 //|         :param ~microcontroller.Pin scl: The clock pin
 //|         :param ~microcontroller.Pin sda: The data pin
 //|         :param int frequency: The clock frequency in Hertz
-//|         :param int timeout: The maximum clock stretching timeut - (used only for bitbangio.I2C; ignored for busio.I2C)
+//|         :param int timeout: The maximum clock stretching timeut - (used only for
+//|             :class:`bitbangio.I2C`; ignored for :class:`busio.I2C`)
 //|
 //|         .. note:: On the nRF52840, only one I2C object may be created,
 //|            except on the Circuit Playground Bluefruit, which allows two,
@@ -239,7 +240,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(busio_i2c_readfrom_into_obj, 3, busio_i2c_readfrom_in
 //|         to poll for the existence of a device.
 //|
 //|         :param int address: 7-bit device address
-//|         :param ~_typing.ReadbleBuffer buffer: buffer containing the bytes to write
+//|         :param ~_typing.ReadableBuffer buffer: buffer containing the bytes to write
 //|         :param int start: Index to start writing from
 //|         :param int end: Index to read up to but not include. Defaults to ``len(buffer)``"""
 //|         ...
@@ -286,12 +287,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(busio_i2c_writeto_obj, 1, busio_i2c_writeto);
 //|         bit, generate a repeated start and read into ``in_buffer``. ``out_buffer`` and
 //|         ``in_buffer`` can be the same buffer because they are used sequentially.
 //|
-//|         if ``start`` or ``end`` is provided, then the corresponding buffer will be sliced
+//|         If ``start`` or ``end`` is provided, then the corresponding buffer will be sliced
 //|         as if ``buffer[start:end]``. This will not cause an allocation like ``buf[start:end]``
 //|         will so it saves memory.
 //|
 //|         :param int address: 7-bit device address
-//|         :param ~_typing.ReadbleBuffer out_buffer: buffer containing the bytes to write
+//|         :param ~_typing.ReadableBuffer out_buffer: buffer containing the bytes to write
 //|         :param ~_typing.WriteableBuffer in_buffer: buffer to write into
 //|         :param int out_start: Index to start writing from
 //|         :param int out_end: Index to read up to but not include. Defaults to ``len(buffer)``
diff --git a/shared-bindings/busio/SPI.c b/shared-bindings/busio/SPI.c
index 5a82ac0b41..31f3a9021e 100644
--- a/shared-bindings/busio/SPI.c
+++ b/shared-bindings/busio/SPI.c
@@ -65,7 +65,7 @@
 //|            peripherals.
 //|
 //|         .. seealso:: Using this class directly requires careful lock management.
-//|             Instead, use :class:`~adafruit_bus_device.spi_device.SPIDevice` to
+//|             Instead, use :class:`~adafruit_bus_device.SPIDevice` to
 //|             manage locks.
 //|
 //|         .. seealso:: Using this class to directly read registers requires manual

From f380a91e7caecc08b92b754f37d73be8c2d43ad0 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sat, 26 Jun 2021 20:00:31 -0500
Subject: [PATCH 318/349] objtuple: Move mp_obj_is_tuple_compatible to obj.h.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/obj.h      | 2 ++
 py/objtuple.c | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/obj.h b/py/obj.h
index 75caf459d4..da2ef08451 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -764,6 +764,8 @@ extern const struct _mp_obj_exception_t mp_const_GeneratorExit_obj;
 #define mp_obj_is_str_or_bytes(o) (mp_obj_is_qstr(o) || (mp_obj_is_obj(o) && ((mp_obj_base_t *)MP_OBJ_TO_PTR(o))->type->binary_op == mp_obj_str_binary_op))
 #define mp_obj_is_dict_or_ordereddict(o) (mp_obj_is_obj(o) && ((mp_obj_base_t *)MP_OBJ_TO_PTR(o))->type->make_new == mp_obj_dict_make_new)
 #define mp_obj_is_fun(o) (mp_obj_is_obj(o) && (((mp_obj_base_t *)MP_OBJ_TO_PTR(o))->type->name == MP_QSTR_function))
+// type check is done on getiter method to allow tuple, namedtuple, attrtuple
+#define mp_obj_is_tuple_compatible(o) (mp_obj_get_type(o)->getiter == mp_obj_tuple_getiter)
 
 mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict);
 static inline mp_obj_t mp_obj_new_bool(mp_int_t x) {
diff --git a/py/objtuple.c b/py/objtuple.c
index bb4f79997c..414cf65c3b 100644
--- a/py/objtuple.c
+++ b/py/objtuple.c
@@ -34,8 +34,6 @@
 
 #include "supervisor/shared/translate.h"
 
-// type check is done on getiter method to allow tuple, namedtuple, attrtuple
-#define mp_obj_is_tuple_compatible(o) (mp_obj_get_type(o)->getiter == mp_obj_tuple_getiter)
 
 /******************************************************************************/
 /* tuple                                                                      */

From 33482e0831ca553970080fdb6ac8c85d55352956 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sat, 26 Jun 2021 20:00:56 -0500
Subject: [PATCH 319/349] mp_obj_get_array: Work with namedtuple, attrtuple.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/obj.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/obj.c b/py/obj.c
index 9a81d65eca..d2483ed993 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -444,7 +444,7 @@ void mp_obj_get_complex(mp_obj_t arg, mp_float_t *real, mp_float_t *imag) {
 
 // note: returned value in *items may point to the interior of a GC block
 void mp_obj_get_array(mp_obj_t o, size_t *len, mp_obj_t **items) {
-    if (mp_obj_is_type(o, &mp_type_tuple)) {
+    if (mp_obj_is_tuple_compatible(o)) {
         mp_obj_tuple_get(o, len, items);
     } else if (mp_obj_is_type(o, &mp_type_list)) {
         mp_obj_list_get(o, len, items);

From cac71a33fc62f05063417b61f6f2b0eea6e14437 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sat, 26 Jun 2021 20:01:19 -0500
Subject: [PATCH 320/349] time: Allow constructing a struct_time from another
 struct_time

Closes: #4917
---
 shared-bindings/time/__init__.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/shared-bindings/time/__init__.c b/shared-bindings/time/__init__.c
index 87a40f6fc1..5e40d2774a 100644
--- a/shared-bindings/time/__init__.c
+++ b/shared-bindings/time/__init__.c
@@ -83,12 +83,10 @@ mp_obj_t struct_time_make_new(const mp_obj_type_t *type, size_t n_args, const mp
     if (n_args != 1 || (kw_args != NULL && kw_args->used > 0)) {
         return namedtuple_make_new(type, n_args, args, kw_args);
     }
-    if (mp_obj_get_type(args[0])->getiter != mp_obj_tuple_getiter || ((mp_obj_tuple_t *)MP_OBJ_TO_PTR(args[0]))->len != 9) {
-        mp_raise_TypeError(translate("time.struct_time() takes a 9-sequence"));
-    }
-
-    mp_obj_tuple_t *tuple = MP_OBJ_TO_PTR(args[0]);
-    return namedtuple_make_new(type, 9, tuple->items, NULL);
+    size_t len;
+    mp_obj_t *items;
+    mp_obj_get_array(args[0], &len, &items);
+    return namedtuple_make_new(type, len, items, NULL);
 }
 
 //| class struct_time:

From 74be2d994e8e3a90623be80ec40062ba8a34b7af Mon Sep 17 00:00:00 2001
From: Alvaro Figueroa <alvaro@greencore.co.cr>
Date: Fri, 25 Jun 2021 22:20:48 +0000
Subject: [PATCH 321/349] Translated using Weblate (Spanish)

Currently translated at 100.0% (1008 of 1008 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/es/
---
 locale/es.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/locale/es.po b/locale/es.po
index e184742e79..13988a3e60 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2021-06-24 23:11+0000\n"
+"PO-Revision-Date: 2021-06-27 12:33+0000\n"
 "Last-Translator: Alvaro Figueroa <alvaro@greencore.co.cr>\n"
 "Language-Team: \n"
 "Language: es\n"
@@ -58,7 +58,7 @@ msgstr " es de tipo %q\n"
 
 #: main.c
 msgid " not found.\n"
-msgstr ""
+msgstr " no encontrado.\n"
 
 #: main.c
 msgid " output:\n"
@@ -897,7 +897,7 @@ msgstr "Trozo de datos debe seguir fmt chunk"
 
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data not supported with directed advertising"
-msgstr ""
+msgstr "Datos sin capacidad de anuncio dirigido"
 
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data too large for advertisement packet"
@@ -1756,7 +1756,7 @@ msgstr ""
 
 #: shared-bindings/_bleio/Adapter.c
 msgid "Only connectable advertisements can be directed"
-msgstr ""
+msgstr "Solo se puede dirigir a los anuncios conectables"
 
 #: ports/stm/common-hal/alarm/pin/PinAlarm.c
 msgid "Only edge detection is available on this hardware"
@@ -2092,7 +2092,7 @@ msgstr "Error de reinicialización de SPI"
 
 #: ports/esp32s2/common-hal/busio/SPI.c
 msgid "SPI configuration failed"
-msgstr ""
+msgstr "Configuración de SPI fallida"
 
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"

From 39c862f1f6639035a81b07277d5f81d7d6a7ea15 Mon Sep 17 00:00:00 2001
From: Jonny Bergdahl <jonny@bergdahl.it>
Date: Sat, 26 Jun 2021 12:12:34 +0000
Subject: [PATCH 322/349] Translated using Weblate (Swedish)

Currently translated at 100.0% (1008 of 1008 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/sv/
---
 locale/sv.po | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/locale/sv.po b/locale/sv.po
index 76127123ff..a5e6241d1c 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2021-06-24 12:16+0000\n"
+"PO-Revision-Date: 2021-06-27 12:33+0000\n"
 "Last-Translator: Jonny Bergdahl <jonny@bergdahl.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: sv\n"
@@ -56,7 +56,7 @@ msgstr " är av typen %q\n"
 
 #: main.c
 msgid " not found.\n"
-msgstr ""
+msgstr " hittades inte.\n"
 
 #: main.c
 msgid " output:\n"
@@ -97,7 +97,7 @@ msgstr "Indexet %q måste vara ett heltal, inte %s"
 
 #: py/argcheck.c
 msgid "%q length must be %q"
-msgstr ""
+msgstr "längden på %q måste vara %q"
 
 #: shared-bindings/vectorio/Polygon.c
 msgid "%q list must be a list"
@@ -105,11 +105,11 @@ msgstr "%q-listan måste vara en lista"
 
 #: py/argcheck.c
 msgid "%q must <= %d"
-msgstr ""
+msgstr "%q måste vara <=%d"
 
 #: py/argcheck.c
 msgid "%q must be %d-%d"
-msgstr ""
+msgstr "%q måste vara %d-%d"
 
 #: shared-bindings/usb_hid/Device.c
 msgid "%q must be 0-255"
@@ -121,7 +121,7 @@ msgstr "%q måste vara 1-255"
 
 #: py/argcheck.c
 msgid "%q must be >= %d"
-msgstr ""
+msgstr "%q måste vara >= %d"
 
 #: py/argcheck.c shared-bindings/memorymonitor/AllocationAlarm.c
 msgid "%q must be >= 0"
@@ -141,7 +141,7 @@ msgstr "%q måste vara None eller mellan 1 och len(report_descriptor)-1"
 
 #: py/argcheck.c
 msgid "%q must be a string"
-msgstr ""
+msgstr "%q måste vara en sträng"
 
 #: shared-module/vectorio/Polygon.c
 msgid "%q must be a tuple of length 2"
@@ -153,12 +153,12 @@ msgstr "%q måste vara mellan %d och %d"
 
 #: py/argcheck.c
 msgid "%q must of type %q"
-msgstr ""
+msgstr "%q måste av typen %q"
 
 #: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
 #: shared-bindings/keypad/ShiftRegisterKeys.c
 msgid "%q must store bytes"
-msgstr ""
+msgstr "%q måste lagra bytes"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
@@ -890,7 +890,7 @@ msgstr "Datasegmentet måste följa fmt-segmentet"
 
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data not supported with directed advertising"
-msgstr ""
+msgstr "Data stöds inte med riktad annonsering"
 
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data too large for advertisement packet"
@@ -1738,7 +1738,7 @@ msgstr ""
 
 #: shared-bindings/_bleio/Adapter.c
 msgid "Only connectable advertisements can be directed"
-msgstr ""
+msgstr "Endast anslutningsbara annonseringar kan dirigeras"
 
 #: ports/stm/common-hal/alarm/pin/PinAlarm.c
 msgid "Only edge detection is available on this hardware"
@@ -2072,7 +2072,7 @@ msgstr "SPI reinitialiseringsfel"
 
 #: ports/esp32s2/common-hal/busio/SPI.c
 msgid "SPI configuration failed"
-msgstr ""
+msgstr "SPI-konfigurationen misslyckades"
 
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"

From 259d5b9e7dbefff2d57ce77ce54ee8ba99096f17 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Mon, 28 Jun 2021 09:26:29 -0400
Subject: [PATCH 323/349] Fix displayio.Display __init__() signature
 documentation

---
 shared-bindings/displayio/Display.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c
index 2825d5466a..e12e398802 100644
--- a/shared-bindings/displayio/Display.c
+++ b/shared-bindings/displayio/Display.c
@@ -54,7 +54,7 @@
 //|     Most people should not use this class directly. Use a specific display driver instead that will
 //|     contain the initialization sequence at minimum."""
 //|
-//|     def __init__(self, display_bus: _DisplayBus, init_sequence: ReadableBuffer, *, width: int, height: int, colstart: int = 0, rowstart: int = 0, rotation: int = 0, color_depth: int = 16, grayscale: bool = False, pixels_in_byte_share_row: bool = True, bytes_per_cell: int = 1, reverse_pixels_in_byte: bool = False, set_column_command: int = 0x2a, set_row_command: int = 0x2b, write_ram_command: int = 0x2c, set_vertical_scroll: int = 0, backlight_pin: Optional[microcontroller.Pin] = None, brightness_command: Optional[int] = None, brightness: float = 1.0, auto_brightness: bool = False, single_byte_bounds: bool = False, data_as_commands: bool = False, auto_refresh: bool = True, native_frames_per_second: int = 60) -> None:
+//|     def __init__(self, display_bus: _DisplayBus, init_sequence: ReadableBuffer, *, width: int, height: int, colstart: int = 0, rowstart: int = 0, rotation: int = 0, color_depth: int = 16, grayscale: bool = False, pixels_in_byte_share_row: bool = True, bytes_per_cell: int = 1, reverse_pixels_in_byte: bool = False, set_column_command: int = 0x2a, set_row_command: int = 0x2b, write_ram_command: int = 0x2c, set_vertical_scroll: int = 0, backlight_pin: Optional[microcontroller.Pin] = None, brightness_command: Optional[int] = None, brightness: float = 1.0, auto_brightness: bool = False, single_byte_bounds: bool = False, data_as_commands: bool = False,  auto_refresh: bool = True, native_frames_per_second: int = 60, backlight_on_high: bool = True, SH1107_addressing: bool = False) -> None:
 //|         r"""Create a Display object on the given display bus (`FourWire`, `ParallelBus` or `I2CDisplay`).
 //|
 //|         The ``init_sequence`` is bitpacked to minimize the ram impact. Every command begins with a
@@ -107,10 +107,11 @@
 //|         :param bool auto_brightness: If True, brightness is controlled via an ambient light sensor or other mechanism.
 //|         :param bool single_byte_bounds: Display column and row commands use single bytes
 //|         :param bool data_as_commands: Treat all init and boundary data as SPI commands. Certain displays require this.
-//|         :param bool SH1107_addressing: Special quirk for SH1107, use upper/lower column set and page set
 //|         :param bool auto_refresh: Automatically refresh the screen
 //|         :param int native_frames_per_second: Number of display refreshes per second that occur with the given init_sequence.
-//|         :param bool backlight_on_high: If True, pulling the backlight pin high turns the backlight on."""
+//|         :param bool backlight_on_high: If True, pulling the backlight pin high turns the backlight on.
+//|         :param bool SH1107_addressing: Special quirk for SH1107, use upper/lower column set and page set
+//|         """
 //|         ...
 //|
 STATIC mp_obj_t displayio_display_make_new(const mp_obj_type_t *type, size_t n_args,

From 2c2d541e7c35e17a57f2182d6c18d80a1430c2d4 Mon Sep 17 00:00:00 2001
From: Kattni Rembor <kattni@adafruit.com>
Date: Mon, 28 Jun 2021 17:10:15 -0400
Subject: [PATCH 324/349] Adding pins to match silk and other RP2040 boards.

---
 ports/raspberrypi/boards/adafruit_macropad_rp2040/pins.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/raspberrypi/boards/adafruit_macropad_rp2040/pins.c b/ports/raspberrypi/boards/adafruit_macropad_rp2040/pins.c
index 2e5890c1c4..bc57161ec5 100644
--- a/ports/raspberrypi/boards/adafruit_macropad_rp2040/pins.c
+++ b/ports/raspberrypi/boards/adafruit_macropad_rp2040/pins.c
@@ -15,13 +15,17 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_KEY12), MP_ROM_PTR(&pin_GPIO12) },
 
     { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
+
     { MP_ROM_QSTR(MP_QSTR_SPEAKER_SHUTDOWN), MP_ROM_PTR(&pin_GPIO14) },
     { MP_ROM_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_GPIO16) },
 
     { MP_ROM_QSTR(MP_QSTR_ENCODER_SWITCH), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
 
     { MP_ROM_QSTR(MP_QSTR_ENCODER_A), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_ROTA), MP_ROM_PTR(&pin_GPIO17) },
     { MP_ROM_QSTR(MP_QSTR_ENCODER_B), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_ROTB), MP_ROM_PTR(&pin_GPIO18) },
 
     { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO19) },
 

From 3dcd603e39a63248b84a823207c3200b7b23e623 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Mon, 28 Jun 2021 19:27:14 -0500
Subject: [PATCH 325/349] time: Fix and better document time.struct_time
 constructor

INCOMPATIBLE CHANGE: struct_time(1,2,3,4,5,6,7,8,9) is now _rejected_
just as on standad Python.

This incorrect constructor was added by me in #2327; I assumed
without even checking that the `struct_time` constructor was also
compatible with the `namedtuple` constructor, but it is not and has
always been rejected by standard Python (checked 2.7 and 3.9)

This commit restores the specific error message that we used for this
purpose, which was removed in the previous commit either out of laziness
or out of trying to reduce unneeded error strings. In this case, the
alternate string is too misleading (it refers to arguments, not to
sequence elements) so let's put the better message back.
---
 shared-bindings/time/__init__.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/shared-bindings/time/__init__.c b/shared-bindings/time/__init__.c
index 5e40d2774a..a2eeee6cef 100644
--- a/shared-bindings/time/__init__.c
+++ b/shared-bindings/time/__init__.c
@@ -80,20 +80,21 @@ MP_DEFINE_CONST_FUN_OBJ_1(time_sleep_obj, time_sleep);
 
 #if MICROPY_PY_COLLECTIONS
 mp_obj_t struct_time_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
-    if (n_args != 1 || (kw_args != NULL && kw_args->used > 0)) {
-        return namedtuple_make_new(type, n_args, args, kw_args);
-    }
+    mp_arg_check_num(n_args, kw_args, 1, 1, false);
     size_t len;
     mp_obj_t *items;
     mp_obj_get_array(args[0], &len, &items);
+    if (len != 9) {
+        mp_raise_TypeError(translate("time.struct_time() takes a 9-sequence"));
+    }
     return namedtuple_make_new(type, len, items, NULL);
 }
 
 //| class struct_time:
-//|     def __init__(self, time_tuple: Tuple[int, int, int, int, int, int, int, int, int]) -> None:
-//|         """Structure used to capture a date and time. Note that it takes a tuple!
+//|     def __init__(self, time_tuple: Sequence) -> None:
+//|         """Structure used to capture a date and time.  Can be constructed from a `struct_time`, `tuple`, `list`, or `namedtuple` with 9 elements.
 //|
-//|         :param tuple time_tuple: Tuple of time info: ``(tm_year, tm_mon, tm_mday, tm_hour, tm_min, tm_sec, tm_wday, tm_yday, tm_isdst)``
+//|         :param Sequence time_tuple: Sequence of time info: ``(tm_year, tm_mon, tm_mday, tm_hour, tm_min, tm_sec, tm_wday, tm_yday, tm_isdst)``
 //|
 //|           * ``tm_year``: the year, 2017 for example
 //|           * ``tm_mon``: the month, range [1, 12]

From e5d2b25b109f8b6dc4a88cca1dc645c7027505ab Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Mon, 28 Jun 2021 19:33:40 -0500
Subject: [PATCH 326/349] remove 'double-wide' characters not in the font

I noticed the build printed things like
```
Font missing 3 characters
```

.. this is why.

We can't make it an error, because Japanese has hundreds of characters
not in the font.
---
 locale/zh_Latn_pinyin.po | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index bb6fba4dd2..3d754c82c8 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -535,7 +535,7 @@ msgstr "Bǐtè shízhōng hé dānzì xuǎnzé bìxū gòngxiǎng shízhōng dā
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid "Bit depth must be from 1 to 6 inclusive, not %d"
-msgstr "wèi shēn dù bì xū bāo hán 1 dào 6， ér bù shì %d"
+msgstr "wèi shēn dù bì xū bāo hán 1 dào 6, ér bù shì %d"
 
 #: shared-bindings/audiobusio/PDMIn.c
 msgid "Bit depth must be multiple of 8."
@@ -610,7 +610,7 @@ msgstr "Huǎnchōng qū bìxū zhìshǎo chángdù 1"
 #: shared-bindings/_bleio/PacketBuffer.c
 #, c-format
 msgid "Buffer too short by %d bytes"
-msgstr "Huǎn chōng qū tài duǎn ， àn %d zì jié"
+msgstr "Huǎn chōng qū tài duǎn , àn %d zì jié"
 
 #: ports/atmel-samd/common-hal/displayio/ParallelBus.c
 #: ports/esp32s2/common-hal/displayio/ParallelBus.c
@@ -2169,7 +2169,7 @@ msgid ""
 "Increase the stack size if you know how. If not:"
 msgstr ""
 "diàn lù dàn duī bèi sǔn huài, yīn wéi duī zhàn tài xiǎo.\n"
-"rú guǒ nín zhī dào rú hé zēng jiā duī zhàn dà xiǎo. rú guǒ méi yǒu："
+"rú guǒ nín zhī dào rú hé zēng jiā duī zhàn dà xiǎo. rú guǒ méi yǒu:"
 
 #: supervisor/shared/safe_mode.c
 msgid ""
@@ -2351,7 +2351,7 @@ msgstr "Wúfǎ xiě rù nvm."
 
 #: shared-bindings/alarm/SleepMemory.c
 msgid "Unable to write to sleep_memory."
-msgstr "wú fǎ xiě rù sleep_memory。"
+msgstr "wú fǎ xiě rù sleep_memory.
 
 #: ports/nrf/common-hal/_bleio/UUID.c
 msgid "Unexpected nrfx uuid type"
@@ -3411,7 +3411,7 @@ msgstr "wúxiào de cānshù"
 #: shared-bindings/bitmaptools/__init__.c
 #, c-format
 msgid "invalid bits_per_pixel %d, must be, 1, 4, 8, 16, 24, or 32"
-msgstr "wú xiào bits_per_pixel %d， bì xū shì, 1, 4, 8, 16, 24, huò 32"
+msgstr "wú xiào bits_per_pixel %d, bì xū shì, 1, 4, 8, 16, 24, huò 32"
 
 #: shared-bindings/bitmaptools/__init__.c
 #, c-format
@@ -3870,7 +3870,7 @@ msgstr "chāo gāo zhuǎnhuàn zhǎng zhěng shùzì shí"
 #: py/modstruct.c
 #, c-format
 msgid "pack expected %d items for packing (got %d)"
-msgstr "bāo zhuāng yù qī de %d bāo zhuāng xiàng mù （dé dào %d)"
+msgstr "bāo zhuāng yù qī de %d bāo zhuāng xiàng mù (dé dào %d)"
 
 #: shared-bindings/_stage/Layer.c shared-bindings/_stage/Text.c
 msgid "palette must be 32 bytes long"
@@ -4475,7 +4475,7 @@ msgid "zi must be of shape (n_section, 2)"
 msgstr "zi bìxū jùyǒu xíngzhuàng (n_section,2)"
 
 #~ msgid "Buffer too large and unable to allocate"
-#~ msgstr "Huǎn chōng qū tài dà ， wú fǎ fēn pèi"
+#~ msgstr "Huǎn chōng qū tài dà , wú fǎ fēn pèi"
 
 #~ msgid "interp is defined for 1D arrays of equal length"
 #~ msgstr "interp shì wèi děng zhǎng de 1D shùzǔ dìngyì de"

From fd681ca70a6c0e5d855f9476e095da62db07a19c Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Tue, 29 Jun 2021 08:11:16 +0530
Subject: [PATCH 327/349] minor fix for struct_time docs

---
 shared-bindings/time/__init__.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/time/__init__.c b/shared-bindings/time/__init__.c
index a2eeee6cef..03f4fac0dc 100644
--- a/shared-bindings/time/__init__.c
+++ b/shared-bindings/time/__init__.c
@@ -91,7 +91,7 @@ mp_obj_t struct_time_make_new(const mp_obj_type_t *type, size_t n_args, const mp
 }
 
 //| class struct_time:
-//|     def __init__(self, time_tuple: Sequence) -> None:
+//|     def __init__(self, time_tuple: Sequence[int]) -> None:
 //|         """Structure used to capture a date and time.  Can be constructed from a `struct_time`, `tuple`, `list`, or `namedtuple` with 9 elements.
 //|
 //|         :param Sequence time_tuple: Sequence of time info: ``(tm_year, tm_mon, tm_mday, tm_hour, tm_min, tm_sec, tm_wday, tm_yday, tm_isdst)``

From 1a076d34c9d197c1e1420117f856a5d9aa2e8581 Mon Sep 17 00:00:00 2001
From: Radomir Dopieralski <openstack@sheep.art.pl>
Date: Tue, 29 Jun 2021 00:47:54 +0200
Subject: [PATCH 328/349] PewPew M4: use keypad instead of gamepad

Since the new keypad module is taking over gamepad functionality,
I'm switching to it. If this works well, I will make the change
for the remaining boards.
---
 frozen/circuitpython-stage                         | 2 +-
 ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/frozen/circuitpython-stage b/frozen/circuitpython-stage
index 40d8a03b45..b014aa045d 160000
--- a/frozen/circuitpython-stage
+++ b/frozen/circuitpython-stage
@@ -1 +1 @@
-Subproject commit 40d8a03b4569d566faa62fcb0f798178118f2954
+Subproject commit b014aa045d9014b86a4ae583f452c6b8282a61b9
diff --git a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
index d500b81112..7990f91ccc 100644
--- a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
@@ -30,14 +30,17 @@ CIRCUIPTY_USB_CDC = 0
 CIRCUITPY_USB_HID = 0
 CIRCUITPY_USB_MIDI = 0
 CIRCUITPY_VECTORIO = 0
+CIRCUITPY_GAMEPAD = 0
+CIRCUITPY_PWMIO = 0
 
 CIRCUITPY_ANALOGIO = 1
 CIRCUITPY_AUDIOMIXER = 1
 CIRCUITPY_AUDIOIO = 1
+CIRCUITPY_SYNTHIO = 1
 CIRCUITPY_DISPLAYIO = 1
-CIRCUITPY_GAMEPAD = 1
 CIRCUITPY_MATH = 1
 CIRCUITPY_STAGE = 1
+CIRCUITPY_KEYPAD = 1
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/pewpew_m4
 CIRCUITPY_DISPLAY_FONT = $(TOP)/ports/atmel-samd/boards/ugame10/brutalist-6.bdf

From ae8ea915d7e643ce6d9332c2c569d64f2fc05d74 Mon Sep 17 00:00:00 2001
From: dmcomm <71192617+dmcomm@users.noreply.github.com>
Date: Tue, 29 Jun 2021 13:38:12 +0100
Subject: [PATCH 329/349] Fix pulseio.PulseIn __len__() documentation

---
 shared-bindings/pulseio/PulseIn.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/pulseio/PulseIn.c b/shared-bindings/pulseio/PulseIn.c
index ebc8d450e3..4672c1e060 100644
--- a/shared-bindings/pulseio/PulseIn.c
+++ b/shared-bindings/pulseio/PulseIn.c
@@ -237,7 +237,7 @@ const mp_obj_property_t pulseio_pulsein_paused_obj = {
 //|     def __bool__(self) -> bool: ...
 //|
 //|     def __len__(self) -> int:
-//|         """Returns the current pulse length
+//|         """Returns the number of pulse durations currently stored.
 //|
 //|         This allows you to::
 //|

From e0c626af162e6854c3ede9f5cc80260d5a8d8840 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Tue, 29 Jun 2021 19:59:44 +0530
Subject: [PATCH 330/349] fix bytes() and bytearray() input validation

---
 py/objarray.c | 3 +++
 py/objstr.c   | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/py/objarray.c b/py/objarray.c
index 2d363392dd..220969ee20 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -195,6 +195,9 @@ STATIC mp_obj_t bytearray_make_new(const mp_obj_type_t *type_in, size_t n_args,
         // no args: construct an empty bytearray
         return MP_OBJ_FROM_PTR(array_new(BYTEARRAY_TYPECODE, 0));
     } else if (mp_obj_is_int(args[0])) {
+        if (n_args > 1) {
+            mp_raise_TypeError(MP_ERROR_TEXT("wrong number of arguments"));
+        }
         // 1 arg, an integer: construct a blank bytearray of that length
         mp_uint_t len = mp_obj_get_int(args[0]);
         mp_obj_array_t *o = array_new(BYTEARRAY_TYPECODE, len);
diff --git a/py/objstr.c b/py/objstr.c
index f95624960d..f29a954fb2 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -233,6 +233,10 @@ STATIC mp_obj_t bytes_make_new(const mp_obj_type_t *type_in, size_t n_args, cons
         return MP_OBJ_FROM_PTR(o);
     }
 
+    if (n_args > 1) {
+        goto wrong_args;
+    }
+
     if (mp_obj_is_small_int(args[0])) {
         mp_int_t len = MP_OBJ_SMALL_INT_VALUE(args[0]);
         if (len < 0) {
@@ -244,10 +248,6 @@ STATIC mp_obj_t bytes_make_new(const mp_obj_type_t *type_in, size_t n_args, cons
         return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
     }
 
-    if (n_args > 1) {
-        goto wrong_args;
-    }
-
     // check if __bytes__ exists, and if so delegate to it
     mp_obj_t dest[2];
     mp_load_method_maybe(args[0], MP_QSTR___bytes__, dest);

From b8c4f7d6853ec2d9f5756d4ec95faa441bbdf23a Mon Sep 17 00:00:00 2001
From: Radomir Dopieralski <openstack@sheep.art.pl>
Date: Tue, 29 Jun 2021 17:30:51 +0200
Subject: [PATCH 331/349] MacroPad RP2040: Add initialization for the OLED
 display

---
 .../boards/adafruit_macropad_rp2040/board.c   | 77 ++++++++++++++++++-
 .../boards/adafruit_macropad_rp2040/pins.c    |  3 +
 2 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c b/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c
index 3fb4b21cbf..214662e331 100644
--- a/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c
+++ b/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c
@@ -24,13 +24,86 @@
  * THE SOFTWARE.
  */
 
-#include "supervisor/board.h"
-
+#include "shared-bindings/board/__init__.h"
+#include "shared-bindings/displayio/FourWire.h"
+#include "shared-module/displayio/__init__.h"
+#include "shared-module/displayio/mipi_constants.h"
+#include "shared-bindings/busio/SPI.h"
 #include "shared-bindings/microcontroller/Pin.h"
 #include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
 #include "supervisor/shared/board.h"
 
+displayio_fourwire_obj_t board_display_obj;
+
+#define DELAY 0x80
+
+uint8_t display_init_sequence[] = {
+    0xae, 0, // sleep
+    0xd5, 1, 0x80, // fOsc divide by 2
+    0xa8, 1, 0x3f, // multiplex 64
+    0xd3, 1, 0x00, // offset 0
+    0x40, 1, 0x00, // start line 0
+    0xad, 1, 0x8b, // dc/dc on
+    0xa1, 0, // segment remap = 0
+    0xc8, 0, // scan incr
+    0xda, 1, 0x12, // com pins
+    0x81, 1, 0xff, // contrast 255
+    0xd9, 1, 0x1f, // pre/dis-charge 2DCLKs/2CLKs
+    0xdb, 1, 0x20, // VCOM deslect 0.770
+    0x20, 1, 0x20,
+    0x33, 0, // VPP 9V
+    0xa6, 0, // not inverted
+    0xa4, 0, // normal
+    0xaf, 0, // on
+};
+
 void board_init(void) {
+    busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
+    common_hal_busio_spi_construct(spi, &pin_GPIO26, &pin_GPIO27, NULL);
+    common_hal_busio_spi_never_reset(spi);
+
+    displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
+    bus->base.type = &displayio_fourwire_type;
+    common_hal_displayio_fourwire_construct(bus,
+        spi,
+        &pin_GPIO24, // Command or data
+        &pin_GPIO22, // Chip select
+        &pin_GPIO23, // Reset
+        1000000, // Baudrate
+        0, // Polarity
+        0); // Phase
+
+    displayio_display_obj_t *display = &displays[0].display;
+    display->base.type = &displayio_display_type;
+    common_hal_displayio_display_construct(display,
+        bus,
+        128, // Width
+        64, // Height
+        2, // column start
+        0, // row start
+        0, // rotation
+        1, // Color depth
+        true, // grayscale
+        false, // pixels in byte share row. Only used with depth < 8
+        1, // bytes per cell. Only valid for depths < 8
+        false, // reverse_pixels_in_byte. Only valid for depths < 8
+        true, // reverse_pixels_in_word
+        0, // Set column command
+        0, // Set row command
+        0, // Write memory command
+        0xd3, // set vertical scroll command
+        display_init_sequence,
+        sizeof(display_init_sequence),
+        NULL,
+        0x81,
+        1.0f, // brightness
+        false, // auto_brightness
+        true, // single_byte_bounds
+        true, // data as commands
+        true, // auto_refresh
+        60, // native_frames_per_second
+        true, // backlight_on_high
+        true); // SH1107_addressing
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/raspberrypi/boards/adafruit_macropad_rp2040/pins.c b/ports/raspberrypi/boards/adafruit_macropad_rp2040/pins.c
index bc57161ec5..17ff8d9a41 100644
--- a/ports/raspberrypi/boards/adafruit_macropad_rp2040/pins.c
+++ b/ports/raspberrypi/boards/adafruit_macropad_rp2040/pins.c
@@ -1,4 +1,5 @@
 #include "shared-bindings/board/__init__.h"
+#include "shared-module/displayio/__init__.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_KEY1), MP_ROM_PTR(&pin_GPIO1) },
@@ -43,5 +44,7 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_i2c_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)}
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

From f2ef5863315a6e3916a1d6e730ac6bd13af82708 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Tue, 29 Jun 2021 11:54:15 -0700
Subject: [PATCH 332/349] clean up

---
 ports/nrf/bluetooth/ble_drv.c            |  2 --
 ports/nrf/common-hal/_bleio/Connection.c |  1 -
 ports/nrf/common-hal/_bleio/Service.c    |  1 -
 supervisor/shared/bluetooth/bluetooth.c  | 26 ++++++++++--------------
 supervisor/shared/bluetooth/serial.h     |  2 +-
 5 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/ports/nrf/bluetooth/ble_drv.c b/ports/nrf/bluetooth/ble_drv.c
index 29b2844736..9596e45fbb 100644
--- a/ports/nrf/bluetooth/ble_drv.c
+++ b/ports/nrf/bluetooth/ble_drv.c
@@ -38,8 +38,6 @@
 #include "py/misc.h"
 #include "py/mpstate.h"
 
-// #include "supervisor/shared/bluetooth.h"
-
 nrf_nvic_state_t nrf_nvic_state = { 0 };
 
 // Flag indicating progress of internal flash operation.
diff --git a/ports/nrf/common-hal/_bleio/Connection.c b/ports/nrf/common-hal/_bleio/Connection.c
index 0e7c6a3c54..b94ad09e6a 100644
--- a/ports/nrf/common-hal/_bleio/Connection.c
+++ b/ports/nrf/common-hal/_bleio/Connection.c
@@ -311,7 +311,6 @@ bool connection_on_ble_evt(ble_evt_t *ble_evt, void *self_in) {
                     // Did an sd_ble_gatts_sys_attr_set() with the stored sys_attr values.
                     // Indicate ATTR table change because we may have reloaded since the peer last
                     // connected.
-                    mp_printf(&mp_plat_print, "restore sys attrs\n");
                     sd_ble_gatts_service_changed(self->conn_handle, 0xC, 0xFFFF);
                 } else {
                     // No matching bonding found, so use fresh system attributes.
diff --git a/ports/nrf/common-hal/_bleio/Service.c b/ports/nrf/common-hal/_bleio/Service.c
index 0c4ded2d1b..4980b70fe1 100644
--- a/ports/nrf/common-hal/_bleio/Service.c
+++ b/ports/nrf/common-hal/_bleio/Service.c
@@ -153,7 +153,6 @@ void common_hal_bleio_service_add_characteristic(bleio_service_obj_t *self,
         char_md.p_char_user_desc = (const uint8_t *)user_description;
         char_md.char_user_desc_max_size = strlen(user_description);
         char_md.char_user_desc_size = strlen(user_description);
-        mp_printf(&mp_plat_print, "user description %s\n", user_description);
     }
 
     bleio_attribute_gatts_set_security_mode(&char_attr_md.read_perm, characteristic->read_perm);
diff --git a/supervisor/shared/bluetooth/bluetooth.c b/supervisor/shared/bluetooth/bluetooth.c
index 1a57075c6e..df57bf691d 100644
--- a/supervisor/shared/bluetooth/bluetooth.c
+++ b/supervisor/shared/bluetooth/bluetooth.c
@@ -87,9 +87,9 @@ bool boot_in_discovery_mode = false;
 bool advertising = false;
 
 STATIC void supervisor_bluetooth_start_advertising(void) {
-    // #if !CIRCUITPY_BLE_FILE_SERVICE && !CIRCUITPY_SERIAL_BLE
-    // return;
-    // #else
+    #if !CIRCUITPY_BLE_FILE_SERVICE && !CIRCUITPY_SERIAL_BLE
+    return;
+    #else
     bool is_connected = common_hal_bleio_adapter_get_connected(&common_hal_bleio_adapter_obj);
     if (is_connected) {
         return;
@@ -98,7 +98,6 @@ STATIC void supervisor_bluetooth_start_advertising(void) {
     #if CIRCUITPY_USB
     // Don't advertise when we have USB instead of BLE.
     if (!bonded && !boot_in_discovery_mode) {
-        mp_printf(&mp_plat_print, "skipping advertising\n");
         return;
     }
     #endif
@@ -112,7 +111,6 @@ STATIC void supervisor_bluetooth_start_advertising(void) {
     // Advertise with less power when doing so publicly to reduce who can hear us. This will make it
     // harder for someone with bad intentions to pair from a distance.
     if (!bonded) {
-        mp_printf(&mp_plat_print, "public advertising\n");
         tx_power = -40;
         adv = public_advertising_data;
         adv_len = sizeof(public_advertising_data);
@@ -130,9 +128,9 @@ STATIC void supervisor_bluetooth_start_advertising(void) {
         scan_response_len,
         tx_power,
         NULL);
-    mp_printf(&mp_plat_print, "advert %d\n", status);
     // This may fail if we are already advertising.
     advertising = status == NRF_SUCCESS;
+    #endif
 }
 
 #define BLE_DISCOVERY_DATA_GUARD 0xbb0000bb
@@ -144,22 +142,20 @@ void supervisor_bluetooth_init(void) {
     if ((reset_state & BLE_DISCOVERY_DATA_GUARD_MASK) == BLE_DISCOVERY_DATA_GUARD) {
         ble_mode = (reset_state & ~BLE_DISCOVERY_DATA_GUARD_MASK) >> 8;
     }
-    // const mcu_reset_reason_t reset_reason = common_hal_mcu_processor_get_reset_reason();
+    const mcu_reset_reason_t reset_reason = common_hal_mcu_processor_get_reset_reason();
     boot_in_discovery_mode = false;
-    // if (reset_reason != RESET_REASON_POWER_ON &&
-    //     reset_reason != RESET_REASON_RESET_PIN &&
-    //     reset_reason != RESET_REASON_UNKNOWN &&
-    //     reset_reason != RESET_REASON_SOFTWARE) {
-    //     return;
-    // }
+    if (reset_reason != RESET_REASON_POWER_ON &&
+        reset_reason != RESET_REASON_RESET_PIN &&
+        reset_reason != RESET_REASON_UNKNOWN &&
+        reset_reason != RESET_REASON_SOFTWARE) {
+        return;
+    }
 
     if (ble_mode == 0) {
         port_set_saved_word(BLE_DISCOVERY_DATA_GUARD | (0x01 << 8));
     }
     // Wait for a while to allow for reset.
 
-    ble_mode = 1;
-
     #ifdef CIRCUITPY_BOOT_BUTTON
     digitalio_digitalinout_obj_t boot_button;
     common_hal_digitalio_digitalinout_construct(&boot_button, CIRCUITPY_BOOT_BUTTON);
diff --git a/supervisor/shared/bluetooth/serial.h b/supervisor/shared/bluetooth/serial.h
index ac96a67f40..b5bbcccf10 100644
--- a/supervisor/shared/bluetooth/serial.h
+++ b/supervisor/shared/bluetooth/serial.h
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2019 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2021 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

From 89678f79a7301f89d20d8cdb9be6204011da1156 Mon Sep 17 00:00:00 2001
From: ajs256 <67526318+ajs256@users.noreply.github.com>
Date: Tue, 29 Jun 2021 21:32:32 -0700
Subject: [PATCH 333/349] Convert to using issue forms

---
 .github/ISSUE_TEMPLATE/bug_report.md  | 54 ---------------------------
 .github/ISSUE_TEMPLATE/bug_report.yml | 54 +++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 54 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 65f61ebb5f..0000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,54 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: 'bug'
-assignees: ''
-
----
-
-<!-- Thanks! for testing out CircuitPython. Now that you have got a problem...
-you can file a bug report for it. Feel free to modify the below format to better
-suit your issue. :) -->
-
-**Firmware**
-
-<!-- Include the version of CircuitPython you're running. You can see it in the
-`boot_out.txt` file, as well as in the REPL. -->
-
-```python
-Adafruit CircuitPython 6.2.0-beta.2 on 2021-03-01; Raspberry Pi Pico with rp2040
-```
-
-**Code/REPL**
-
-<!-- Include your code that reproduces the bug here. Try to distill down to the
-minimum possible to reproduce. -->
-
-```python
-import busio, bitbangio
-i2c = bitbangio.I2C(board.GP1, board.GP0)
-```
-
-**Behavior**
-
-<!-- What happens when you run the code above? Include any error messages. -->
-
-```python
-Traceback (most recent call last):
-  File "<stdin>", line 1, in <module>
-TimeoutError: Clock stretch too long
-```
-
-**Description**
-
-<!-- Optionally, describe the issue in more detail. Here are some examples: -->
-
-- Error while using i2c...
-- Only happens when...
-- might be related to #4291...
-
-**Additional Info**
-
-<!-- Optionally, add any other information like hardware connection, scope output etc.
-If you have already done some debugging, mention it here. -->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000000..8e3ccf6440
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,54 @@
+name: Bug report
+description: Report a bug in CircuitPython
+labels:
+  - bug
+body:
+  - type: markdown
+    attributes:
+      value: >-
+        ## Bug Report
+        Thanks! for testing out CircuitPython. Now that you have got a
+        problem... you can file a bug report for it. 
+  - type: input
+    id: firmware
+    attributes:
+      label: CircuitPython version
+      description: >-
+        Include the version of CircuitPython you're running. You can see it in
+        the `boot_out.txt` file, as well as in the REPL.
+      placeholder: >-
+        Adafruit CircuitPython 6.2.0-beta.2 on 2021-03-01; Raspberry Pi Pico
+        with rp2040
+  - type: textarea
+    id: code
+    attributes:
+      label: Code/REPL
+      placeholder: >-
+        import busio, bitbangio 
+        i2c = bitbangio.I2C(board.GP1, board.GP0)
+      render: python
+  - type: textarea
+    id: behavior
+    attributes:
+      label: Behavior
+      description: What happens when you run the code above? Include any error messages.
+      placeholder: >-
+        Traceback (most recent call last):   
+          File "<stdin>", line 1, in <module>
+          TimeoutError: Clock stretch too long
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Optionally, describe the bug in more detail.
+      placeholder: >-
+        - Error while using i2c... 
+        - Only happens when... 
+        - might be related to #4291...
+  - type: textarea
+    id: more-info
+    attributes:
+      label: Additional information
+      description: >-
+        Optionally, add any other information like hardware connection, scope
+        output etc. If you have already done some debugging, mention it here.
\ No newline at end of file

From d99d818bf85090b048baa8efee47383fcaf2bc41 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Wed, 30 Jun 2021 15:42:22 +0530
Subject: [PATCH 334/349] update issue form and template

---
 .github/ISSUE_TEMPLATE/bug_report.yml     | 47 ++++++++++++++---------
 .github/ISSUE_TEMPLATE/config.yml         |  4 +-
 .github/ISSUE_TEMPLATE/feature_request.md |  4 +-
 3 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 8e3ccf6440..7b6a53dbba 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,49 +1,57 @@
-name: Bug report
-description: Report a bug in CircuitPython
+name: 🐞 Bug Report
+description: Create a bug report to help us improve
 labels:
   - bug
 body:
   - type: markdown
     attributes:
       value: >-
-        ## Bug Report
-        Thanks! for testing out CircuitPython. Now that you have got a
-        problem... you can file a bug report for it. 
-  - type: input
+        Thanks! for testing out CircuitPython. Now that you have encountered a
+        bug... you can file a report for it.
+  - type: textarea
     id: firmware
     attributes:
       label: CircuitPython version
       description: >-
         Include the version of CircuitPython you're running. You can see it in
-        the `boot_out.txt` file, as well as in the REPL.
-      placeholder: >-
-        Adafruit CircuitPython 6.2.0-beta.2 on 2021-03-01; Raspberry Pi Pico
-        with rp2040
+        the `boot_out.txt` file, as well as in the `REPL`.
+      placeholder: Adafruit CircuitPython 6.2.0 on 2021-03-01; Raspberry Pi Pico with rp2040
+      render: python
+    validations:
+      required: true
   - type: textarea
     id: code
     attributes:
       label: Code/REPL
-      placeholder: >-
-        import busio, bitbangio 
+      description: This is automatically rendered as Python, so no need for backticks.
+      placeholder: |
+        import busio, bitbangio
         i2c = bitbangio.I2C(board.GP1, board.GP0)
       render: python
+    validations:
+      required: true
   - type: textarea
     id: behavior
     attributes:
       label: Behavior
-      description: What happens when you run the code above? Include any error messages.
-      placeholder: >-
-        Traceback (most recent call last):   
+      description: What happens when you run the code above? Include error messages (if any).
+      placeholder: |
+        ```python
+        Traceback (most recent call last):
           File "<stdin>", line 1, in <module>
           TimeoutError: Clock stretch too long
+        ```
+        On-board led pulses red.
+    validations:
+      required: true
   - type: textarea
     id: description
     attributes:
       label: Description
       description: Optionally, describe the bug in more detail.
-      placeholder: >-
-        - Error while using i2c... 
-        - Only happens when... 
+      placeholder: |
+        - Error while using i2c...
+        - Only happens when...
         - might be related to #4291...
   - type: textarea
     id: more-info
@@ -51,4 +59,5 @@ body:
       label: Additional information
       description: >-
         Optionally, add any other information like hardware connection, scope
-        output etc. If you have already done some debugging, mention it here.
\ No newline at end of file
+        output etc. If you have already done some debugging, mention it here.
+      placeholder: Removing [this](url) line resolves the issue.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 73bf24af0c..2990e0d4b0 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,7 +1,7 @@
 contact_links:
-  - name: Adafruit Forum
+  - name: 🔗 Adafruit Forum
     url: https://forums.adafruit.com/
     about: Official Adafruit technical support forum. Good for getting help on getting a project working.
-  - name: Adafruit Discord
+  - name: 🔗 Adafruit Discord
     url: https://adafru.it/discord
     about: Unofficial chat with many helpful folks and normally prompt replies.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 4f65b84145..87349ee00c 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,5 +1,5 @@
 ---
-name: Feature request
+name: 🚀 Feature Request
 about: Suggest an idea for this project
 title: ''
 labels: 'enhancement'
@@ -7,5 +7,5 @@ assignees: ''
 
 ---
 
-<!-- We are always adding new features and enhancements to CircuitPython 🚀
+<!-- We keep adding new features and enhancements to CircuitPython 🚀
 and would love ❤ to see what new challenge you have got for us... 🙂 -->

From d83a21b9845d7fff14546c9d3950d2883e6a7fed Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Wed, 30 Jun 2021 10:27:46 -0500
Subject: [PATCH 335/349] ColorConverter: Add "BGR" color modes.

The BGR565_SWAPPED mode is needed for OV2640 cameras.
---
 locale/circuitpython.pot                 |  5 -----
 shared-bindings/displayio/__init__.c     |  8 ++++++++
 shared-bindings/displayio/__init__.h     |  4 ++++
 shared-module/displayio/ColorConverter.c | 22 ++++++++++++++++++++++
 4 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 0fc96f8b6e..e421eef8ea 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -147,11 +147,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/shared-bindings/displayio/__init__.c b/shared-bindings/displayio/__init__.c
index b39e72b946..dc4971de2a 100644
--- a/shared-bindings/displayio/__init__.c
+++ b/shared-bindings/displayio/__init__.c
@@ -70,6 +70,10 @@ MAKE_ENUM_VALUE(displayio_colorspace_type, displayio_colorspace, RGB565, DISPLAY
 MAKE_ENUM_VALUE(displayio_colorspace_type, displayio_colorspace, RGB565_SWAPPED, DISPLAYIO_COLORSPACE_RGB565_SWAPPED);
 MAKE_ENUM_VALUE(displayio_colorspace_type, displayio_colorspace, RGB555, DISPLAYIO_COLORSPACE_RGB555);
 MAKE_ENUM_VALUE(displayio_colorspace_type, displayio_colorspace, RGB555_SWAPPED, DISPLAYIO_COLORSPACE_RGB555_SWAPPED);
+MAKE_ENUM_VALUE(displayio_colorspace_type, displayio_colorspace, BGR565, DISPLAYIO_COLORSPACE_BGR565);
+MAKE_ENUM_VALUE(displayio_colorspace_type, displayio_colorspace, BGR565_SWAPPED, DISPLAYIO_COLORSPACE_BGR565_SWAPPED);
+MAKE_ENUM_VALUE(displayio_colorspace_type, displayio_colorspace, BGR555, DISPLAYIO_COLORSPACE_BGR555);
+MAKE_ENUM_VALUE(displayio_colorspace_type, displayio_colorspace, BGR555_SWAPPED, DISPLAYIO_COLORSPACE_BGR555_SWAPPED);
 
 //| class Colorspace:
 //|     """The colorspace for a `ColorConverter` to operate in"""
@@ -95,6 +99,10 @@ MAKE_ENUM_MAP(displayio_colorspace) {
     MAKE_ENUM_MAP_ENTRY(displayio_colorspace, RGB565_SWAPPED),
     MAKE_ENUM_MAP_ENTRY(displayio_colorspace, RGB555),
     MAKE_ENUM_MAP_ENTRY(displayio_colorspace, RGB555_SWAPPED),
+    MAKE_ENUM_MAP_ENTRY(displayio_colorspace, BGR565),
+    MAKE_ENUM_MAP_ENTRY(displayio_colorspace, BGR565_SWAPPED),
+    MAKE_ENUM_MAP_ENTRY(displayio_colorspace, BGR555),
+    MAKE_ENUM_MAP_ENTRY(displayio_colorspace, BGR555_SWAPPED),
 };
 STATIC MP_DEFINE_CONST_DICT(displayio_colorspace_locals_dict, displayio_colorspace_locals_table);
 
diff --git a/shared-bindings/displayio/__init__.h b/shared-bindings/displayio/__init__.h
index 31af2ff2ba..938fcf3d98 100644
--- a/shared-bindings/displayio/__init__.h
+++ b/shared-bindings/displayio/__init__.h
@@ -46,6 +46,10 @@ typedef enum {
     DISPLAYIO_COLORSPACE_RGB555,
     DISPLAYIO_COLORSPACE_RGB565_SWAPPED,
     DISPLAYIO_COLORSPACE_RGB555_SWAPPED,
+    DISPLAYIO_COLORSPACE_BGR565,
+    DISPLAYIO_COLORSPACE_BGR555,
+    DISPLAYIO_COLORSPACE_BGR565_SWAPPED,
+    DISPLAYIO_COLORSPACE_BGR555_SWAPPED,
 } displayio_colorspace_t;
 
 typedef bool (*display_bus_bus_reset)(mp_obj_t bus);
diff --git a/shared-module/displayio/ColorConverter.c b/shared-module/displayio/ColorConverter.c
index 6de7fe7883..4871ce81a0 100644
--- a/shared-module/displayio/ColorConverter.c
+++ b/shared-module/displayio/ColorConverter.c
@@ -176,6 +176,28 @@ void displayio_colorconverter_convert(displayio_colorconverter_t *self, const _d
         }
         break;
 
+        case DISPLAYIO_COLORSPACE_BGR565_SWAPPED:
+            pixel = __builtin_bswap16(pixel);
+            MP_FALLTHROUGH;
+        case DISPLAYIO_COLORSPACE_BGR565: {
+            uint32_t b8 = (pixel >> 11) << 3;
+            uint32_t g8 = ((pixel >> 5) << 2) & 0xff;
+            uint32_t r8 = (pixel << 3) & 0xff;
+            pixel = (r8 << 16) | (g8 << 8) | b8;
+        }
+        break;
+
+        case DISPLAYIO_COLORSPACE_BGR555_SWAPPED:
+            pixel = __builtin_bswap16(pixel);
+            MP_FALLTHROUGH;
+        case DISPLAYIO_COLORSPACE_BGR555: {
+            uint32_t b8 = (pixel >> 10) << 3;
+            uint32_t g8 = ((pixel >> 5) << 3) & 0xff;
+            uint32_t r8 = (pixel << 3) & 0xff;
+            pixel = (r8 << 16) | (g8 << 8) | b8;
+        }
+        break;
+
         case DISPLAYIO_COLORSPACE_RGB888:
             break;
     }

From be206b7ba007f1e137ec63efb6b0408682e1f744 Mon Sep 17 00:00:00 2001
From: Wellington Terumi Uemura <wellingtonuemura@gmail.com>
Date: Wed, 30 Jun 2021 06:57:23 +0000
Subject: [PATCH 336/349] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1008 of 1008 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/pt_BR/
---
 locale/pt_BR.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 82a4cb62b6..fd3800d24c 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2021-06-25 18:00+0000\n"
+"PO-Revision-Date: 2021-06-30 17:19+0000\n"
 "Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -56,7 +56,7 @@ msgstr " é do tipo %q\n"
 
 #: main.c
 msgid " not found.\n"
-msgstr ""
+msgstr " não encontrado.\n"
 
 #: main.c
 msgid " output:\n"
@@ -2093,7 +2093,7 @@ msgstr "Houve um erro na reinicialização SPI"
 
 #: ports/esp32s2/common-hal/busio/SPI.c
 msgid "SPI configuration failed"
-msgstr ""
+msgstr "A configuração SPI falhou"
 
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"

From 0bd181c4d0707c771016354f4161ac61f45eae23 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Wed, 30 Jun 2021 19:19:33 +0200
Subject: [PATCH 337/349] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/
---
 locale/ID.po             | 5 -----
 locale/cs.po             | 5 -----
 locale/de_DE.po          | 5 -----
 locale/el.po             | 5 -----
 locale/en_GB.po          | 5 -----
 locale/es.po             | 8 +++-----
 locale/fil.po            | 5 -----
 locale/fr.po             | 5 -----
 locale/hi.po             | 5 -----
 locale/it_IT.po          | 5 -----
 locale/ja.po             | 5 -----
 locale/ko.po             | 5 -----
 locale/nl.po             | 5 -----
 locale/pl.po             | 5 -----
 locale/pt_BR.po          | 8 +++-----
 locale/sv.po             | 8 +++-----
 locale/zh_Latn_pinyin.po | 8 +++-----
 17 files changed, 12 insertions(+), 85 deletions(-)

diff --git a/locale/ID.po b/locale/ID.po
index bb8428a3f2..b04a643c49 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -154,11 +154,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/cs.po b/locale/cs.po
index ed87ef5768..0ea37f724f 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -150,11 +150,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 498f3bcd49..e9c7aeaaea 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -155,11 +155,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/el.po b/locale/el.po
index 68052d303d..f80452ea4a 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -147,11 +147,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/en_GB.po b/locale/en_GB.po
index b8e0e96034..8df32c33a6 100644
--- a/locale/en_GB.po
+++ b/locale/en_GB.po
@@ -156,11 +156,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/es.po b/locale/es.po
index 13988a3e60..00e787413d 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -158,11 +158,6 @@ msgstr "%q debe estar entre %d y %d"
 msgid "%q must of type %q"
 msgstr "%q debe ser de tipo %q"
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr "%q debe almacenar bytes"
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
@@ -4516,6 +4511,9 @@ msgstr "zi debe ser de tipo flotante"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi debe ser una forma (n_section,2)"
 
+#~ msgid "%q must store bytes"
+#~ msgstr "%q debe almacenar bytes"
+
 #~ msgid "Buffer too large and unable to allocate"
 #~ msgstr "Buffer demasiado grande e incapaz de asignar"
 
diff --git a/locale/fil.po b/locale/fil.po
index da7b003bbc..094f344f92 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -147,11 +147,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/fr.po b/locale/fr.po
index c224337e01..90e9c26484 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -158,11 +158,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/hi.po b/locale/hi.po
index a6327c63d9..67f1c611fc 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -147,11 +147,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 28c4012afd..bca6205810 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -157,11 +157,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/ja.po b/locale/ja.po
index e3f25b8f9c..9ec4898cde 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -152,11 +152,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/ko.po b/locale/ko.po
index 06ced23109..1e5abe7858 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -148,11 +148,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/nl.po b/locale/nl.po
index 2561eeb710..cc305dbd4c 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -150,11 +150,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/pl.po b/locale/pl.po
index 6d736c6ce6..c9335fd036 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -152,11 +152,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index fd3800d24c..940e3e5e44 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -156,11 +156,6 @@ msgstr "%q deve estar entre %d e %d"
 msgid "%q must of type %q"
 msgstr "o %q deve ser do tipo %q"
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr "o %q deve armazenar bytes"
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
@@ -4526,6 +4521,9 @@ msgstr "zi deve ser de um tipo float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi deve estar na forma (n_section, 2)"
 
+#~ msgid "%q must store bytes"
+#~ msgstr "o %q deve armazenar bytes"
+
 #~ msgid "Buffer too large and unable to allocate"
 #~ msgstr "O buffer é muito grande e incapaz de alocar"
 
diff --git a/locale/sv.po b/locale/sv.po
index a5e6241d1c..d1018e2f6b 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -155,11 +155,6 @@ msgstr "%q måste vara mellan %d och %d"
 msgid "%q must of type %q"
 msgstr "%q måste av typen %q"
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr "%q måste lagra bytes"
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
@@ -4485,6 +4480,9 @@ msgstr "zi måste vara av typ float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi måste vara i formen (n_section, 2)"
 
+#~ msgid "%q must store bytes"
+#~ msgstr "%q måste lagra bytes"
+
 #~ msgid "Buffer too large and unable to allocate"
 #~ msgstr "Bufferten är för stor och kan inte allokeras"
 
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 9cbd84ebfd..3018748aac 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -157,11 +157,6 @@ msgstr "%q bì xū zài %d hé %d zhī jiān"
 msgid "%q must of type %q"
 msgstr "%q bì xū lèi xíng %q"
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr "%q bì xū cún chǔ zì jié"
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
@@ -4482,6 +4477,9 @@ msgstr "zi bìxū wèi fú diǎn xíng"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi bìxū jùyǒu xíngzhuàng (n_section,2)"
 
+#~ msgid "%q must store bytes"
+#~ msgstr "%q bì xū cún chǔ zì jié"
+
 #~ msgid "Buffer too large and unable to allocate"
 #~ msgstr "Huǎn chōng qū tài dà ， wú fǎ fēn pèi"
 

From 4d953dcbddd23ac9528a781bafe51ac55432e82e Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@adafruit.com>
Date: Wed, 30 Jun 2021 22:54:03 -0400
Subject: [PATCH 338/349] Fix missing quote in locale/zh_Latn_pinyin.po

Co-authored-by: microDev <70126934+microDev1@users.noreply.github.com>
---
 locale/zh_Latn_pinyin.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 3d754c82c8..81b815f2c1 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -2351,7 +2351,7 @@ msgstr "Wúfǎ xiě rù nvm."
 
 #: shared-bindings/alarm/SleepMemory.c
 msgid "Unable to write to sleep_memory."
-msgstr "wú fǎ xiě rù sleep_memory.
+msgstr "wú fǎ xiě rù sleep_memory."
 
 #: ports/nrf/common-hal/_bleio/UUID.c
 msgid "Unexpected nrfx uuid type"

From 3940878695f2d7797fc1570d8b281ca9ffa454ff Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Thu, 1 Jul 2021 12:49:11 -0700
Subject: [PATCH 339/349] Shrink builds and handle 0-length writes

---
 ports/nrf/boards/pca10100/mpconfigboard.mk  |  1 +
 ports/nrf/boards/simmel/mpconfigboard.mk    |  2 ++
 ports/nrf/common-hal/_bleio/__init__.c      | 10 ++++-----
 ports/nrf/common-hal/busio/SPI.c            |  2 +-
 ports/nrf/common-hal/busio/SPI.h            |  2 +-
 supervisor/shared/bluetooth/file_transfer.c | 24 +++++++++++++++++++++
 6 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/ports/nrf/boards/pca10100/mpconfigboard.mk b/ports/nrf/boards/pca10100/mpconfigboard.mk
index 3a7407861b..6381df74f4 100644
--- a/ports/nrf/boards/pca10100/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10100/mpconfigboard.mk
@@ -27,6 +27,7 @@ CIRCUITPY_RE = 0
 CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_SDCARDIO = 0
 CIRCUITPY_ULAB = 0
+CIRCUITPY_USB_MIDI = 0
 
 MICROPY_PY_ASYNC_AWAIT = 0
 
diff --git a/ports/nrf/boards/simmel/mpconfigboard.mk b/ports/nrf/boards/simmel/mpconfigboard.mk
index 57f83fd3d2..4f6385260e 100644
--- a/ports/nrf/boards/simmel/mpconfigboard.mk
+++ b/ports/nrf/boards/simmel/mpconfigboard.mk
@@ -43,3 +43,5 @@ CIRCUITPY_WATCHDOG = 1
 
 # Override optimization to keep binary small
 OPTIMIZATION_FLAGS = -Os
+SUPEROPT_VM = 0
+SUPEROPT_GC = 0
diff --git a/ports/nrf/common-hal/_bleio/__init__.c b/ports/nrf/common-hal/_bleio/__init__.c
index de1641eb9d..604f0be2e5 100644
--- a/ports/nrf/common-hal/_bleio/__init__.c
+++ b/ports/nrf/common-hal/_bleio/__init__.c
@@ -96,6 +96,8 @@ void check_sec_status(uint8_t sec_status) {
 
 // Turn off BLE on a reset or reload.
 void bleio_reset() {
+    // Set this explicitly to save data.
+    common_hal_bleio_adapter_obj.base.type = &bleio_adapter_type;
     if (!common_hal_bleio_adapter_get_enabled(&common_hal_bleio_adapter_obj)) {
         return;
     }
@@ -107,12 +109,8 @@ void bleio_reset() {
 }
 
 // The singleton _bleio.Adapter object, bound to _bleio.adapter
-// It currently only has properties and no state
-bleio_adapter_obj_t common_hal_bleio_adapter_obj = {
-    .base = {
-        .type = &bleio_adapter_type,
-    },
-};
+// It currently only has properties and no state. Inited by bleio_reset
+bleio_adapter_obj_t common_hal_bleio_adapter_obj;
 
 void common_hal_bleio_check_connected(uint16_t conn_handle) {
     if (conn_handle == BLE_CONN_HANDLE_INVALID) {
diff --git a/ports/nrf/common-hal/busio/SPI.c b/ports/nrf/common-hal/busio/SPI.c
index 309e1bce18..f606fe898f 100644
--- a/ports/nrf/common-hal/busio/SPI.c
+++ b/ports/nrf/common-hal/busio/SPI.c
@@ -51,7 +51,7 @@
 #endif
 
 // These are in order from highest available frequency to lowest (32MHz first, then 8MHz).
-STATIC spim_peripheral_t spim_peripherals[] = {
+STATIC const spim_peripheral_t spim_peripherals[] = {
     #if NRFX_CHECK(NRFX_SPIM3_ENABLED)
     // SPIM3 exists only on nRF52840 and supports 32MHz max. All other SPIM's are only 8MHz max.
     // Allocate SPIM3 first.
diff --git a/ports/nrf/common-hal/busio/SPI.h b/ports/nrf/common-hal/busio/SPI.h
index 796ff59f93..91c65ee0df 100644
--- a/ports/nrf/common-hal/busio/SPI.h
+++ b/ports/nrf/common-hal/busio/SPI.h
@@ -38,7 +38,7 @@ typedef struct {
 
 typedef struct {
     mp_obj_base_t base;
-    spim_peripheral_t *spim_peripheral;
+    const spim_peripheral_t *spim_peripheral;
     bool has_lock;
     uint8_t clock_pin_number;
     uint8_t MOSI_pin_number;
diff --git a/supervisor/shared/bluetooth/file_transfer.c b/supervisor/shared/bluetooth/file_transfer.c
index dcd3d36e78..3bd306c5a7 100644
--- a/supervisor/shared/bluetooth/file_transfer.c
+++ b/supervisor/shared/bluetooth/file_transfer.c
@@ -275,9 +275,26 @@ STATIC uint8_t _process_write(const uint8_t *raw_buf, size_t command_len) {
     // Align the next chunk to a sector boundary.
     uint32_t offset = command->offset;
     size_t chunk_size = MIN(total_write_length - offset, 512 - (offset % 512));
+    // Special case when truncating the file. (Deleting stuff off the end.)
+    if (chunk_size == 0) {
+        f_lseek(&active_file, offset);
+        f_truncate(&active_file);
+        f_close(&active_file);
+        #if CIRCUITPY_USB_MSC
+        usb_msc_unlock();
+        #endif
+    }
     response.offset = offset;
     response.free_space = chunk_size;
     common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct write_pacing), NULL, 0);
+    if (chunk_size == 0) {
+        // Don't reload until everything is written out of the packet buffer.
+        common_hal_bleio_packet_buffer_flush(&_transfer_packet_buffer);
+        // Trigger an autoreload
+        autoreload_now();
+        return ANY_COMMAND;
+    }
+
     return WRITE_DATA;
 }
 
@@ -474,7 +491,12 @@ STATIC uint8_t _process_listdir(uint8_t *raw_buf, size_t command_len) {
 STATIC uint8_t current_command[COMMAND_SIZE] __attribute__ ((aligned(4)));
 STATIC volatile size_t current_offset;
 STATIC uint8_t next_command;
+STATIC bool running = false;
 void supervisor_bluetooth_file_transfer_background(void) {
+    if (running) {
+        return;
+    }
+    running = true;
     mp_int_t size = 1;
     while (size > 0) {
         size = common_hal_bleio_packet_buffer_readinto(&_transfer_packet_buffer, current_command + current_offset, COMMAND_SIZE - current_offset);
@@ -527,9 +549,11 @@ void supervisor_bluetooth_file_transfer_background(void) {
             current_offset = 0;
         }
     }
+    running = false;
 }
 
 void supervisor_bluetooth_file_transfer_disconnected(void) {
     next_command = ANY_COMMAND;
+    current_offset = 0;
     f_close(&active_file);
 }

From 33bbb8b1f48ba1263bddb103f49720201a139a91 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Wed, 30 Jun 2021 13:11:54 -0400
Subject: [PATCH 340/349] RP2040 PWMAudioOut: Release DMA channels after play
 has finished.

---
 ports/atmel-samd/audio_dma.c                  | 16 +++++-----
 ports/atmel-samd/audio_dma.h                  |  8 ++---
 ports/raspberrypi/audio_dma.c                 | 32 +++++++++----------
 ports/raspberrypi/audio_dma.h                 |  8 ++---
 .../common-hal/audiobusio/I2SOut.h            |  5 +--
 .../common-hal/audiopwmio/PWMAudioOut.c       |  8 ++---
 ports/raspberrypi/common-hal/pwmio/PWMOut.c   |  2 ++
 shared-module/audiocore/RawSample.c           | 10 +++---
 shared-module/audiocore/RawSample.h           |  6 ++--
 shared-module/audiocore/WaveFile.c            | 13 ++++----
 shared-module/audiocore/WaveFile.h            |  6 ++--
 shared-module/audiocore/__init__.c            | 12 +++----
 shared-module/audiocore/__init__.h            | 12 +++----
 shared-module/audiomixer/Mixer.c              | 10 +++---
 shared-module/audiomixer/Mixer.h              |  6 ++--
 shared-module/audiomp3/MP3Decoder.c           | 12 +++----
 shared-module/audiomp3/MP3Decoder.h           |  6 ++--
 shared-module/synthio/MidiTrack.c             |  6 ++--
 shared-module/synthio/MidiTrack.h             |  6 ++--
 19 files changed, 93 insertions(+), 91 deletions(-)

diff --git a/ports/atmel-samd/audio_dma.c b/ports/atmel-samd/audio_dma.c
index 7b1ca42c06..7f1260973d 100644
--- a/ports/atmel-samd/audio_dma.c
+++ b/ports/atmel-samd/audio_dma.c
@@ -131,7 +131,7 @@ void audio_dma_load_next_block(audio_dma_t *dma) {
     uint8_t *buffer;
     uint32_t buffer_length;
     audioio_get_buffer_result_t get_buffer_result =
-        audiosample_get_buffer(dma->sample, dma->single_channel, dma->audio_channel,
+        audiosample_get_buffer(dma->sample, dma->single_channel_output, dma->audio_channel,
             &buffer, &buffer_length);
 
     DmacDescriptor *descriptor = dma->second_descriptor;
@@ -155,7 +155,7 @@ void audio_dma_load_next_block(audio_dma_t *dma) {
     descriptor->SRCADDR.reg = ((uint32_t)output_buffer) + output_buffer_length;
     if (get_buffer_result == GET_BUFFER_DONE) {
         if (dma->loop) {
-            audiosample_reset_buffer(dma->sample, dma->single_channel, dma->audio_channel);
+            audiosample_reset_buffer(dma->sample, dma->single_channel_output, dma->audio_channel);
         } else {
             descriptor->DESCADDR.reg = 0;
         }
@@ -183,7 +183,7 @@ static void setup_audio_descriptor(DmacDescriptor *descriptor, uint8_t beat_size
 audio_dma_result audio_dma_setup_playback(audio_dma_t *dma,
     mp_obj_t sample,
     bool loop,
-    bool single_channel,
+    bool single_channel_output,
     uint8_t audio_channel,
     bool output_signed,
     uint32_t output_register_address,
@@ -195,7 +195,7 @@ audio_dma_result audio_dma_setup_playback(audio_dma_t *dma,
 
     dma->sample = sample;
     dma->loop = loop;
-    dma->single_channel = single_channel;
+    dma->single_channel_output = single_channel_output;
     dma->audio_channel = audio_channel;
     dma->dma_channel = dma_channel;
     dma->signed_to_unsigned = false;
@@ -203,12 +203,12 @@ audio_dma_result audio_dma_setup_playback(audio_dma_t *dma,
     dma->second_descriptor = NULL;
     dma->spacing = 1;
     dma->first_descriptor_free = true;
-    audiosample_reset_buffer(sample, single_channel, audio_channel);
+    audiosample_reset_buffer(sample, single_channel_output, audio_channel);
 
     bool single_buffer;
     bool samples_signed;
     uint32_t max_buffer_length;
-    audiosample_get_buffer_structure(sample, single_channel, &single_buffer, &samples_signed,
+    audiosample_get_buffer_structure(sample, single_channel_output, &single_buffer, &samples_signed,
         &max_buffer_length, &dma->spacing);
     uint8_t output_spacing = dma->spacing;
     if (output_signed != samples_signed) {
@@ -254,12 +254,12 @@ audio_dma_result audio_dma_setup_playback(audio_dma_t *dma,
     } else {
         dma->beat_size = 1;
         dma->bytes_per_sample = 1;
-        if (single_channel) {
+        if (single_channel_output) {
             output_register_address += 1;
         }
     }
     // Transfer both channels at once.
-    if (!single_channel && audiosample_channel_count(sample) == 2) {
+    if (!single_channel_output && audiosample_channel_count(sample) == 2) {
         dma->beat_size *= 2;
     }
 
diff --git a/ports/atmel-samd/audio_dma.h b/ports/atmel-samd/audio_dma.h
index 4e7d193b1d..bc5beb3bf5 100644
--- a/ports/atmel-samd/audio_dma.h
+++ b/ports/atmel-samd/audio_dma.h
@@ -42,7 +42,7 @@ typedef struct {
     uint8_t beat_size;
     uint8_t spacing;
     bool loop;
-    bool single_channel;
+    bool single_channel_output;
     bool signed_to_unsigned;
     bool unsigned_to_signed;
     bool first_buffer_free;
@@ -72,16 +72,16 @@ void dma_free_channel(uint8_t channel);
 // This sets everything up but doesn't start the timer.
 // Sample is the python object for the sample to play.
 // loop is true if we should loop the sample.
-// single_channel is true if we only output a single channel. When false, all channels will be
+// single_channel_output is true if we only output a single channel. When false, all channels will be
 //   output.
-// audio_channel is the index of the channel to dma. single_channel must be false in this case.
+// audio_channel is the index of the channel to dma. single_channel_output must be false in this case.
 // output_signed is true if the dma'd data should be signed. False and it will be unsigned.
 // output_register_address is the address to copy data to.
 // dma_trigger_source is the DMA trigger source which cause another copy
 audio_dma_result audio_dma_setup_playback(audio_dma_t *dma,
     mp_obj_t sample,
     bool loop,
-    bool single_channel,
+    bool single_channel_output,
     uint8_t audio_channel,
     bool output_signed,
     uint32_t output_register_address,
diff --git a/ports/raspberrypi/audio_dma.c b/ports/raspberrypi/audio_dma.c
index 7044c44edf..91805e0a4d 100644
--- a/ports/raspberrypi/audio_dma.c
+++ b/ports/raspberrypi/audio_dma.c
@@ -129,7 +129,7 @@ void audio_dma_load_next_block(audio_dma_t *dma) {
     uint8_t *buffer;
     uint32_t buffer_length;
     get_buffer_result = audiosample_get_buffer(dma->sample,
-        dma->single_channel, dma->audio_channel, &buffer, &buffer_length);
+        dma->single_channel_output, dma->audio_channel, &buffer, &buffer_length);
 
     if (get_buffer_result == GET_BUFFER_ERROR) {
         audio_dma_stop(dma);
@@ -148,7 +148,7 @@ void audio_dma_load_next_block(audio_dma_t *dma) {
     dma_channel_set_read_addr(dma_channel, output_buffer, false /* trigger */);
     if (get_buffer_result == GET_BUFFER_DONE) {
         if (dma->loop) {
-            audiosample_reset_buffer(dma->sample, dma->single_channel, dma->audio_channel);
+            audiosample_reset_buffer(dma->sample, dma->single_channel_output, dma->audio_channel);
         } else {
             // Set channel trigger to ourselves so we don't keep going.
             dma_channel_hw_t *c = &dma_hw->ch[dma_channel];
@@ -161,13 +161,13 @@ void audio_dma_load_next_block(audio_dma_t *dma) {
 audio_dma_result audio_dma_setup_playback(audio_dma_t *dma,
     mp_obj_t sample,
     bool loop,
-    bool single_channel,
+    bool single_channel_output,
     uint8_t audio_channel,
     bool output_signed,
     uint8_t output_resolution,
     uint32_t output_register_address,
     uint8_t dma_trigger_source) {
-    // Use two DMA channels to  because the DMA can't wrap to itself without the
+    // Use two DMA channels to play because the DMA can't wrap to itself without the
     // buffer being power of two aligned.
     dma->channel[0] = dma_claim_unused_channel(false);
     dma->channel[1] = dma_claim_unused_channel(false);
@@ -180,7 +180,7 @@ audio_dma_result audio_dma_setup_playback(audio_dma_t *dma,
 
     dma->sample = sample;
     dma->loop = loop;
-    dma->single_channel = single_channel;
+    dma->single_channel_output = single_channel_output;
     dma->audio_channel = audio_channel;
     dma->signed_to_unsigned = false;
     dma->unsigned_to_signed = false;
@@ -189,12 +189,12 @@ audio_dma_result audio_dma_setup_playback(audio_dma_t *dma,
     dma->first_channel_free = true;
     dma->output_resolution = output_resolution;
     dma->sample_resolution = audiosample_bits_per_sample(sample);
-    audiosample_reset_buffer(sample, single_channel, audio_channel);
+    audiosample_reset_buffer(sample, single_channel_output, audio_channel);
 
     bool single_buffer;
     bool samples_signed;
     uint32_t max_buffer_length;
-    audiosample_get_buffer_structure(sample, single_channel, &single_buffer, &samples_signed,
+    audiosample_get_buffer_structure(sample, single_channel_output, &single_buffer, &samples_signed,
         &max_buffer_length, &dma->sample_spacing);
 
     // Check to see if we have to scale the resolution up.
@@ -227,10 +227,9 @@ audio_dma_result audio_dma_setup_playback(audio_dma_t *dma,
         dma->output_size = 1;
     }
     // Transfer both channels at once.
-    if (!single_channel && audiosample_channel_count(sample) == 2) {
+    if (!single_channel_output && audiosample_channel_count(sample) == 2) {
         dma->output_size *= 2;
     }
-
     enum dma_channel_transfer_size dma_size = DMA_SIZE_8;
     if (dma->output_size == 2) {
         dma_size = DMA_SIZE_16;
@@ -324,20 +323,19 @@ void audio_dma_stop(audio_dma_t *dma) {
 // to hold the previous value.
 void audio_dma_pause(audio_dma_t *dma) {
     dma_hw->ch[dma->channel[0]].al1_ctrl &= ~DMA_CH0_CTRL_TRIG_EN_BITS;
-    dma_hw->ch[dma->channel[1]].al1_ctrl &= ~DMA_CH0_CTRL_TRIG_EN_BITS;
+    dma_hw->ch[dma->channel[1]].al1_ctrl &= ~DMA_CH1_CTRL_TRIG_EN_BITS;
 }
 
 void audio_dma_resume(audio_dma_t *dma) {
     // Always re-enable the non-busy channel first so it's ready to continue when the busy channel
     // finishes and chains to it. (An interrupt could make the time between enables long.)
-    size_t first = 0;
-    size_t second = 1;
     if (dma_channel_is_busy(dma->channel[0])) {
-        first = 1;
-        second = 0;
+        dma_hw->ch[dma->channel[1]].al1_ctrl |= DMA_CH1_CTRL_TRIG_EN_BITS;
+        dma_hw->ch[dma->channel[0]].al1_ctrl |= DMA_CH0_CTRL_TRIG_EN_BITS;
+    } else {
+        dma_hw->ch[dma->channel[0]].al1_ctrl |= DMA_CH0_CTRL_TRIG_EN_BITS;
+        dma_hw->ch[dma->channel[1]].al1_ctrl |= DMA_CH1_CTRL_TRIG_EN_BITS;
     }
-    dma_hw->ch[dma->channel[first]].al1_ctrl |= DMA_CH0_CTRL_TRIG_EN_BITS;
-    dma_hw->ch[dma->channel[second]].al1_ctrl |= DMA_CH0_CTRL_TRIG_EN_BITS;
 }
 
 bool audio_dma_get_paused(audio_dma_t *dma) {
@@ -378,6 +376,8 @@ bool audio_dma_get_playing(audio_dma_t *dma) {
 
 // WARN(tannewt): DO NOT print from here, or anything it calls. Printing calls
 // background tasks such as this and causes a stack overflow.
+// NOTE(dhalbert): I successfully printed from here while debugging.
+// So it's possible, but be careful.
 STATIC void dma_callback_fun(void *arg) {
     audio_dma_t *dma = arg;
     if (dma == NULL) {
diff --git a/ports/raspberrypi/audio_dma.h b/ports/raspberrypi/audio_dma.h
index faececa8df..f84f6debeb 100644
--- a/ports/raspberrypi/audio_dma.h
+++ b/ports/raspberrypi/audio_dma.h
@@ -39,7 +39,7 @@ typedef struct {
     uint8_t output_size;
     uint8_t sample_spacing;
     bool loop;
-    bool single_channel;
+    bool single_channel_output;
     bool signed_to_unsigned;
     bool unsigned_to_signed;
     bool output_signed;
@@ -66,16 +66,16 @@ void audio_dma_reset(void);
 // This sets everything up but doesn't start the timer.
 // Sample is the python object for the sample to play.
 // loop is true if we should loop the sample.
-// single_channel is true if we only output a single channel. When false, all channels will be
+// single_channel_output is true if we only output a single channel. When false, all channels will be
 //   output.
-// audio_channel is the index of the channel to dma. single_channel must be false in this case.
+// audio_channel is the index of the channel to dma. single_channel_output must be false in this case.
 // output_signed is true if the dma'd data should be signed. False and it will be unsigned.
 // output_register_address is the address to copy data to.
 // dma_trigger_source is the DMA trigger source which cause another copy
 audio_dma_result audio_dma_setup_playback(audio_dma_t *dma,
     mp_obj_t sample,
     bool loop,
-    bool single_channel,
+    bool single_channel_output,
     uint8_t audio_channel,
     bool output_signed,
     uint8_t output_resolution,
diff --git a/ports/raspberrypi/common-hal/audiobusio/I2SOut.h b/ports/raspberrypi/common-hal/audiobusio/I2SOut.h
index 851e86c8a9..52226ae49d 100644
--- a/ports/raspberrypi/common-hal/audiobusio/I2SOut.h
+++ b/ports/raspberrypi/common-hal/audiobusio/I2SOut.h
@@ -1,3 +1,4 @@
+
 /*
  * This file is part of the MicroPython project, http://micropython.org/
  *
@@ -36,10 +37,10 @@
 // We don't bit pack because we'll only have two at most. Its better to save code size instead.
 typedef struct {
     mp_obj_base_t base;
-    bool left_justified;
     rp2pio_statemachine_obj_t state_machine;
-    bool playing;
     audio_dma_t dma;
+    bool left_justified;
+    bool playing;
 } audiobusio_i2sout_obj_t;
 
 void i2sout_reset(void);
diff --git a/ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c b/ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
index e191606577..bf9d04bb65 100644
--- a/ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
+++ b/ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
@@ -96,11 +96,6 @@ void common_hal_audiopwmio_pwmaudioout_construct(audiopwmio_pwmaudioout_obj_t *s
         mp_raise_RuntimeError(translate("All timers in use"));
     }
 
-    claim_pin(left_channel);
-    if (right_channel != NULL) {
-        claim_pin(right_channel);
-    }
-
     audio_dma_init(&self->dma);
     self->pacing_timer = NUM_DMA_TIMERS;
 
@@ -220,7 +215,10 @@ bool common_hal_audiopwmio_pwmaudioout_get_playing(audiopwmio_pwmaudioout_obj_t
     if (!playing && self->pacing_timer < NUM_DMA_TIMERS) {
         dma_hw->timer[self->pacing_timer] = 0;
         self->pacing_timer = NUM_DMA_TIMERS;
+
+        audio_dma_stop(&self->dma);
     }
+
     return playing;
 }
 
diff --git a/ports/raspberrypi/common-hal/pwmio/PWMOut.c b/ports/raspberrypi/common-hal/pwmio/PWMOut.c
index 9695a8fdf7..5215f2b8df 100644
--- a/ports/raspberrypi/common-hal/pwmio/PWMOut.c
+++ b/ports/raspberrypi/common-hal/pwmio/PWMOut.c
@@ -163,6 +163,8 @@ pwmout_result_t common_hal_pwmio_pwmout_construct(pwmio_pwmout_obj_t *self,
     self->variable_frequency = variable_frequency;
     self->duty_cycle = duty;
 
+    claim_pin(pin);
+
     if (frequency == 0 || frequency > (common_hal_mcu_processor_get_frequency() / 2)) {
         return PWMOUT_INVALID_FREQUENCY;
     }
diff --git a/shared-module/audiocore/RawSample.c b/shared-module/audiocore/RawSample.c
index 1f1db0a509..e7d765e197 100644
--- a/shared-module/audiocore/RawSample.c
+++ b/shared-module/audiocore/RawSample.c
@@ -67,17 +67,17 @@ uint8_t common_hal_audioio_rawsample_get_channel_count(audioio_rawsample_obj_t *
 }
 
 void audioio_rawsample_reset_buffer(audioio_rawsample_obj_t *self,
-    bool single_channel,
+    bool single_channel_output,
     uint8_t channel) {
 }
 
 audioio_get_buffer_result_t audioio_rawsample_get_buffer(audioio_rawsample_obj_t *self,
-    bool single_channel,
+    bool single_channel_output,
     uint8_t channel,
     uint8_t **buffer,
     uint32_t *buffer_length) {
     *buffer_length = self->len;
-    if (single_channel) {
+    if (single_channel_output) {
         *buffer = self->buffer + (channel % self->channel_count) * (self->bits_per_sample / 8);
     } else {
         *buffer = self->buffer;
@@ -85,13 +85,13 @@ audioio_get_buffer_result_t audioio_rawsample_get_buffer(audioio_rawsample_obj_t
     return GET_BUFFER_DONE;
 }
 
-void audioio_rawsample_get_buffer_structure(audioio_rawsample_obj_t *self, bool single_channel,
+void audioio_rawsample_get_buffer_structure(audioio_rawsample_obj_t *self, bool single_channel_output,
     bool *single_buffer, bool *samples_signed,
     uint32_t *max_buffer_length, uint8_t *spacing) {
     *single_buffer = true;
     *samples_signed = self->samples_signed;
     *max_buffer_length = self->len;
-    if (single_channel) {
+    if (single_channel_output) {
         *spacing = self->channel_count;
     } else {
         *spacing = 1;
diff --git a/shared-module/audiocore/RawSample.h b/shared-module/audiocore/RawSample.h
index 8208b4c280..10d395b8a3 100644
--- a/shared-module/audiocore/RawSample.h
+++ b/shared-module/audiocore/RawSample.h
@@ -44,14 +44,14 @@ typedef struct {
 
 // These are not available from Python because it may be called in an interrupt.
 void audioio_rawsample_reset_buffer(audioio_rawsample_obj_t *self,
-    bool single_channel,
+    bool single_channel_output,
     uint8_t channel);
 audioio_get_buffer_result_t audioio_rawsample_get_buffer(audioio_rawsample_obj_t *self,
-    bool single_channel,
+    bool single_channel_output,
     uint8_t channel,
     uint8_t **buffer,
     uint32_t *buffer_length);                                                      // length in bytes
-void audioio_rawsample_get_buffer_structure(audioio_rawsample_obj_t *self, bool single_channel,
+void audioio_rawsample_get_buffer_structure(audioio_rawsample_obj_t *self, bool single_channel_output,
     bool *single_buffer, bool *samples_signed,
     uint32_t *max_buffer_length, uint8_t *spacing);
 
diff --git a/shared-module/audiocore/WaveFile.c b/shared-module/audiocore/WaveFile.c
index 4864004d52..6d42d27ddb 100644
--- a/shared-module/audiocore/WaveFile.c
+++ b/shared-module/audiocore/WaveFile.c
@@ -169,9 +169,9 @@ uint32_t audioio_wavefile_max_buffer_length(audioio_wavefile_obj_t *self) {
 }
 
 void audioio_wavefile_reset_buffer(audioio_wavefile_obj_t *self,
-    bool single_channel,
+    bool single_channel_output,
     uint8_t channel) {
-    if (single_channel && channel == 1) {
+    if (single_channel_output && channel == 1) {
         return;
     }
     // We don't reset the buffer index in case we're looping and we have an odd number of buffer
@@ -184,11 +184,11 @@ void audioio_wavefile_reset_buffer(audioio_wavefile_obj_t *self,
 }
 
 audioio_get_buffer_result_t audioio_wavefile_get_buffer(audioio_wavefile_obj_t *self,
-    bool single_channel,
+    bool single_channel_output,
     uint8_t channel,
     uint8_t **buffer,
     uint32_t *buffer_length) {
-    if (!single_channel) {
+    if (!single_channel_output) {
         channel = 0;
     }
 
@@ -265,13 +265,14 @@ audioio_get_buffer_result_t audioio_wavefile_get_buffer(audioio_wavefile_obj_t *
     return self->bytes_remaining == 0 ? GET_BUFFER_DONE : GET_BUFFER_MORE_DATA;
 }
 
-void audioio_wavefile_get_buffer_structure(audioio_wavefile_obj_t *self, bool single_channel,
+void audioio_wavefile_get_buffer_structure(audioio_wavefile_obj_t *self, bool single_channel_output,
     bool *single_buffer, bool *samples_signed,
     uint32_t *max_buffer_length, uint8_t *spacing) {
     *single_buffer = false;
+    // In WAV files, 8-bit samples are always unsigned, and larger samples are always signed.
     *samples_signed = self->bits_per_sample > 8;
     *max_buffer_length = 512;
-    if (single_channel) {
+    if (single_channel_output) {
         *spacing = self->channel_count;
     } else {
         *spacing = 1;
diff --git a/shared-module/audiocore/WaveFile.h b/shared-module/audiocore/WaveFile.h
index 80b2fd3a56..986359e16e 100644
--- a/shared-module/audiocore/WaveFile.h
+++ b/shared-module/audiocore/WaveFile.h
@@ -57,14 +57,14 @@ typedef struct {
 
 // These are not available from Python because it may be called in an interrupt.
 void audioio_wavefile_reset_buffer(audioio_wavefile_obj_t *self,
-    bool single_channel,
+    bool single_channel_output,
     uint8_t channel);
 audioio_get_buffer_result_t audioio_wavefile_get_buffer(audioio_wavefile_obj_t *self,
-    bool single_channel,
+    bool single_channel_output,
     uint8_t channel,
     uint8_t **buffer,
     uint32_t *buffer_length);                                                     // length in bytes
-void audioio_wavefile_get_buffer_structure(audioio_wavefile_obj_t *self, bool single_channel,
+void audioio_wavefile_get_buffer_structure(audioio_wavefile_obj_t *self, bool single_channel_output,
     bool *single_buffer, bool *samples_signed,
     uint32_t *max_buffer_length, uint8_t *spacing);
 
diff --git a/shared-module/audiocore/__init__.c b/shared-module/audiocore/__init__.c
index 605eac70b9..b85586851b 100644
--- a/shared-module/audiocore/__init__.c
+++ b/shared-module/audiocore/__init__.c
@@ -50,24 +50,24 @@ uint8_t audiosample_channel_count(mp_obj_t sample_obj) {
     return proto->channel_count(MP_OBJ_TO_PTR(sample_obj));
 }
 
-void audiosample_reset_buffer(mp_obj_t sample_obj, bool single_channel, uint8_t audio_channel) {
+void audiosample_reset_buffer(mp_obj_t sample_obj, bool single_channel_output, uint8_t audio_channel) {
     const audiosample_p_t *proto = mp_proto_get_or_throw(MP_QSTR_protocol_audiosample, sample_obj);
-    proto->reset_buffer(MP_OBJ_TO_PTR(sample_obj), single_channel, audio_channel);
+    proto->reset_buffer(MP_OBJ_TO_PTR(sample_obj), single_channel_output, audio_channel);
 }
 
 audioio_get_buffer_result_t audiosample_get_buffer(mp_obj_t sample_obj,
-    bool single_channel,
+    bool single_channel_output,
     uint8_t channel,
     uint8_t **buffer, uint32_t *buffer_length) {
     const audiosample_p_t *proto = mp_proto_get_or_throw(MP_QSTR_protocol_audiosample, sample_obj);
-    return proto->get_buffer(MP_OBJ_TO_PTR(sample_obj), single_channel, channel, buffer, buffer_length);
+    return proto->get_buffer(MP_OBJ_TO_PTR(sample_obj), single_channel_output, channel, buffer, buffer_length);
 }
 
-void audiosample_get_buffer_structure(mp_obj_t sample_obj, bool single_channel,
+void audiosample_get_buffer_structure(mp_obj_t sample_obj, bool single_channel_output,
     bool *single_buffer, bool *samples_signed,
     uint32_t *max_buffer_length, uint8_t *spacing) {
     const audiosample_p_t *proto = mp_proto_get_or_throw(MP_QSTR_protocol_audiosample, sample_obj);
-    proto->get_buffer_structure(MP_OBJ_TO_PTR(sample_obj), single_channel, single_buffer,
+    proto->get_buffer_structure(MP_OBJ_TO_PTR(sample_obj), single_channel_output, single_buffer,
         samples_signed, max_buffer_length, spacing);
 }
 
diff --git a/shared-module/audiocore/__init__.h b/shared-module/audiocore/__init__.h
index 69955a25f7..e57602519c 100644
--- a/shared-module/audiocore/__init__.h
+++ b/shared-module/audiocore/__init__.h
@@ -43,12 +43,12 @@ typedef uint32_t (*audiosample_sample_rate_fun)(mp_obj_t);
 typedef uint8_t (*audiosample_bits_per_sample_fun)(mp_obj_t);
 typedef uint8_t (*audiosample_channel_count_fun)(mp_obj_t);
 typedef void (*audiosample_reset_buffer_fun)(mp_obj_t,
-    bool single_channel, uint8_t audio_channel);
+    bool single_channel_output, uint8_t audio_channel);
 typedef audioio_get_buffer_result_t (*audiosample_get_buffer_fun)(mp_obj_t,
-    bool single_channel, uint8_t channel, uint8_t **buffer,
+    bool single_channel_output, uint8_t channel, uint8_t **buffer,
     uint32_t *buffer_length);
 typedef void (*audiosample_get_buffer_structure_fun)(mp_obj_t,
-    bool single_channel, bool *single_buffer,
+    bool single_channel_output, bool *single_buffer,
     bool *samples_signed, uint32_t *max_buffer_length,
     uint8_t *spacing);
 
@@ -65,12 +65,12 @@ typedef struct _audiosample_p_t {
 uint32_t audiosample_sample_rate(mp_obj_t sample_obj);
 uint8_t audiosample_bits_per_sample(mp_obj_t sample_obj);
 uint8_t audiosample_channel_count(mp_obj_t sample_obj);
-void audiosample_reset_buffer(mp_obj_t sample_obj, bool single_channel, uint8_t audio_channel);
+void audiosample_reset_buffer(mp_obj_t sample_obj, bool single_channel_output, uint8_t audio_channel);
 audioio_get_buffer_result_t audiosample_get_buffer(mp_obj_t sample_obj,
-    bool single_channel,
+    bool single_channel_output,
     uint8_t channel,
     uint8_t **buffer, uint32_t *buffer_length);
-void audiosample_get_buffer_structure(mp_obj_t sample_obj, bool single_channel,
+void audiosample_get_buffer_structure(mp_obj_t sample_obj, bool single_channel_output,
     bool *single_buffer, bool *samples_signed,
     uint32_t *max_buffer_length, uint8_t *spacing);
 
diff --git a/shared-module/audiomixer/Mixer.c b/shared-module/audiomixer/Mixer.c
index 20731933c4..d6569c66f0 100644
--- a/shared-module/audiomixer/Mixer.c
+++ b/shared-module/audiomixer/Mixer.c
@@ -94,7 +94,7 @@ bool common_hal_audiomixer_mixer_get_playing(audiomixer_mixer_obj_t *self) {
 }
 
 void audiomixer_mixer_reset_buffer(audiomixer_mixer_obj_t *self,
-    bool single_channel,
+    bool single_channel_output,
     uint8_t channel) {
     for (uint8_t i = 0; i < self->voice_count; i++) {
         common_hal_audiomixer_mixervoice_stop(self->voice[i]);
@@ -280,11 +280,11 @@ static void mix_down_one_voice(audiomixer_mixer_obj_t *self,
 }
 
 audioio_get_buffer_result_t audiomixer_mixer_get_buffer(audiomixer_mixer_obj_t *self,
-    bool single_channel,
+    bool single_channel_output,
     uint8_t channel,
     uint8_t **buffer,
     uint32_t *buffer_length) {
-    if (!single_channel) {
+    if (!single_channel_output) {
         channel = 0;
     }
 
@@ -351,13 +351,13 @@ audioio_get_buffer_result_t audiomixer_mixer_get_buffer(audiomixer_mixer_obj_t *
     return GET_BUFFER_MORE_DATA;
 }
 
-void audiomixer_mixer_get_buffer_structure(audiomixer_mixer_obj_t *self, bool single_channel,
+void audiomixer_mixer_get_buffer_structure(audiomixer_mixer_obj_t *self, bool single_channel_output,
     bool *single_buffer, bool *samples_signed,
     uint32_t *max_buffer_length, uint8_t *spacing) {
     *single_buffer = false;
     *samples_signed = self->samples_signed;
     *max_buffer_length = self->len;
-    if (single_channel) {
+    if (single_channel_output) {
         *spacing = self->channel_count;
     } else {
         *spacing = 1;
diff --git a/shared-module/audiomixer/Mixer.h b/shared-module/audiomixer/Mixer.h
index ceb04772ec..c9228d9f13 100644
--- a/shared-module/audiomixer/Mixer.h
+++ b/shared-module/audiomixer/Mixer.h
@@ -55,14 +55,14 @@ typedef struct {
 
 // These are not available from Python because it may be called in an interrupt.
 void audiomixer_mixer_reset_buffer(audiomixer_mixer_obj_t *self,
-    bool single_channel,
+    bool single_channel_output,
     uint8_t channel);
 audioio_get_buffer_result_t audiomixer_mixer_get_buffer(audiomixer_mixer_obj_t *self,
-    bool single_channel,
+    bool single_channel_output,
     uint8_t channel,
     uint8_t **buffer,
     uint32_t *buffer_length);                                                      // length in bytes
-void audiomixer_mixer_get_buffer_structure(audiomixer_mixer_obj_t *self, bool single_channel,
+void audiomixer_mixer_get_buffer_structure(audiomixer_mixer_obj_t *self, bool single_channel_output,
     bool *single_buffer, bool *samples_signed,
     uint32_t *max_buffer_length, uint8_t *spacing);
 
diff --git a/shared-module/audiomp3/MP3Decoder.c b/shared-module/audiomp3/MP3Decoder.c
index 2b623233e0..27c69f735b 100644
--- a/shared-module/audiomp3/MP3Decoder.c
+++ b/shared-module/audiomp3/MP3Decoder.c
@@ -295,9 +295,9 @@ bool audiomp3_mp3file_samples_signed(audiomp3_mp3file_obj_t *self) {
 }
 
 void audiomp3_mp3file_reset_buffer(audiomp3_mp3file_obj_t *self,
-    bool single_channel,
+    bool single_channel_output,
     uint8_t channel) {
-    if (single_channel && channel == 1) {
+    if (single_channel_output && channel == 1) {
         return;
     }
     // We don't reset the buffer index in case we're looping and we have an odd number of buffer
@@ -314,14 +314,14 @@ void audiomp3_mp3file_reset_buffer(audiomp3_mp3file_obj_t *self,
 }
 
 audioio_get_buffer_result_t audiomp3_mp3file_get_buffer(audiomp3_mp3file_obj_t *self,
-    bool single_channel,
+    bool single_channel_output,
     uint8_t channel,
     uint8_t **bufptr,
     uint32_t *buffer_length) {
     if (!self->inbuf) {
         return GET_BUFFER_ERROR;
     }
-    if (!single_channel) {
+    if (!single_channel_output) {
         channel = 0;
     }
 
@@ -363,13 +363,13 @@ audioio_get_buffer_result_t audiomp3_mp3file_get_buffer(audiomp3_mp3file_obj_t *
     return GET_BUFFER_MORE_DATA;
 }
 
-void audiomp3_mp3file_get_buffer_structure(audiomp3_mp3file_obj_t *self, bool single_channel,
+void audiomp3_mp3file_get_buffer_structure(audiomp3_mp3file_obj_t *self, bool single_channel_output,
     bool *single_buffer, bool *samples_signed,
     uint32_t *max_buffer_length, uint8_t *spacing) {
     *single_buffer = false;
     *samples_signed = true;
     *max_buffer_length = self->frame_buffer_size;
-    if (single_channel) {
+    if (single_channel_output) {
         *spacing = self->channel_count;
     } else {
         *spacing = 1;
diff --git a/shared-module/audiomp3/MP3Decoder.h b/shared-module/audiomp3/MP3Decoder.h
index c1e6178465..0f2256a417 100644
--- a/shared-module/audiomp3/MP3Decoder.h
+++ b/shared-module/audiomp3/MP3Decoder.h
@@ -58,14 +58,14 @@ typedef struct {
 
 // These are not available from Python because it may be called in an interrupt.
 void audiomp3_mp3file_reset_buffer(audiomp3_mp3file_obj_t *self,
-    bool single_channel,
+    bool single_channel_output,
     uint8_t channel);
 audioio_get_buffer_result_t audiomp3_mp3file_get_buffer(audiomp3_mp3file_obj_t *self,
-    bool single_channel,
+    bool single_channel_output,
     uint8_t channel,
     uint8_t **buffer,
     uint32_t *buffer_length);                                                     // length in bytes
-void audiomp3_mp3file_get_buffer_structure(audiomp3_mp3file_obj_t *self, bool single_channel,
+void audiomp3_mp3file_get_buffer_structure(audiomp3_mp3file_obj_t *self, bool single_channel_output,
     bool *single_buffer, bool *samples_signed,
     uint32_t *max_buffer_length, uint8_t *spacing);
 
diff --git a/shared-module/synthio/MidiTrack.c b/shared-module/synthio/MidiTrack.c
index 0827945ab5..b2693a0c59 100644
--- a/shared-module/synthio/MidiTrack.c
+++ b/shared-module/synthio/MidiTrack.c
@@ -165,7 +165,7 @@ uint8_t common_hal_synthio_miditrack_get_channel_count(synthio_miditrack_obj_t *
 }
 
 void synthio_miditrack_reset_buffer(synthio_miditrack_obj_t *self,
-    bool single_channel, uint8_t channel) {
+    bool single_channel_output, uint8_t channel) {
 
     self->next_span = 0;
 }
@@ -174,7 +174,7 @@ STATIC const uint16_t notes[] = {8372, 8870, 9397, 9956, 10548, 11175, 11840,
                                  12544, 13290, 14080, 14917, 15804}; // 9th octave
 
 audioio_get_buffer_result_t synthio_miditrack_get_buffer(synthio_miditrack_obj_t *self,
-    bool single_channel, uint8_t channel, uint8_t **buffer, uint32_t *buffer_length) {
+    bool single_channel_output, uint8_t channel, uint8_t **buffer, uint32_t *buffer_length) {
 
     if (self->next_span >= self->total_spans) {
         *buffer_length = 0;
@@ -202,7 +202,7 @@ audioio_get_buffer_result_t synthio_miditrack_get_buffer(synthio_miditrack_obj_t
            GET_BUFFER_DONE : GET_BUFFER_MORE_DATA;
 }
 
-void synthio_miditrack_get_buffer_structure(synthio_miditrack_obj_t *self, bool single_channel,
+void synthio_miditrack_get_buffer_structure(synthio_miditrack_obj_t *self, bool single_channel_output,
     bool *single_buffer, bool *samples_signed, uint32_t *max_buffer_length, uint8_t *spacing) {
 
     *single_buffer = true;
diff --git a/shared-module/synthio/MidiTrack.h b/shared-module/synthio/MidiTrack.h
index bd058daaee..0af174ebc1 100644
--- a/shared-module/synthio/MidiTrack.h
+++ b/shared-module/synthio/MidiTrack.h
@@ -49,16 +49,16 @@ typedef struct {
 
 // These are not available from Python because it may be called in an interrupt.
 void synthio_miditrack_reset_buffer(synthio_miditrack_obj_t *self,
-    bool single_channel,
+    bool single_channel_output,
     uint8_t channel);
 
 audioio_get_buffer_result_t synthio_miditrack_get_buffer(synthio_miditrack_obj_t *self,
-    bool single_channel,
+    bool single_channel_output,
     uint8_t channel,
     uint8_t **buffer,
     uint32_t *buffer_length); // length in bytes
 
-void synthio_miditrack_get_buffer_structure(synthio_miditrack_obj_t *self, bool single_channel,
+void synthio_miditrack_get_buffer_structure(synthio_miditrack_obj_t *self, bool single_channel_output,
     bool *single_buffer, bool *samples_signed,
     uint32_t *max_buffer_length, uint8_t *spacing);
 

From d886e8041d57a7430dfa6989c65572ddf86dafed Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Thu, 1 Jul 2021 22:14:37 -0400
Subject: [PATCH 341/349] Turn off pwmio on meow meow for space reasons

---
 ports/atmel-samd/boards/meowmeow/mpconfigboard.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/atmel-samd/boards/meowmeow/mpconfigboard.mk b/ports/atmel-samd/boards/meowmeow/mpconfigboard.mk
index 55c6bb6de3..ff96231b84 100644
--- a/ports/atmel-samd/boards/meowmeow/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/meowmeow/mpconfigboard.mk
@@ -6,6 +6,8 @@ USB_MANUFACTURER = "Electronic Cats"
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
 
+CIRCUITPY_PWMIO = 0
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0

From a4bd4e916be663a4a4de30683ce54a55d2f2014a Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Fri, 2 Jul 2021 14:40:41 +0530
Subject: [PATCH 342/349] esp32s2 - fix spi_never_reset()

---
 ports/esp32s2/common-hal/busio/SPI.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ports/esp32s2/common-hal/busio/SPI.c b/ports/esp32s2/common-hal/busio/SPI.c
index ce05b74b4e..fee533e755 100644
--- a/ports/esp32s2/common-hal/busio/SPI.c
+++ b/ports/esp32s2/common-hal/busio/SPI.c
@@ -118,8 +118,12 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
 void common_hal_busio_spi_never_reset(busio_spi_obj_t *self) {
     spi_never_reset[self->host_id] = true;
     common_hal_never_reset_pin(self->clock);
-    common_hal_never_reset_pin(self->MOSI);
-    common_hal_never_reset_pin(self->MISO);
+    if (self->MOSI != NULL) {
+        common_hal_never_reset_pin(self->MOSI);
+    }
+    if (self->MISO != NULL) {
+        common_hal_never_reset_pin(self->MISO);
+    }
 }
 
 bool common_hal_busio_spi_deinited(busio_spi_obj_t *self) {

From 6bb44674a5400161c82cb9c42c7b7cb10704c207 Mon Sep 17 00:00:00 2001
From: Randall Bohn <rsbohn@gmail.com>
Date: Sat, 3 Jul 2021 04:34:55 -0600
Subject: [PATCH 343/349] Enable audiomixer for esp32s2.

Allows playing sounds via Mixer on I2SOut. Tested on the feathers2.
---
 ports/esp32s2/mpconfigport.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/esp32s2/mpconfigport.mk b/ports/esp32s2/mpconfigport.mk
index 5073d8812d..94758df8d4 100644
--- a/ports/esp32s2/mpconfigport.mk
+++ b/ports/esp32s2/mpconfigport.mk
@@ -21,6 +21,7 @@ CIRCUITPY_AUDIOBUSIO = 1
 CIRCUITPY_AUDIOBUSIO_PDMIN = 0
 CIRCUITPY_AUDIOBUSIO_I2SOUT = 1
 CIRCUITPY_AUDIOIO = 0
+CIRCUITPY_AUDIOMIXER = 1
 CIRCUITPY_CANIO = 1
 CIRCUITPY_COUNTIO = 1
 CIRCUITPY_DUALBANK = 1

From 2519b0647879dfad7017b0abb799385fb6efbbc0 Mon Sep 17 00:00:00 2001
From: Daniel Griswold <daniel@FVFF30DPQ6L8-A2337.griswoldcomputing.com>
Date: Tue, 6 Jul 2021 01:15:32 -0400
Subject: [PATCH 344/349] fix spi definition

---
 ports/raspberrypi/boards/adafruit_macropad_rp2040/pins.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/raspberrypi/boards/adafruit_macropad_rp2040/pins.c b/ports/raspberrypi/boards/adafruit_macropad_rp2040/pins.c
index 17ff8d9a41..f5ff3618c9 100644
--- a/ports/raspberrypi/boards/adafruit_macropad_rp2040/pins.c
+++ b/ports/raspberrypi/boards/adafruit_macropad_rp2040/pins.c
@@ -43,7 +43,7 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO28) },
 
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
-    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)}
 };

From d660d229ab6f6f64736d3c68610af8156ad970fc Mon Sep 17 00:00:00 2001
From: hexthat <hexthat@gmail.com>
Date: Mon, 5 Jul 2021 16:19:23 +0000
Subject: [PATCH 345/349] Translated using Weblate (Chinese (Pinyin))

Currently translated at 100.0% (1007 of 1007 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/zh_Latn/
---
 locale/zh_Latn_pinyin.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 74d6ab1fa8..e357c4eda5 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: circuitpython-cn\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2021-06-25 18:15+0000\n"
+"PO-Revision-Date: 2021-07-06 16:32+0000\n"
 "Last-Translator: hexthat <hexthat@gmail.com>\n"
 "Language-Team: Chinese Hanyu Pinyin\n"
 "Language: zh_Latn_pinyin\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.7.1-dev\n"
+"X-Generator: Weblate 4.8-dev\n"
 
 #: main.c
 msgid ""
@@ -2066,7 +2066,7 @@ msgstr "SPI chóngxīn chūshǐhuà cuòwù"
 
 #: ports/esp32s2/common-hal/busio/SPI.c
 msgid "SPI configuration failed"
-msgstr ""
+msgstr "SPI pèi zhì shī bài"
 
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"

From b4e763613a732121e41e9489018f81aeb53cde0c Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Wed, 7 Jul 2021 15:13:26 +0530
Subject: [PATCH 346/349] delete ports/nrf/examples directory

---
 ports/nrf/examples/ubluepy_eddystone.py | 68 ------------------
 ports/nrf/examples/ubluepy_scan.py      | 42 -----------
 ports/nrf/examples/ubluepy_temp.py      | 94 -------------------------
 3 files changed, 204 deletions(-)
 delete mode 100644 ports/nrf/examples/ubluepy_eddystone.py
 delete mode 100644 ports/nrf/examples/ubluepy_scan.py
 delete mode 100644 ports/nrf/examples/ubluepy_temp.py

diff --git a/ports/nrf/examples/ubluepy_eddystone.py b/ports/nrf/examples/ubluepy_eddystone.py
deleted file mode 100644
index 96818d01c2..0000000000
--- a/ports/nrf/examples/ubluepy_eddystone.py
+++ /dev/null
@@ -1,68 +0,0 @@
-from ubluepy import Peripheral, constants
-
-BLE_GAP_ADV_FLAG_LE_GENERAL_DISC_MODE = const(0x02)
-BLE_GAP_ADV_FLAG_BR_EDR_NOT_SUPPORTED = const(0x04)
-
-BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE = const(
-    BLE_GAP_ADV_FLAG_LE_GENERAL_DISC_MODE | BLE_GAP_ADV_FLAG_BR_EDR_NOT_SUPPORTED
-)
-
-EDDYSTONE_FRAME_TYPE_URL = const(0x10)
-EDDYSTONE_URL_PREFIX_HTTP_WWW = const(0x00)  # "http://www".
-EDDYSTONE_URL_SUFFIX_DOT_COM = const(0x01)  # ".com"
-
-
-def string_to_binarray(text):
-    b = bytearray([])
-    for c in text:
-        b.append(ord(c))
-    return b
-
-
-def gen_ad_type_content(ad_type, data):
-    b = bytearray(1)
-    b.append(ad_type)
-    b.extend(data)
-    b[0] = len(b) - 1
-    return b
-
-
-def generate_eddystone_adv_packet(url):
-    # flags
-    disc_mode = bytearray([BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE])
-    packet_flags = gen_ad_type_content(constants.ad_types.AD_TYPE_FLAGS, disc_mode)
-
-    # 16-bit uuid
-    uuid = bytearray([0xAA, 0xFE])
-    packet_uuid16 = gen_ad_type_content(
-        constants.ad_types.AD_TYPE_16BIT_SERVICE_UUID_COMPLETE, uuid
-    )
-
-    # eddystone data
-    rssi = 0xEE  # -18 dB, approx signal strength at 0m.
-    eddystone_data = bytearray([])
-    eddystone_data.append(EDDYSTONE_FRAME_TYPE_URL)
-    eddystone_data.append(rssi)
-    eddystone_data.append(EDDYSTONE_URL_PREFIX_HTTP_WWW)
-    eddystone_data.extend(string_to_binarray(url))
-    eddystone_data.append(EDDYSTONE_URL_SUFFIX_DOT_COM)
-
-    # service data
-    service_data = uuid + eddystone_data
-    packet_service_data = gen_ad_type_content(
-        constants.ad_types.AD_TYPE_SERVICE_DATA, service_data
-    )
-
-    # generate advertisement packet
-    packet = bytearray([])
-    packet.extend(packet_flags)
-    packet.extend(packet_uuid16)
-    packet.extend(packet_service_data)
-
-    return packet
-
-
-def start():
-    adv_packet = generate_eddystone_adv_packet("micropython")
-    p = Peripheral()
-    p.advertise(data=adv_packet, connectable=False)
diff --git a/ports/nrf/examples/ubluepy_scan.py b/ports/nrf/examples/ubluepy_scan.py
deleted file mode 100644
index 37daa6c69b..0000000000
--- a/ports/nrf/examples/ubluepy_scan.py
+++ /dev/null
@@ -1,42 +0,0 @@
-from ubluepy import Scanner, constants
-
-
-def bytes_to_str(bytes):
-    string = ""
-    for b in bytes:
-        string += chr(b)
-    return string
-
-
-def get_device_names(scan_entries):
-    dev_names = []
-    for e in scan_entries:
-        scan = e.getScanData()
-        if scan:
-            for s in scan:
-                if s[0] == constants.ad_types.AD_TYPE_COMPLETE_LOCAL_NAME:
-                    dev_names.append((e, bytes_to_str(s[2])))
-    return dev_names
-
-
-def find_device_by_name(name):
-    s = Scanner()
-    scan_res = s.scan(100)
-
-    device_names = get_device_names(scan_res)
-    for dev in device_names:
-        if name == dev[1]:
-            return dev[0]
-
-
-# >>> res = find_device_by_name("micr")
-# >>> if res:
-# ...     print("address:", res.addr())
-# ...     print("address type:", res.addr_type())
-# ...     print("rssi:", res.rssi())
-# ...
-# ...
-# ...
-# address: c2:73:61:89:24:45
-# address type: 1
-# rssi: -26
diff --git a/ports/nrf/examples/ubluepy_temp.py b/ports/nrf/examples/ubluepy_temp.py
deleted file mode 100644
index c70235c4a3..0000000000
--- a/ports/nrf/examples/ubluepy_temp.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# This file is part of the MicroPython project, http://micropython.org/
-#
-# The MIT License (MIT)
-#
-# SPDX-FileCopyrightText: Copyright (c) 2017 Glenn Ruben Bakke
-#
-# 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
-
-from pyb import LED
-from machine import RTC, Temp
-from ubluepy import Service, Characteristic, UUID, Peripheral, constants
-
-
-def event_handler(id, handle, data):
-    global rtc
-    global periph
-    global serv_env_sense
-    global notif_enabled
-
-    if id == constants.EVT_GAP_CONNECTED:
-        # indicated 'connected'
-        LED(1).on()
-
-    elif id == constants.EVT_GAP_DISCONNECTED:
-        # stop low power timer
-        rtc.stop()
-        # indicate 'disconnected'
-        LED(1).off()
-        # restart advertisement
-        periph.advertise(device_name="micr_temp", services=[serv_env_sense])
-
-    elif id == constants.EVT_GATTS_WRITE:
-        # write to this Characteristic is to CCCD
-        if int(data[0]) == 1:
-            notif_enabled = True
-            # start low power timer
-            rtc.start()
-        else:
-            notif_enabled = False
-            # stop low power timer
-            rtc.stop()
-
-
-def send_temp(timer_id):
-    global notif_enabled
-    global char_temp
-
-    if notif_enabled:
-        # measure chip temperature
-        temp = Temp.read()
-        temp = temp * 100
-        char_temp.write(bytearray([temp & 0xFF, temp >> 8]))
-
-
-# start off with LED(1) off
-LED(1).off()
-
-# use RTC1 as RTC0 is used by bluetooth stack
-# set up RTC callback every 5 second
-rtc = RTC(1, period=5, mode=RTC.PERIODIC, callback=send_temp)
-
-notif_enabled = False
-
-uuid_env_sense = UUID("0x181A")  # Environmental Sensing service
-uuid_temp = UUID("0x2A6E")  # Temperature characteristic
-
-serv_env_sense = Service(uuid_env_sense)
-
-temp_props = Characteristic.PROP_NOTIFY | Characteristic.PROP_READ
-temp_attrs = Characteristic.ATTR_CCCD
-char_temp = Characteristic(uuid_temp, props=temp_props, attrs=temp_attrs)
-
-serv_env_sense.addCharacteristic(char_temp)
-
-periph = Peripheral()
-periph.addService(serv_env_sense)
-periph.setConnectionHandler(event_handler)
-periph.advertise(device_name="micr_temp", services=[serv_env_sense])

From 2e068d0384b74220cd78628f1b1ad543dc9b2911 Mon Sep 17 00:00:00 2001
From: James Carr <70200140+lesamouraipourpre@users.noreply.github.com>
Date: Wed, 7 Jul 2021 22:30:30 +0100
Subject: [PATCH 347/349] Minor docs fix in TileGrid.c

---
 shared-bindings/displayio/TileGrid.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-bindings/displayio/TileGrid.c b/shared-bindings/displayio/TileGrid.c
index 42e9810b54..a0c5e3d816 100644
--- a/shared-bindings/displayio/TileGrid.c
+++ b/shared-bindings/displayio/TileGrid.c
@@ -56,7 +56,7 @@
 //|         tile_width and tile_height match the height of the bitmap by default.
 //|
 //|         :param Bitmap bitmap: The bitmap storing one or more tiles.
-//|         :param ColorConverter or Palette pixel_shader: The pixel shader that produces colors from values
+//|         :param ColorConverter,Palette pixel_shader: The pixel shader that produces colors from values
 //|         :param int width: Width of the grid in tiles.
 //|         :param int height: Height of the grid in tiles.
 //|         :param int tile_width: Width of a single tile in pixels. Defaults to the full Bitmap and must evenly divide into the Bitmap's dimensions.

From bd6826496cfb7e5fdcf48591c463f89243d5d0fb Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Thu, 8 Jul 2021 08:14:37 -0400
Subject: [PATCH 348/349] Fix various RP2040 audio dma things: (see detailed
 commit message)

1. Check for correct error values from dma_claim_unused_channel.
2. Introduce a .stereo flag for simplicity.
3. Clarify PWM carrier frequency choice.
4. Start introducing quiescent audio value. Still need to ramp up/down.
5. Redo audio stop logic a bit.
6. Fix (unrelated) displayio dependency things.

There is still an interference problem between other DMA users and audio. Still debugging this.
---
 ports/raspberrypi/audio_dma.c                 | 17 +++--
 .../common-hal/audiobusio/I2SOut.c            |  7 ++
 .../common-hal/audiopwmio/PWMAudioOut.c       | 74 ++++++++++++-------
 .../common-hal/audiopwmio/PWMAudioOut.h       |  1 +
 ports/raspberrypi/mpconfigport.mk             |  4 +-
 5 files changed, 68 insertions(+), 35 deletions(-)

diff --git a/ports/raspberrypi/audio_dma.c b/ports/raspberrypi/audio_dma.c
index 91805e0a4d..52b1c84b91 100644
--- a/ports/raspberrypi/audio_dma.c
+++ b/ports/raspberrypi/audio_dma.c
@@ -169,15 +169,20 @@ audio_dma_result audio_dma_setup_playback(audio_dma_t *dma,
     uint8_t dma_trigger_source) {
     // Use two DMA channels to play because the DMA can't wrap to itself without the
     // buffer being power of two aligned.
-    dma->channel[0] = dma_claim_unused_channel(false);
-    dma->channel[1] = dma_claim_unused_channel(false);
-    if (dma->channel[0] == NUM_DMA_CHANNELS || dma->channel[1] == NUM_DMA_CHANNELS) {
-        if (dma->channel[0] < NUM_DMA_CHANNELS) {
-            dma_channel_unclaim(dma->channel[0]);
-        }
+    int dma_channel_0_maybe = dma_claim_unused_channel(false);
+    if (dma_channel_0_maybe < 0) {
         return AUDIO_DMA_DMA_BUSY;
     }
 
+    int dma_channel_1_maybe = dma_claim_unused_channel(false);
+    if (dma_channel_1_maybe < 0) {
+        dma_channel_unclaim((uint)dma_channel_0_maybe);
+        return AUDIO_DMA_DMA_BUSY;
+    }
+
+    dma->channel[0] = (uint8_t)dma_channel_0_maybe;
+    dma->channel[1] = (uint8_t)dma_channel_1_maybe;
+
     dma->sample = sample;
     dma->loop = loop;
     dma->single_channel_output = single_channel_output;
diff --git a/ports/raspberrypi/common-hal/audiobusio/I2SOut.c b/ports/raspberrypi/common-hal/audiobusio/I2SOut.c
index 0ad44c2527..0958de6883 100644
--- a/ports/raspberrypi/common-hal/audiobusio/I2SOut.c
+++ b/ports/raspberrypi/common-hal/audiobusio/I2SOut.c
@@ -145,7 +145,13 @@ void common_hal_audiobusio_i2sout_deinit(audiobusio_i2sout_obj_t *self) {
         return;
     }
 
+    if (common_hal_audiobusio_i2sout_get_playing(self)) {
+        common_hal_audiobusio_i2sout_stop(self);
+    }
+
     common_hal_rp2pio_statemachine_deinit(&self->state_machine);
+
+    audio_dma_deinit(&self->dma);
 }
 
 void common_hal_audiobusio_i2sout_play(audiobusio_i2sout_obj_t *self,
@@ -153,6 +159,7 @@ void common_hal_audiobusio_i2sout_play(audiobusio_i2sout_obj_t *self,
     if (common_hal_audiobusio_i2sout_get_playing(self)) {
         common_hal_audiobusio_i2sout_stop(self);
     }
+
     uint8_t bits_per_sample = audiosample_bits_per_sample(sample);
     // Make sure we transmit a minimum of 16 bits.
     // TODO: Maybe we need an intermediate object to upsample instead. This is
diff --git a/ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c b/ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
index bf9d04bb65..3a8a7ef226 100644
--- a/ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
+++ b/ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
@@ -46,6 +46,12 @@
 
 #define NUM_DMA_TIMERS 4
 
+// The PWM clock frequency is base_clock_rate / PWM_TOP, typically 125_000_000 / PWM_TOP.
+// We pick BITS_PER_SAMPLE so we get a clock frequency that is above what would cause aliasing.
+#define BITS_PER_SAMPLE 10
+#define SAMPLE_BITS_TO_DISCARD (16 - BITS_PER_SAMPLE)
+#define PWM_TOP ((1 << BITS_PER_SAMPLE) - 1)
+
 void audiopwmout_reset() {
     for (size_t i = 0; i < NUM_DMA_TIMERS; i++) {
         dma_hw->timer[i] = 0;
@@ -55,7 +61,10 @@ void audiopwmout_reset() {
 // Caller validates that pins are free.
 void common_hal_audiopwmio_pwmaudioout_construct(audiopwmio_pwmaudioout_obj_t *self,
     const mcu_pin_obj_t *left_channel, const mcu_pin_obj_t *right_channel, uint16_t quiescent_value) {
-    if (left_channel != NULL && right_channel != NULL) {
+
+    self->stereo = right_channel != NULL;
+
+    if (self->stereo) {
         if (pwm_gpio_to_slice_num(left_channel->number) != pwm_gpio_to_slice_num(right_channel->number)) {
             mp_raise_ValueError(translate("Pins must share PWM slice"));
         }
@@ -72,22 +81,20 @@ void common_hal_audiopwmio_pwmaudioout_construct(audiopwmio_pwmaudioout_obj_t *s
     // we want. ;-) We mark ourselves variable only if we're a mono output to
     // prevent other PWM use on the other channel. If stereo, we say fixed
     // frequency so we can allocate with ourselves.
-    bool mono = right_channel == NULL;
 
-    // We don't actually know our frequency yet so just pick one that shouldn't
-    // match anyone else. (We'll only know the frequency once we play something
-    // back.)
-    uint32_t frequency = 12500;
+    // We don't actually know our frequency yet. It is set when
+    // pwmio_pwmout_set_top() is called. This value is unimportant; it just needs to be valid.
+    const uint32_t frequency = 12000000;
 
     // Make sure the PWMOut's are "deinited" by default.
     self->left_pwm.pin = NULL;
     self->right_pwm.pin = NULL;
 
-    pwmout_result_t result = common_hal_pwmio_pwmout_construct(&self->left_pwm,
-        left_channel, 0, frequency, mono);
+    pwmout_result_t result =
+        common_hal_pwmio_pwmout_construct(&self->left_pwm, left_channel, 0, frequency, !self->stereo);
     if (result == PWMOUT_OK && right_channel != NULL) {
-        result = common_hal_pwmio_pwmout_construct(&self->right_pwm,
-            right_channel, 0, frequency, false);
+        result =
+            common_hal_pwmio_pwmout_construct(&self->right_pwm, right_channel, 0, frequency, false);
         if (result != PWMOUT_OK) {
             common_hal_pwmio_pwmout_deinit(&self->left_pwm);
         }
@@ -96,10 +103,16 @@ void common_hal_audiopwmio_pwmaudioout_construct(audiopwmio_pwmaudioout_obj_t *s
         mp_raise_RuntimeError(translate("All timers in use"));
     }
 
+    self->quiescent_value = quiescent_value >> SAMPLE_BITS_TO_DISCARD;
+    common_hal_pwmio_pwmout_set_duty_cycle(&self->left_pwm, self->quiescent_value);
+    pwmio_pwmout_set_top(&self->left_pwm, PWM_TOP);
+    if (self->stereo) {
+        common_hal_pwmio_pwmout_set_duty_cycle(&self->right_pwm, self->quiescent_value);
+        pwmio_pwmout_set_top(&self->right_pwm, PWM_TOP);
+    }
+
     audio_dma_init(&self->dma);
     self->pacing_timer = NUM_DMA_TIMERS;
-
-    self->quiescent_value = quiescent_value;
 }
 
 bool common_hal_audiopwmio_pwmaudioout_deinited(audiopwmio_pwmaudioout_obj_t *self) {
@@ -110,6 +123,7 @@ void common_hal_audiopwmio_pwmaudioout_deinit(audiopwmio_pwmaudioout_obj_t *self
     if (common_hal_audiopwmio_pwmaudioout_deinited(self)) {
         return;
     }
+
     if (common_hal_audiopwmio_pwmaudioout_get_playing(self)) {
         common_hal_audiopwmio_pwmaudioout_stop(self);
     }
@@ -139,13 +153,11 @@ void common_hal_audiopwmio_pwmaudioout_play(audiopwmio_pwmaudioout_obj_t *self,
         mp_raise_RuntimeError(translate("No DMA pacing timer found"));
     }
     uint32_t tx_register = (uint32_t)&pwm_hw->slice[self->left_pwm.slice].cc;
-    if (common_hal_pwmio_pwmout_deinited(&self->right_pwm)) {
-        // Shift the destination if we are outputting to the second PWM channel.
+    if (self->stereo) {
+        // Shift the destination if we are outputting to both PWM channels.
         tx_register += self->left_pwm.channel * sizeof(uint16_t);
     }
 
-    pwmio_pwmout_set_top(&self->left_pwm, 1023);
-
     audio_dma_result result = audio_dma_setup_playback(
         &self->dma,
         sample,
@@ -153,15 +165,16 @@ void common_hal_audiopwmio_pwmaudioout_play(audiopwmio_pwmaudioout_obj_t *self,
         false, // single channel
         0, // audio channel
         false,  // output signed
-        10,
-        (uint32_t)tx_register,  // output register
+        BITS_PER_SAMPLE,
+        (uint32_t)tx_register,  // output register: PWM cc register
         0x3b + pacing_timer); // data request line
 
     if (result == AUDIO_DMA_DMA_BUSY) {
-        // common_hal_audiobusio_i2sout_stop(self);
+        common_hal_audiopwmio_pwmaudioout_stop(self);
         mp_raise_RuntimeError(translate("No DMA channel found"));
-    } else if (result == AUDIO_DMA_MEMORY_ERROR) {
-        // common_hal_audiobusio_i2sout_stop(self);
+    }
+    if (result == AUDIO_DMA_MEMORY_ERROR) {
+        common_hal_audiopwmio_pwmaudioout_stop(self);
         mp_raise_RuntimeError(translate("Unable to allocate buffers for signed conversion"));
     }
 
@@ -177,6 +190,7 @@ void common_hal_audiopwmio_pwmaudioout_play(audiopwmio_pwmaudioout_obj_t *self,
     // are 16-bit.
 
     uint32_t sample_rate = audiosample_sample_rate(sample);
+
     uint32_t system_clock = common_hal_mcu_processor_get_frequency();
     uint32_t best_numerator = 0;
     uint32_t best_denominator = 0;
@@ -204,19 +218,25 @@ void common_hal_audiopwmio_pwmaudioout_play(audiopwmio_pwmaudioout_obj_t *self,
 }
 
 void common_hal_audiopwmio_pwmaudioout_stop(audiopwmio_pwmaudioout_obj_t *self) {
-    dma_hw->timer[self->pacing_timer] = 0;
-    self->pacing_timer = NUM_DMA_TIMERS;
+    if (self->pacing_timer < NUM_DMA_TIMERS) {
+        dma_hw->timer[self->pacing_timer] = 0;
+        self->pacing_timer = NUM_DMA_TIMERS;
+    }
 
     audio_dma_stop(&self->dma);
+
+    // Set to quiescent level.
+    pwm_hw->slice[self->left_pwm.slice].cc = self->quiescent_value;
+    if (self->stereo) {
+        pwm_hw->slice[self->right_pwm.slice].cc = self->quiescent_value;
+    }
 }
 
 bool common_hal_audiopwmio_pwmaudioout_get_playing(audiopwmio_pwmaudioout_obj_t *self) {
     bool playing = audio_dma_get_playing(&self->dma);
-    if (!playing && self->pacing_timer < NUM_DMA_TIMERS) {
-        dma_hw->timer[self->pacing_timer] = 0;
-        self->pacing_timer = NUM_DMA_TIMERS;
 
-        audio_dma_stop(&self->dma);
+    if (!playing && self->pacing_timer < NUM_DMA_TIMERS) {
+        common_hal_audiopwmio_pwmaudioout_stop(self);
     }
 
     return playing;
diff --git a/ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.h b/ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.h
index 2b43b8354d..e9f0f68d06 100644
--- a/ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.h
+++ b/ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.h
@@ -38,6 +38,7 @@ typedef struct {
     audio_dma_t dma;
     uint16_t quiescent_value;
     uint8_t pacing_timer;
+    bool stereo;     // if false, only using left_pwm.
 } audiopwmio_pwmaudioout_obj_t;
 
 void audiopwmout_reset(void);
diff --git a/ports/raspberrypi/mpconfigport.mk b/ports/raspberrypi/mpconfigport.mk
index cdb8769bfc..bc8a26de7b 100644
--- a/ports/raspberrypi/mpconfigport.mk
+++ b/ports/raspberrypi/mpconfigport.mk
@@ -21,13 +21,13 @@ CIRCUITPY_ALARM ?= 1
 
 CIRCUITPY_RP2PIO ?= 1
 CIRCUITPY_NEOPIXEL_WRITE ?= $(CIRCUITPY_RP2PIO)
-CIRCUITPY_FRAMEBUFFERIO ?= 1
+CIRCUITPY_FRAMEBUFFERIO ?= $(CIRCUITPY_DISPLAYIO)
 CIRCUITPY_FULL_BUILD ?= 1
 CIRCUITPY_AUDIOMP3 ?= 1
 CIRCUITPY_BITOPS ?= 1
 CIRCUITPY_IMAGECAPTURE ?= 1
 CIRCUITPY_PWMIO ?= 1
-CIRCUITPY_RGBMATRIX ?= 1
+CIRCUITPY_RGBMATRIX ?= $(CIRCUITPY_DISPLAYIO)
 CIRCUITPY_ROTARYIO ?= 1
 CIRCUITPY_ROTARYIO_SOFTENCODER = 1
 

From ab52a92704fc7ecb52deb7fcb82337f0abca306f Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Thu, 8 Jul 2021 13:42:24 -0400
Subject: [PATCH 349/349] Disallow ctrl-C interrupts of RP2040 SPI and PIO

---
 ports/raspberrypi/common-hal/busio/SPI.c        | 13 ++-----------
 .../common-hal/rp2pio/StateMachine.c            | 17 +----------------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/ports/raspberrypi/common-hal/busio/SPI.c b/ports/raspberrypi/common-hal/busio/SPI.c
index 23030cbd0d..ab295c4ff1 100644
--- a/ports/raspberrypi/common-hal/busio/SPI.c
+++ b/ports/raspberrypi/common-hal/busio/SPI.c
@@ -212,15 +212,6 @@ static bool _transfer(busio_spi_obj_t *self,
         while (dma_channel_is_busy(chan_rx) || dma_channel_is_busy(chan_tx)) {
             // TODO: We should idle here until we get a DMA interrupt or something else.
             RUN_BACKGROUND_TASKS;
-            if (mp_hal_is_interrupted()) {
-                if (dma_channel_is_busy(chan_rx)) {
-                    dma_channel_abort(chan_rx);
-                }
-                if (dma_channel_is_busy(chan_tx)) {
-                    dma_channel_abort(chan_tx);
-                }
-                break;
-            }
         }
     }
 
@@ -233,7 +224,7 @@ static bool _transfer(busio_spi_obj_t *self,
         dma_channel_unclaim(chan_tx);
     }
 
-    if (!use_dma && !mp_hal_is_interrupted()) {
+    if (!use_dma) {
         // Use software for small transfers, or if couldn't claim two DMA channels
         // Never have more transfers in flight than will fit into the RX FIFO,
         // else FIFO will overflow if this code is heavily interrupted.
@@ -241,7 +232,7 @@ static bool _transfer(busio_spi_obj_t *self,
         size_t rx_remaining = len;
         size_t tx_remaining = len;
 
-        while (!mp_hal_is_interrupted() && (rx_remaining || tx_remaining)) {
+        while (rx_remaining || tx_remaining) {
             if (tx_remaining && spi_is_writable(self->peripheral) && rx_remaining - tx_remaining < fifo_depth) {
                 spi_get_hw(self->peripheral)->dr = (uint32_t)*data_out;
                 // Increment only if the buffer is the transfer length. It's 1 otherwise.
diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
index ab70a27fcd..887ea8e644 100644
--- a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
+++ b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
@@ -654,15 +654,6 @@ static bool _transfer(rp2pio_statemachine_obj_t *self,
                (tx && dma_channel_is_busy(chan_tx))) {
             // TODO: We should idle here until we get a DMA interrupt or something else.
             RUN_BACKGROUND_TASKS;
-            if (mp_hal_is_interrupted()) {
-                if (rx && dma_channel_is_busy(chan_rx)) {
-                    dma_channel_abort(chan_rx);
-                }
-                if (tx && dma_channel_is_busy(chan_tx)) {
-                    dma_channel_abort(chan_tx);
-                }
-                break;
-            }
         }
         // Clear the stall bit so we can detect when the state machine is done transmitting.
         self->pio->fdebug = stall_mask;
@@ -677,7 +668,7 @@ static bool _transfer(rp2pio_statemachine_obj_t *self,
         dma_channel_unclaim(chan_tx);
     }
 
-    if (!use_dma && !mp_hal_is_interrupted()) {
+    if (!use_dma) {
         // Use software for small transfers, or if couldn't claim two DMA channels
         size_t rx_remaining = in_len / in_stride_in_bytes;
         size_t tx_remaining = out_len / out_stride_in_bytes;
@@ -706,9 +697,6 @@ static bool _transfer(rp2pio_statemachine_obj_t *self,
                 --rx_remaining;
             }
             RUN_BACKGROUND_TASKS;
-            if (mp_hal_is_interrupted()) {
-                break;
-            }
         }
         // Clear the stall bit so we can detect when the state machine is done transmitting.
         self->pio->fdebug = stall_mask;
@@ -719,9 +707,6 @@ static bool _transfer(rp2pio_statemachine_obj_t *self,
         while (!pio_sm_is_tx_fifo_empty(self->pio, self->state_machine) ||
                (self->wait_for_txstall && (self->pio->fdebug & stall_mask) == 0)) {
             RUN_BACKGROUND_TASKS;
-            if (mp_hal_is_interrupted()) {
-                break;
-            }
         }
     }
     return true;